From c0de5fcfcb11896437beb9f767cc33808e175667 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Jan 2023 08:37:29 -0500
Subject: [PATCH 01/16] Bump @swc/core from 1.3.26 to 1.3.27 (#6968)

Bumps [@swc/core](https://github.com/swc-project/swc) from 1.3.26 to 1.3.27.
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.3.26...v1.3.27)

---
updated-dependencies:
- dependency-name: "@swc/core"
  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>
---
 package.json |   2 +-
 yarn.lock    | 108 +++++++++++++++++++++++++--------------------------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package.json b/package.json
index e05f484da9..6dbdb88fdf 100644
--- a/package.json
+++ b/package.json
@@ -312,7 +312,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@sentry/types": "^6.19.7",
     "@swc/cli": "^0.1.59",
-    "@swc/core": "^1.3.26",
+    "@swc/core": "^1.3.27",
     "@swc/jest": "^0.2.24",
     "@testing-library/dom": "^7.31.2",
     "@testing-library/jest-dom": "^5.16.5",
diff --git a/yarn.lock b/yarn.lock
index 8962848499..07f5832640 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1845,71 +1845,71 @@
     slash "3.0.0"
     source-map "^0.7.3"
 
-"@swc/core-darwin-arm64@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.26.tgz#43355315f0668a6a5366208f09678349bc0f44ee"
-  integrity sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==
+"@swc/core-darwin-arm64@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.27.tgz#247b275d505c2462ce08cca4e322becbca8e428a"
+  integrity sha512-IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw==
 
-"@swc/core-darwin-x64@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.26.tgz#462fc2e1377437b7c7bbdf5988f51adfeea3efa9"
-  integrity sha512-0uQeebAtsewqJ2b35aPZstGrylwd6oJjUyAJOfVJNbremFSJ5JzytB3NoDCIw7CT5UQrSRpvD3mU95gfdQjDGA==
+"@swc/core-darwin-x64@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.27.tgz#11090424c9bfd0d3e799abb06c1fa6a07abf5ed9"
+  integrity sha512-MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA==
 
-"@swc/core-linux-arm-gnueabihf@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.26.tgz#fecd9c2e7d9b69c849907a83a5101a98c047d986"
-  integrity sha512-06T+LbVFlyciQtwrUB5/a16A1ju1jFoYvd/hq9TWhf7GrtL43U7oJIgqMOPHx2j0+Ps2R3S6R/UUN5YXu618zA==
+"@swc/core-linux-arm-gnueabihf@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.27.tgz#a41b40e056ed0887686e04a30b395521fe3f2d47"
+  integrity sha512-XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg==
 
-"@swc/core-linux-arm64-gnu@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.26.tgz#82a8462212263f4e4f6691473d4c2839b73c2084"
-  integrity sha512-2NT/0xALPfK+U01qIlHxjkGdIj6F0txhu1U2v6B0YP2+k0whL2gCgYeg9QUvkYEXSD5r1Yx+vcb2R/vaSCSClg==
+"@swc/core-linux-arm64-gnu@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.27.tgz#61705b0d534472a9dbde575594c61ef1377d0075"
+  integrity sha512-O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ==
 
-"@swc/core-linux-arm64-musl@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.26.tgz#050b7c1aa81d6f34769eb556c3a94c61a9b69aaa"
-  integrity sha512-64KrTay9hC0mTvZ1AmEFmNEwV5QDjw9U7PJU5riotSc28I+Q/ZoM0qcSFW9JRRa6F2Tr+IfMtyv8+eB2//BQ5g==
+"@swc/core-linux-arm64-musl@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.27.tgz#4fb86dcf70b7fc1aba51d82bba00bb2c4134a980"
+  integrity sha512-Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww==
 
-"@swc/core-linux-x64-gnu@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.26.tgz#e306778c2c1838350f588c8ae800e74434dc2b9a"
-  integrity sha512-Te8G13l3dcRM1Mf3J4JzGUngzNXLKnMYlUmBOYN/ORsx7e+VNelR3zsTLHC0+0jGqELDgqvMyzDfk+dux/C/bQ==
+"@swc/core-linux-x64-gnu@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.27.tgz#691cc341f8dd7f93a8e01044a2ad8b0e7111d65c"
+  integrity sha512-S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw==
 
-"@swc/core-linux-x64-musl@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.26.tgz#531d9ec7c37f56df5c6cc121db5dd6faff5e2c38"
-  integrity sha512-nqQWuSM6OTKepUiQ9+rXgERq/JiO72RBOpXKO2afYppsL96sngjIRewV74v5f6IAfyzw+k+AhC5pgRA4Xu/Jkg==
+"@swc/core-linux-x64-musl@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.27.tgz#a3e1c98513d6e8594c612ab3a671f10e2644dc2e"
+  integrity sha512-6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg==
 
-"@swc/core-win32-arm64-msvc@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.26.tgz#9c7f245903694484bd00c4da5142f24070094d0f"
-  integrity sha512-xx34mx+9IBV1sun7sxoNFiqNom9wiOuvsQFJUyQptCnZHgYwOr9OI204LBF95dCcBCZsTm2hT1wBnySJOeimYw==
+"@swc/core-win32-arm64-msvc@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.27.tgz#70c173f78d3dfd97a0d99374d8f6d55b6fa1c4ef"
+  integrity sha512-baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw==
 
-"@swc/core-win32-ia32-msvc@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.26.tgz#56d83cc216218d78cc578f01499777cdfc0a4eeb"
-  integrity sha512-48LZ/HKNuU9zl8c7qG6IQKb5rBCwmJgysGOmEGzTRBYxAf/x6Scmt0aqxCoV4J02HOs2WduCBDnhUKsSQ2kcXQ==
+"@swc/core-win32-ia32-msvc@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.27.tgz#f34d40710da7939ea32c9a3a4334581468ae09aa"
+  integrity sha512-7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw==
 
-"@swc/core-win32-x64-msvc@1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.26.tgz#bb65bc0fff712c8ca3702d9c0adc59894ca54bae"
-  integrity sha512-UPe7S+MezD/S6cKBIc50TduGzmw6PBz1Ms5p+5wDLOKYNS/LSEM4iRmLwvePzP5X8mOyesXrsbwxLy8KHP65Yw==
+"@swc/core-win32-x64-msvc@1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.27.tgz#f3b131d952808569d99dd4851e95910667743bd5"
+  integrity sha512-mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg==
 
-"@swc/core@^1.3.26":
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.26.tgz#6f7fe6ad54eac7ecffbdfa75d5c4300e2f96b8f6"
-  integrity sha512-U7vEsaLn3IGg0XCRLJX/GTkK9WIfFHUX5USdrp1L2QD29sWPe25HqNndXmUR9KytzKmpDMNoUuHyiuhpVrnNeQ==
+"@swc/core@^1.3.27":
+  version "1.3.27"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.27.tgz#189da5fd132beba28106f5e5fcf43ce127c800dc"
+  integrity sha512-praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w==
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.3.26"
-    "@swc/core-darwin-x64" "1.3.26"
-    "@swc/core-linux-arm-gnueabihf" "1.3.26"
-    "@swc/core-linux-arm64-gnu" "1.3.26"
-    "@swc/core-linux-arm64-musl" "1.3.26"
-    "@swc/core-linux-x64-gnu" "1.3.26"
-    "@swc/core-linux-x64-musl" "1.3.26"
-    "@swc/core-win32-arm64-msvc" "1.3.26"
-    "@swc/core-win32-ia32-msvc" "1.3.26"
-    "@swc/core-win32-x64-msvc" "1.3.26"
+    "@swc/core-darwin-arm64" "1.3.27"
+    "@swc/core-darwin-x64" "1.3.27"
+    "@swc/core-linux-arm-gnueabihf" "1.3.27"
+    "@swc/core-linux-arm64-gnu" "1.3.27"
+    "@swc/core-linux-arm64-musl" "1.3.27"
+    "@swc/core-linux-x64-gnu" "1.3.27"
+    "@swc/core-linux-x64-musl" "1.3.27"
+    "@swc/core-win32-arm64-msvc" "1.3.27"
+    "@swc/core-win32-ia32-msvc" "1.3.27"
+    "@swc/core-win32-x64-msvc" "1.3.27"
 
 "@swc/jest@^0.2.24":
   version "0.2.24"

From ec84eeed8b15065feace3ee51ad43c1ed2c18d02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Jan 2023 08:37:41 -0500
Subject: [PATCH 02/16] Bump esbuild from 0.17.0 to 0.17.2 (#6967)

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.17.0 to 0.17.2.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.17.0...v0.17.2)

---
updated-dependencies:
- dependency-name: esbuild
  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>
---
 package.json |   2 +-
 yarn.lock    | 228 +++++++++++++++++++++++++--------------------------
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/package.json b/package.json
index 6dbdb88fdf..9a520c79c7 100644
--- a/package.json
+++ b/package.json
@@ -387,7 +387,7 @@
     "electron": "^19.1.9",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
-    "esbuild": "^0.17.0",
+    "esbuild": "^0.17.2",
     "esbuild-loader": "^2.21.0",
     "eslint": "^8.32.0",
     "eslint-import-resolver-typescript": "^3.5.3",
diff --git a/yarn.lock b/yarn.lock
index 07f5832640..8fddc7a474 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -603,220 +603,220 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23"
   integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==
 
-"@esbuild/android-arm64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.0.tgz#dd4c28274f08a16be95430d19fc0dab835fd2eae"
-  integrity sha512-77GVyD7ToESy/7+9eI8z62GGBdS/hsqsrpM+JA4kascky86wHbN29EEFpkVvxajPL7k6mbLJ5VBQABdj7n9FhQ==
+"@esbuild/android-arm64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.2.tgz#73aa058f1fdc43770afd9a7b39654ce7e1b2e774"
+  integrity sha512-QSkmYISXr2uFoR+NdmmKyR5svYb0cXDCfzwNblLsrC8wTpx/I1L7u/zrjrf4aLoHoRTycZFIewJwBiUrO5DWtQ==
 
 "@esbuild/android-arm@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2"
   integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==
 
-"@esbuild/android-arm@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.0.tgz#10d289617902f877a28f9f7913f4f54a4e699875"
-  integrity sha512-hlbX5ym1V5kIKvnwFhm6rhar7MNqfJrZyYTNfk6+WS1uQfQmszFgXeyPH2beP3lSCumZyqX0zMBfOqftOpZ7GA==
+"@esbuild/android-arm@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.2.tgz#7cdb67672350177edbaa1de1bedd71b295989fab"
+  integrity sha512-Art7v3xYfqH1gEMUSP0Nx67pNAlC/Y3qSg3mOw8Wg7MP9bJLXL0DrmJaV1Qz1o4FwagtvDgkVOeBDpZgxdj13Q==
 
 "@esbuild/android-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e"
   integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==
 
-"@esbuild/android-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.0.tgz#b0c124e434cec1a6551b400850458c860a30ecb4"
-  integrity sha512-TroxZdZhtAz0JyD0yahtjcbKuIXrBEAoAazaYSeR2e2tUtp9uXrcbpwFJF6oxxOiOOne6y7l4hx4YVnMW/tdFw==
+"@esbuild/android-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.2.tgz#58cb40ea9502a619551dab8145ec19de3192f3d8"
+  integrity sha512-5VOaFBI0RK8jJVDHdeU1YJmpxXoOf1RPoiOBhk/Tvpulw7R1SwCsxHvC3eDQcoF0gV7YM4V2wJO0PR9tem6gCQ==
 
 "@esbuild/darwin-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220"
   integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==
 
-"@esbuild/darwin-arm64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.0.tgz#4a1b65e756cc29e8d68a5ace0a2eb1c63614a767"
-  integrity sha512-wP/v4cgdWt1m8TS/WmbaBc3NZON10eCbm6XepdVc3zJuqruHCzCKcC9dTSTEk50zX04REcRcbIbdhTMciQoFIg==
+"@esbuild/darwin-arm64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.2.tgz#d9d60f704e13611db85acf2cc1ce2ed34fe5e46a"
+  integrity sha512-iQJu1Zn1Wi91D5x/sslEn/jwae1tgSAEHK0R/kYzIr5jO992IJwDDuWhSGll23jHt18RECxahhGG0BWY/bVUTw==
 
 "@esbuild/darwin-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4"
   integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==
 
-"@esbuild/darwin-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.0.tgz#9a59890391f17cd3998d2c7959ea70a1aad28c93"
-  integrity sha512-R4WB6D6V9KGO/3LVTT8UlwRJO26IBFatOdo/bRXksfJR0vyOi2/lgmAAMBSpgcnnwvts9QsWiyM++mTTlwRseA==
+"@esbuild/darwin-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.2.tgz#4ae5735e1cd09b584cff4b8066a246cc62b06c97"
+  integrity sha512-j750nyrwoRZd3VnPo5sd12/5U27TxFGmvmoDv93G2jiaGJPYKJ/+5IfRAvHahGePTUIRPyOlE5YLFw9MlzuBnw==
 
 "@esbuild/freebsd-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27"
   integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==
 
-"@esbuild/freebsd-arm64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.0.tgz#3412ffa1703c991b4d562176881fb43a9ee6f7e3"
-  integrity sha512-FO7+UEZv79gen2df8StFYFHZPI9ADozpFepLZCxY+O8sYLDa1rirvenmLwJiOHmeQRJ5orYedFeLk1PFlZ6t8Q==
+"@esbuild/freebsd-arm64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.2.tgz#0265bd51eb1951b27eb693fd4989a4154e32bd58"
+  integrity sha512-ti7GU+/KUQQXEPmSUep7efZpA3KR2SkKsVuSL2FE7Yxka9apuqKfymAgQmVPMxstzAgCRBIu8uEu0KFmTfs3/Q==
 
 "@esbuild/freebsd-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72"
   integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==
 
-"@esbuild/freebsd-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.0.tgz#427f2a07c997fb30f1a8906b070e28959f38f1e2"
-  integrity sha512-qCsNRsVTaC3ekwZcb2sa7l1gwCtJK3EqCWyDgpoQocYf3lRpbAzaCvqZSF2+NOO64cV+JbedXPsFiXU1aaVcIg==
+"@esbuild/freebsd-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.2.tgz#7b29d68def0ab7c5a21e3d8ec67a7a47db5f9993"
+  integrity sha512-NgooSKWSnrNKRuiumY1dg7KAGpsyXIMcwyOXN9imnqe8VFjqqrEOMqZRik0C1wlfLjiSCuMsj+YUSmBMAJMt0A==
 
 "@esbuild/linux-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca"
   integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==
 
-"@esbuild/linux-arm64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.0.tgz#0e32c6a6b290406b1203854c2d594987570dd66c"
-  integrity sha512-js4Vlch5XJQYISbDVJd2hsI/MsfVUz6d/FrclCE73WkQmniH37vFpuQI42ntWAeBghDIfaPZ6f9GilhwGzVFUg==
+"@esbuild/linux-arm64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.2.tgz#4ac9edc5011e0d5e3f8673c3c3b00dc5c9bf4459"
+  integrity sha512-jcJ4cxwQyqEqgDwkqj7820nKx9cM5WBPCCU4oUXvTeG+DkkJE6/P75od0VPHmItFfEJu+/2vV85ebvFVomZcBg==
 
 "@esbuild/linux-arm@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196"
   integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==
 
-"@esbuild/linux-arm@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.0.tgz#5a70a95bf336035884dee123b5453aeab9c608f3"
-  integrity sha512-Y2G2NU6155gcfNKvrakVmZV5xUAEhXjsN/uKtbKKRnvee0mHUuaT3OdQJDJKjHVGr6B0898pc3slRpI1PqspoQ==
+"@esbuild/linux-arm@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.2.tgz#5b3f46608b682e32255f6dce10ddcc150826df4d"
+  integrity sha512-8dfrRTd39n+THdAetwQKNwK6zBPR5oPjMtgRNXvRq8gsn/J5o69zTaOWVi3QO09BljqdShxU2dxDA09lDhdIqQ==
 
 "@esbuild/linux-ia32@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54"
   integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==
 
-"@esbuild/linux-ia32@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.0.tgz#47baca8e733405a81952bcc475da1b8e5682915f"
-  integrity sha512-7tl/jSPkF59R3zeFDB2/09zLGhcM7DM+tCoOqjJbQjuL6qbMWomGT2RglCqRFpCSdzBx0hukmPPgUAMlmdj0sQ==
+"@esbuild/linux-ia32@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.2.tgz#21e123e2557236c847b38c2ea4dac3d8fbd1081c"
+  integrity sha512-dXZ3m++zaRVD2fqOUPP8QTh1Lfg6WO6uZDo/QJ3KdfnIR7dDToDtaA12AgKYvCed9Nuzf/gpKs/7/f6I02b/sg==
 
 "@esbuild/linux-loong64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8"
   integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==
 
-"@esbuild/linux-loong64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.0.tgz#809398ca125ba3b57d4d12d261f2471ac32b1edb"
-  integrity sha512-OG356F7dIVVF+EXJx5UfzFr1I5l6ES53GlMNSr3U1MhlaVyrP9um5PnrSJ+7TSDAzUC7YGjxb2GQWqHLd5XFoA==
+"@esbuild/linux-loong64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.2.tgz#05e2ca319a925de0a28fe2d8a31e158f8172dac9"
+  integrity sha512-/vntXkzSe9TUp0Rh35Wgye1EOhDtmIMjwC4rtahHcALmDXL+iuQGvwGFvXrP+sBigia/ltLryMAvCiqGV6plqw==
 
 "@esbuild/linux-mips64el@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726"
   integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==
 
-"@esbuild/linux-mips64el@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.0.tgz#94b50097a3421ff538eb6a41cd4fb5db4c4993ff"
-  integrity sha512-LWQJgGpxrjh2x08UYf6G5R+Km7zhkpCvKXtFQ6SX0fimDvy1C8kslgFHGxLS0wjGV8C4BNnENW/HNy57+RB7iA==
+"@esbuild/linux-mips64el@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.2.tgz#98f0e25b86153d725d4379bc267a2cd4c9bcdd24"
+  integrity sha512-guYcNHjMRO1BMxWAeb8LDfgQaU8oeUO65xtlclwBD+hX3163KBifEHyao1hK96J10BP9n0UmZug6GhtGZaNm2Q==
 
 "@esbuild/linux-ppc64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8"
   integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==
 
-"@esbuild/linux-ppc64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.0.tgz#3a580bc8b494d3b273cf08a3bb0d893b31b786ae"
-  integrity sha512-f40N8fKiTQslUcUuhof2/syOQ+DC9Mqdnm9d063pew+Ptv9r6dBNLQCz4300MOfCLAbb0SdnrcMSzHbMehXWLw==
+"@esbuild/linux-ppc64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.2.tgz#45252f5343c5178dae93f8f7fc97aa4304cc5cca"
+  integrity sha512-fzHTnIGIVqgUGZcFnnisguKD4UneF4uwWwkG+i8kBspMDdU1wJ0jha1VdtxWP7Ob1KGxuXcoUlrQkCVO+Z5iOw==
 
 "@esbuild/linux-riscv64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9"
   integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==
 
-"@esbuild/linux-riscv64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.0.tgz#bf75f769e5fa35d143bc5759520e4277b3a95bcc"
-  integrity sha512-sc/pvLexRvxgEbmeq7LfLGnzUBFi/E2MGbnQj3CG8tnQ90tWPTi+9CbZEgIADhj6CAlCCmqxpUclIV1CRVUOTw==
+"@esbuild/linux-riscv64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.2.tgz#6c4446ad19a4d8b070ea0ddf124b6ea53750d5e2"
+  integrity sha512-Sa+z7csvNVeAsTD83tVSggOb8CAU7EdDuihC8WhtoJfuDVkF5+Vi0imaiCjXQ7Ci5rz/a8IJ1H1MWX3eI9AmuQ==
 
 "@esbuild/linux-s390x@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87"
   integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==
 
-"@esbuild/linux-s390x@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.0.tgz#ad6569476d6751cc9255fe059a5e074a08dd3e27"
-  integrity sha512-7xq9/kY0vunCL2vjHKdHGI+660pCdeEC6K6TWBVvbTGXvT8s/qacfxMgr8PCeQRbNUZLOA13G6/G1+c0lYXO1A==
+"@esbuild/linux-s390x@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.2.tgz#5c03feb73b0c3fa80834eb150cd9c14206681b4e"
+  integrity sha512-jUFCO+/VA1Y/oeauSNBubp2UtGu4xjBUEFVgMPm0qLuw6xw18yOagKwBOPVmyE3ZSFqGd9BAPZM/JrtadgBryA==
 
 "@esbuild/linux-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f"
   integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==
 
-"@esbuild/linux-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.0.tgz#7e38c248b8c9f39240c0914872f93893bde7182a"
-  integrity sha512-o7FhBLONk1mLT2ytlj/j/WuJcPdhWcVpysSJn1s9+zRdLwLKveipbPi5SIasJIqMq0T4CkQW76pxJYMqz9HrQA==
+"@esbuild/linux-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.2.tgz#60405f2a40fb792557293a11ba0c380cfe744fcc"
+  integrity sha512-naygxkSmr6x9tuvpa8iGefnXo3Rc3Noz7c4+Dn0MSfSWJwLaN2YR686e7HkI09irfjDdU5UAq9wcxUwjkYQNUA==
 
 "@esbuild/netbsd-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775"
   integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==
 
-"@esbuild/netbsd-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.0.tgz#46e770aa6a14dad73d2cdf6a9521585eca1005ef"
-  integrity sha512-V6xXsv71b8vwFCW/ky82Rs//SbyA+ORty6A7Mzkg33/4NbYZ/1Vcbk7qAN5oi0i/gS4Q0+7dYT7NqaiVZ7+Xjw==
+"@esbuild/netbsd-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.2.tgz#be8afb6d91827ecb8a8f42a43c63b528bbdd9c53"
+  integrity sha512-Hagbdq4EpiG9XXJY6Ozfrl2RN5jkXZXd6BD39f43tWz0d8yyOrRZlofM1eA6JYQbdv6c8BUsUOcgopavIqwx4Q==
 
 "@esbuild/openbsd-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35"
   integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==
 
-"@esbuild/openbsd-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.0.tgz#5d4070663448db20d3de42f7a44a2c2dd0cac847"
-  integrity sha512-StlQor6A0Y9SSDxraytr46Qbz25zsSDmsG3MCaNkBnABKHP3QsngOCfdBikqHVVrXeK0KOTmtX92/ncTGULYgQ==
+"@esbuild/openbsd-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.2.tgz#18e9f4c8284ade701039df1de246a35161dd382e"
+  integrity sha512-Pkby+VEXY7+aWP8J2RUCfqWbbZz2M1GavRGGnE2kEPzwarba/BOk3B45PSaKwc3iKdK2rgCPCTjC/p9JoKNejA==
 
 "@esbuild/sunos-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c"
   integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==
 
-"@esbuild/sunos-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.0.tgz#4a77dbf1691ce2fd9aba69f58248d46f3e28f98b"
-  integrity sha512-K64Wqw57j8KrwjR3QjsuzN/qDGK6Cno6QYtIlWAmGab5iYPBZCWz7HFtF2a86/130LmUsdXqOID7J0SmjjRFIQ==
+"@esbuild/sunos-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.2.tgz#c45c5b6fa406af451e3ebe2ba610bfaad106d20b"
+  integrity sha512-WAyg4dBTUsAPJ9cRnuQ23cwJWYRhP4e4y0M/l2+EpRjWW+g1MNAXKQQNNhRQ71zc8UixRVrqj+43ReHeZC8mJQ==
 
 "@esbuild/win32-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a"
   integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==
 
-"@esbuild/win32-arm64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.0.tgz#9b7cb6839240cd4408fbca6565c6a08e277d73bb"
-  integrity sha512-hly6iSWAf0hf3aHD18/qW7iFQbg9KAQ0RFGG9plcxkhL4uGw43O+lETGcSO/PylNleFowP/UztpF6U4oCYgpPw==
+"@esbuild/win32-arm64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.2.tgz#6b6d31077cba24bd8bc9e173b9ae052b0bef5b0c"
+  integrity sha512-rMbO3gPpxuENd+AnZLgo4J/g+BkwxT3NK7nYpSZ0KlYtSdlxYMIMG5pznX7a1ISZKo67aGStne+K41jdkBywpA==
 
 "@esbuild/win32-ia32@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09"
   integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==
 
-"@esbuild/win32-ia32@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.0.tgz#059a1651b830bfc188920487badd12a8e1b8f050"
-  integrity sha512-aL4EWPh0nyC5uYRfn+CHkTgawd4DjtmwquthNDmGf6Ht6+mUc+bQXyZNH1QIw8x20hSqFc4Tf36aLLWP/TPR3g==
+"@esbuild/win32-ia32@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.2.tgz#88bb3a510006114d8291506b6ec9ff93f66d0d5c"
+  integrity sha512-73dWKDMhFk+4owS19OjEVbEDGFPRS1fyga3qOu5HPd5eTxJTjtlVTT/fG/S7AchA0vXS7hOqY70AAir1CkmICg==
 
 "@esbuild/win32-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091"
   integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==
 
-"@esbuild/win32-x64@0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.0.tgz#d2253fef7e7cd11f010f688fa4f5ebb2875f34c1"
-  integrity sha512-W6IIQ9Rt43I/GqfXeBFLk0TvowKBoirs9sw2LPfhHax6ayMlW5PhFzSJ76I1ac9Pk/aRcSMrHWvVyZs8ZPK2wA==
+"@esbuild/win32-x64@0.17.2":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.2.tgz#a7ce1ae475e14febb80e2690430e399491206a61"
+  integrity sha512-QFJlhf73HCBjTqAWWSIlD8JQBtmue0Dd6UV+KGccycJ3HKj1dCkXdRKJGwc5bZWiI9hrxcWsVEa1kVFaltC4vQ==
 
 "@eslint/eslintrc@^1.4.1":
   version "1.4.1"
@@ -5762,33 +5762,33 @@ esbuild@^0.16.17:
     "@esbuild/win32-ia32" "0.16.17"
     "@esbuild/win32-x64" "0.16.17"
 
-esbuild@^0.17.0:
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.0.tgz#fcf19373d1d546bdbec1557276284c0e6350380b"
-  integrity sha512-4yGk3rD95iS/wGzrx0Ji5czZcx1j2wvfF1iAJaX2FIYLB6sU6wYkDeplpZHzfwQw2yXGXsAoxmO6LnMQkl04Kg==
+esbuild@^0.17.2:
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.2.tgz#c37ee608434be1c0e79f872c8bd484fb46af59df"
+  integrity sha512-odaHSgtYafOXt2nSISwdWlfRkb4ceMX3akY1mWspQpT08jsqVYEK1XtVusr250Rmbx8AVNWjMPI/yyvKqxOKMw==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.0"
-    "@esbuild/android-arm64" "0.17.0"
-    "@esbuild/android-x64" "0.17.0"
-    "@esbuild/darwin-arm64" "0.17.0"
-    "@esbuild/darwin-x64" "0.17.0"
-    "@esbuild/freebsd-arm64" "0.17.0"
-    "@esbuild/freebsd-x64" "0.17.0"
-    "@esbuild/linux-arm" "0.17.0"
-    "@esbuild/linux-arm64" "0.17.0"
-    "@esbuild/linux-ia32" "0.17.0"
-    "@esbuild/linux-loong64" "0.17.0"
-    "@esbuild/linux-mips64el" "0.17.0"
-    "@esbuild/linux-ppc64" "0.17.0"
-    "@esbuild/linux-riscv64" "0.17.0"
-    "@esbuild/linux-s390x" "0.17.0"
-    "@esbuild/linux-x64" "0.17.0"
-    "@esbuild/netbsd-x64" "0.17.0"
-    "@esbuild/openbsd-x64" "0.17.0"
-    "@esbuild/sunos-x64" "0.17.0"
-    "@esbuild/win32-arm64" "0.17.0"
-    "@esbuild/win32-ia32" "0.17.0"
-    "@esbuild/win32-x64" "0.17.0"
+    "@esbuild/android-arm" "0.17.2"
+    "@esbuild/android-arm64" "0.17.2"
+    "@esbuild/android-x64" "0.17.2"
+    "@esbuild/darwin-arm64" "0.17.2"
+    "@esbuild/darwin-x64" "0.17.2"
+    "@esbuild/freebsd-arm64" "0.17.2"
+    "@esbuild/freebsd-x64" "0.17.2"
+    "@esbuild/linux-arm" "0.17.2"
+    "@esbuild/linux-arm64" "0.17.2"
+    "@esbuild/linux-ia32" "0.17.2"
+    "@esbuild/linux-loong64" "0.17.2"
+    "@esbuild/linux-mips64el" "0.17.2"
+    "@esbuild/linux-ppc64" "0.17.2"
+    "@esbuild/linux-riscv64" "0.17.2"
+    "@esbuild/linux-s390x" "0.17.2"
+    "@esbuild/linux-x64" "0.17.2"
+    "@esbuild/netbsd-x64" "0.17.2"
+    "@esbuild/openbsd-x64" "0.17.2"
+    "@esbuild/sunos-x64" "0.17.2"
+    "@esbuild/win32-arm64" "0.17.2"
+    "@esbuild/win32-ia32" "0.17.2"
+    "@esbuild/win32-x64" "0.17.2"
 
 escalade@^3.1.1:
   version "3.1.1"

From 5fc8ec610d52b0c35498bc2e8ab2c2630ada8132 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 18 Jan 2023 06:00:33 -0800
Subject: [PATCH 03/16] Publish to the correct channels instead of always
 latest (#6963)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .github/workflows/release.yml     | 1 +
 Makefile                          | 7 ++-----
 scripts/publish-extensions-npm.sh | 7 +++++++
 scripts/publish-library-npm.sh    | 7 +++++++
 4 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100755 scripts/publish-extensions-npm.sh
 create mode 100755 scripts/publish-library-npm.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4fc05cd5d3..911a103728 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,7 @@ jobs:
           commit: master
           tag: ${{ steps.tagger.outputs.tagname }}
           body: ${{ github.event.pull_request.body }}
+          prerelease: ${{ endsWith(steps.tagger.outputs.tagname, '-alpha') || endsWith(steps.tagger.outputs.tagname, '-beta') }}
   publish-npm:
     uses: ./.github/workflows/publish-release-npm.yml
     needs: release
diff --git a/Makefile b/Makefile
index b6b14141ba..b7c0cd3b8d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ CMD_ARGS = $(filter-out $@,$(MAKECMDGOALS))
 %:
   @:
 
-NPM_RELEASE_TAG ?= latest
 ELECTRON_BUILDER_EXTRA_ARGS ?=
 
 ifeq ($(OS),Windows_NT)
@@ -84,13 +83,11 @@ build-extension-types: node_modules packages/extensions/dist
 
 .PHONY: publish-extensions-npm
 publish-extensions-npm: node_modules build-extensions-npm
-	./node_modules/.bin/npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-	cd packages/extensions && npm publish --access=public --tag=$(NPM_RELEASE_TAG) && git restore package.json
+	./scripts/publish-extensions-npm.sh
 
 .PHONY: publish-library-npm
 publish-library-npm: node_modules build-library-npm
-	./node_modules/.bin/npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-	npm publish --access=public --tag=$(NPM_RELEASE_TAG)
+	./scripts/publish-library-npm.sh
 
 .PHONY: build-docs
 build-docs:
diff --git a/scripts/publish-extensions-npm.sh b/scripts/publish-extensions-npm.sh
new file mode 100755
index 0000000000..a715bc73d4
--- /dev/null
+++ b/scripts/publish-extensions-npm.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+./node_modules/.bin/npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+
+NPM_RELEASE_TAG=$(cat package.json | jq .version --raw-output | rg '.*-(?P<channel>\w+).*' -r '$channel' | cat)
+
+cd packages/extensions && npm publish --access=public --tag=${NPM_RELEASE_TAG:-latest} && git restore package.json
diff --git a/scripts/publish-library-npm.sh b/scripts/publish-library-npm.sh
new file mode 100755
index 0000000000..6fdd16e8a8
--- /dev/null
+++ b/scripts/publish-library-npm.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+./node_modules/.bin/npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+
+NPM_RELEASE_TAG=$(cat package.json | jq .version --raw-output | rg '.*-(?P<channel>\w+).*' -r '$channel' | cat)
+
+npm publish --access=public --tag=${NPM_RELEASE_TAG:-latest}

From 5b3f11f80a38d9de2e025e30fdf56950d78570ea Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Wed, 18 Jan 2023 17:47:14 +0200
Subject: [PATCH 04/16] Better visibility of updating global namespace from
 resource listing views (#6962)

* - <NamespaceSelectBadge/> new component refactored out from multiple resource views with excessive dependencies (e.g updating global namespace filter)
- better UX to and visibility for user on click action (sometimes namespace-filter might not be visible in app/UI)
- updated some snapshots with `jest --updateSnapshot src` (somehow affected `helm-charts/releases/*`)
---
 .../upgrade-chart-new-tab.test.ts.snap        |  72 +++--
 ...wing-details-for-helm-release.test.ts.snap | 288 +++++++++++++-----
 .../components/+config-leases/leases.scss     |   4 +-
 .../components/+config-leases/leases.tsx      |  15 +-
 .../components/+config-maps/config-maps.scss  |   4 +-
 .../components/+config-maps/config-maps.tsx   |  15 +-
 .../pod-disruption-budgets.scss               |   4 +-
 .../pod-disruption-budgets.tsx                |  15 +-
 .../resource-quotas.scss                      |   4 +-
 .../resource-quotas.tsx                       |  15 +-
 .../components/+config-secrets/secrets.scss   |   4 +-
 .../components/+config-secrets/secrets.tsx    |  15 +-
 .../components/+helm-releases/releases.scss   |   4 +-
 .../components/+helm-releases/releases.tsx    |  24 +-
 .../namespace-select-badge.module.scss        |   9 +
 .../+namespaces/namespace-select-badge.tsx    |  58 ++++
 .../+network-endpoints/endpoints.scss         |   4 +-
 .../+network-endpoints/endpoints.tsx          |  15 +-
 .../+network-ingresses/ingresses.scss         |   4 +-
 .../+network-ingresses/ingresses.tsx          |  15 +-
 .../+network-policies/network-policies.scss   |   4 +-
 .../+network-policies/network-policies.tsx    |  15 +-
 .../+network-port-forwards/port-forwards.scss |   4 +-
 .../+network-port-forwards/port-forwards.tsx  |  15 +-
 .../+network-services/services.scss           |   4 +-
 .../components/+network-services/services.tsx |  15 +-
 .../+storage-volume-claims/volume-claims.scss |   4 +-
 .../+user-management/+role-bindings/view.scss |   4 +-
 .../+user-management/+role-bindings/view.tsx  |  16 +-
 .../+user-management/+roles/view.scss         |   4 +-
 .../+user-management/+roles/view.tsx          |  16 +-
 .../+service-accounts/view.scss               |   4 +-
 .../+service-accounts/view.tsx                |  16 +-
 .../+workloads-cronjobs/cronjobs.scss         |   4 +-
 .../+workloads-cronjobs/cronjobs.tsx          |  16 +-
 .../+workloads-daemonsets/daemonsets.scss     |   4 +-
 .../+workloads-daemonsets/daemonsets.tsx      |  23 +-
 .../+workloads-deployments/deployments.scss   |   4 +-
 .../+workloads-deployments/deployments.tsx    |  38 ++-
 .../components/+workloads-jobs/jobs.scss      |   4 +-
 .../components/+workloads-jobs/jobs.tsx       |  16 +-
 .../components/+workloads-pods/pods.scss      |   4 +-
 .../components/+workloads-pods/pods.tsx       |  50 +--
 .../+workloads-replicasets/replicasets.scss   |   4 +-
 .../+workloads-replicasets/replicasets.tsx    |  37 ++-
 .../+workloads-statefulsets/statefulsets.scss |   4 +-
 .../+workloads-statefulsets/statefulsets.tsx  |  30 +-
 47 files changed, 525 insertions(+), 422 deletions(-)
 create mode 100644 src/renderer/components/+namespaces/namespace-select-badge.module.scss
 create mode 100644 src/renderer/components/+namespaces/namespace-select-badge.tsx

diff --git a/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap b/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap
index 0aaff6db77..9e3eaf6f93 100644
--- a/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap
+++ b/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap
@@ -1375,11 +1375,17 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   my-second-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    my-second-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -2172,11 +2178,17 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   my-second-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    my-second-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -2985,11 +2997,17 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   my-second-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    my-second-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -3834,11 +3852,17 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   my-second-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    my-second-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -4823,11 +4847,17 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   my-second-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    my-second-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -5814,11 +5844,17 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   my-second-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    my-second-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
diff --git a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
index 0a6f6a752a..86e80acc4c 100644
--- a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
+++ b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
@@ -2242,11 +2242,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -2328,11 +2334,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -3206,11 +3218,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -3292,11 +3310,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -4231,11 +4255,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -4317,11 +4347,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -5256,11 +5292,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -5342,11 +5384,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -6526,11 +6574,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -6612,11 +6666,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -7796,11 +7856,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -7882,11 +7948,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -11242,11 +11314,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -11328,11 +11406,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -12512,11 +12596,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -12598,11 +12688,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -13537,11 +13633,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -13623,11 +13725,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -14565,11 +14673,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -14651,11 +14765,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -15529,11 +15649,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -15615,11 +15741,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -16554,11 +16686,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
@@ -16640,11 +16778,17 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell namespace"
                               >
-                                <a
-                                  class="filterNamespace"
+                                <div
+                                  class="badge NamespaceSelectBadge flat clickable"
                                 >
                                   some-other-namespace
-                                </a>
+                                </div>
+                                <div>
+                                  Set global namespace filter to:
+                                  <b>
+                                    some-other-namespace
+                                  </b>
+                                </div>
                               </div>
                               <div
                                 class="TableCell chart"
diff --git a/src/renderer/components/+config-leases/leases.scss b/src/renderer/components/+config-leases/leases.scss
index f40556550e..5cc62798a9 100644
--- a/src/renderer/components/+config-leases/leases.scss
+++ b/src/renderer/components/+config-leases/leases.scss
@@ -21,8 +21,6 @@
       flex: .5;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+config-leases/leases.tsx b/src/renderer/components/+config-leases/leases.tsx
index 6c3025c077..950c52b778 100644
--- a/src/renderer/components/+config-leases/leases.tsx
+++ b/src/renderer/components/+config-leases/leases.tsx
@@ -16,9 +16,7 @@ import { KubeObjectAge } from "../kube-object/age";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import leaseStoreInjectable from "./store.injectable";
 import type { LeaseStore } from "./store";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -32,7 +30,6 @@ export interface LeaseProps extends KubeObjectDetailsProps<Lease> {
 
 interface Dependencies {
   leaseStore: LeaseStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -67,13 +64,10 @@ class NonInjectedLease extends React.Component<LeaseProps & Dependencies> {
           renderTableContents={lease => [
             lease.getName(),
             <KubeObjectStatusIcon key="icon" object={lease} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(lease.getNs()))}
-            >
-              {lease.getNs()}
-            </a>,
+              namespace={lease.getNs()}
+            />,
             lease.getHolderIdentity(),
             <KubeObjectAge key="age" object={lease} />,
           ]}
@@ -87,6 +81,5 @@ export const Leases = withInjectables<Dependencies, LeaseProps>(NonInjectedLease
   getProps: (di, props) => ({
     ...props,
     leaseStore: di.inject(leaseStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+config-maps/config-maps.scss b/src/renderer/components/+config-maps/config-maps.scss
index 7f8fd61f5c..cf81669f79 100644
--- a/src/renderer/components/+config-maps/config-maps.scss
+++ b/src/renderer/components/+config-maps/config-maps.scss
@@ -21,8 +21,6 @@
       flex: .5;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+config-maps/config-maps.tsx b/src/renderer/components/+config-maps/config-maps.tsx
index 212e8020e0..b422c6e916 100644
--- a/src/renderer/components/+config-maps/config-maps.tsx
+++ b/src/renderer/components/+config-maps/config-maps.tsx
@@ -11,12 +11,10 @@ import { KubeObjectListLayout } from "../kube-object-list-layout";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
-import { prevDefault } from "../../utils";
 import type { ConfigMapStore } from "./store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import configMapStoreInjectable from "./store.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -27,7 +25,6 @@ enum columnId {
 
 interface Dependencies {
   configMapStore: ConfigMapStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -61,13 +58,10 @@ class NonInjectedConfigMaps extends React.Component<Dependencies> {
           renderTableContents={configMap => [
             configMap.getName(),
             <KubeObjectStatusIcon key="icon" object={configMap} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(configMap.getNs()))}
-            >
-              {configMap.getNs()}
-            </a>,
+              namespace={configMap.getNs()}
+            />,
             configMap.getKeys().join(", "),
             <KubeObjectAge key="age" object={configMap} />,
           ]}
@@ -81,6 +75,5 @@ export const ConfigMaps = withInjectables<Dependencies>(NonInjectedConfigMaps, {
   getProps: (di, props) => ({
     ...props,
     configMapStore: di.inject(configMapStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss
index 99f8fedec6..8dc2dfd721 100644
--- a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss
+++ b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss
@@ -21,8 +21,6 @@
       flex: .5;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx
index f2cfa76090..9a57b972a4 100644
--- a/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx
+++ b/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx
@@ -13,12 +13,10 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import type { PodDisruptionBudgetStore } from "./store";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import podDisruptionBudgetStoreInjectable from "./store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -34,7 +32,6 @@ export interface PodDisruptionBudgetsProps extends KubeObjectDetailsProps<PodDis
 }
 
 interface Dependencies {
-  filterByNamespace: FilterByNamespace;
   podDisruptionBudgetStore: PodDisruptionBudgetStore;
 }
 
@@ -74,13 +71,10 @@ class NonInjectedPodDisruptionBudgets extends React.Component<PodDisruptionBudge
           renderTableContents={pdb => [
             pdb.getName(),
             <KubeObjectStatusIcon key="icon" object={pdb} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(pdb.getNs()))}
-            >
-              {pdb.getNs()}
-            </a>,
+              namespace={pdb.getNs()}
+            />,
             pdb.getMinAvailable(),
             pdb.getMaxUnavailable(),
             pdb.getCurrentHealthy(),
@@ -96,7 +90,6 @@ class NonInjectedPodDisruptionBudgets extends React.Component<PodDisruptionBudge
 export const PodDisruptionBudgets = withInjectables<Dependencies, PodDisruptionBudgetsProps>(NonInjectedPodDisruptionBudgets, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     podDisruptionBudgetStore: di.inject(podDisruptionBudgetStoreInjectable),
   }),
 });
diff --git a/src/renderer/components/+config-resource-quotas/resource-quotas.scss b/src/renderer/components/+config-resource-quotas/resource-quotas.scss
index 5cfef82e92..b0bf869741 100644
--- a/src/renderer/components/+config-resource-quotas/resource-quotas.scss
+++ b/src/renderer/components/+config-resource-quotas/resource-quotas.scss
@@ -9,8 +9,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+config-resource-quotas/resource-quotas.tsx b/src/renderer/components/+config-resource-quotas/resource-quotas.tsx
index 28c3355b43..d769de7d07 100644
--- a/src/renderer/components/+config-resource-quotas/resource-quotas.tsx
+++ b/src/renderer/components/+config-resource-quotas/resource-quotas.tsx
@@ -12,13 +12,11 @@ import { AddQuotaDialog } from "./add-dialog/view";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
-import { prevDefault } from "../../utils";
 import type { ResourceQuotaStore } from "./store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import resourceQuotaStoreInjectable from "./store.injectable";
 import openAddQuotaDialogInjectable from "./add-dialog/open.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -28,7 +26,6 @@ enum columnId {
 
 interface Dependencies {
   resourceQuotaStore: ResourceQuotaStore;
-  filterByNamespace: FilterByNamespace;
   openAddQuotaDialog: () => void;
 }
 
@@ -61,13 +58,10 @@ class NonInjectedResourceQuotas extends React.Component<Dependencies> {
           renderTableContents={resourceQuota => [
             resourceQuota.getName(),
             <KubeObjectStatusIcon key="icon" object={resourceQuota}/>,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(resourceQuota.getNs()))}
-            >
-              {resourceQuota.getNs()}
-            </a>,
+              namespace={resourceQuota.getNs()}
+            />,
             <KubeObjectAge key="age" object={resourceQuota} />,
           ]}
           addRemoveButtons={{
@@ -84,7 +78,6 @@ class NonInjectedResourceQuotas extends React.Component<Dependencies> {
 export const ResourceQuotas = withInjectables<Dependencies>(NonInjectedResourceQuotas, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     resourceQuotaStore: di.inject(resourceQuotaStoreInjectable),
     openAddQuotaDialog: di.inject(openAddQuotaDialogInjectable),
   }),
diff --git a/src/renderer/components/+config-secrets/secrets.scss b/src/renderer/components/+config-secrets/secrets.scss
index 41dd4ca709..4a533a5f34 100644
--- a/src/renderer/components/+config-secrets/secrets.scss
+++ b/src/renderer/components/+config-secrets/secrets.scss
@@ -17,8 +17,6 @@
       @include table-cell-labels-offsets;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+config-secrets/secrets.tsx b/src/renderer/components/+config-secrets/secrets.tsx
index c58d06ce18..248bfcca85 100644
--- a/src/renderer/components/+config-secrets/secrets.tsx
+++ b/src/renderer/components/+config-secrets/secrets.tsx
@@ -13,13 +13,11 @@ import { Badge } from "../badge";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import type { SecretStore } from "./store";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import secretStoreInjectable from "./store.injectable";
 import openAddSecretDialogInjectable from "./add-dialog/open.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -31,7 +29,6 @@ enum columnId {
 }
 
 interface Dependencies {
-  filterByNamespace: FilterByNamespace;
   secretStore: SecretStore;
   openAddSecretDialog: () => void;
 }
@@ -71,13 +68,10 @@ class NonInjectedSecrets extends React.Component<Dependencies> {
           renderTableContents={secret => [
             secret.getName(),
             <KubeObjectStatusIcon key="icon" object={secret} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(secret.getNs()))}
-            >
-              {secret.getNs()}
-            </a>,
+              namespace={secret.getNs()}
+            />,
             secret.getLabels().map(label => (
               <Badge
                 scrollable
@@ -104,7 +98,6 @@ class NonInjectedSecrets extends React.Component<Dependencies> {
 export const Secrets = withInjectables<Dependencies>(NonInjectedSecrets, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     secretStore: di.inject(secretStoreInjectable),
     openAddSecretDialog: di.inject(openAddSecretDialogInjectable),
   }),
diff --git a/src/renderer/components/+helm-releases/releases.scss b/src/renderer/components/+helm-releases/releases.scss
index 04955a60eb..1cce1c5358 100644
--- a/src/renderer/components/+helm-releases/releases.scss
+++ b/src/renderer/components/+helm-releases/releases.scss
@@ -21,8 +21,6 @@
       }
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+helm-releases/releases.tsx b/src/renderer/components/+helm-releases/releases.tsx
index 5714c92fd1..1a0aded7b0 100644
--- a/src/renderer/components/+helm-releases/releases.tsx
+++ b/src/renderer/components/+helm-releases/releases.tsx
@@ -23,9 +23,7 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import helmReleasesRouteParametersInjectable from "./helm-releases-route-parameters.injectable";
 import type { NavigateToHelmReleases } from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
 import navigateToHelmReleasesInjectable from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -43,19 +41,9 @@ interface Dependencies {
   releasesArePending: IComputedValue<boolean>;
   namespace: IComputedValue<string>;
   navigateToHelmReleases: NavigateToHelmReleases;
-  filterByNamespace: FilterByNamespace;
 }
 
 class NonInjectedHelmReleases extends Component<Dependencies> {
-  // TODO: This side-effect in mount must go.
-  componentDidMount() {
-    const namespace = this.props.namespace.get();
-
-    if (namespace) {
-      this.props.filterByNamespace(namespace);
-    }
-  }
-
   onDetails = (item: HelmRelease) => {
     this.showDetails(item);
   };
@@ -188,13 +176,10 @@ class NonInjectedHelmReleases extends Component<Dependencies> {
           ]}
           renderTableContents={release => [
             release.getName(),
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(release.getNs()))}
-            >
-              {release.getNs()}
-            </a>,
+              namespace={release.getNs()}
+            />,
             release.getChart(),
             release.getRevision(),
             release.getVersion(),
@@ -226,7 +211,6 @@ export const HelmReleases = withInjectables<Dependencies>(NonInjectedHelmRelease
     releases: di.inject(removableReleasesInjectable),
     releasesArePending: di.inject(releasesInjectable).pending,
     navigateToHelmReleases: di.inject(navigateToHelmReleasesInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     ...di.inject(helmReleasesRouteParametersInjectable),
   }),
 });
diff --git a/src/renderer/components/+namespaces/namespace-select-badge.module.scss b/src/renderer/components/+namespaces/namespace-select-badge.module.scss
new file mode 100644
index 0000000000..75bb18bf40
--- /dev/null
+++ b/src/renderer/components/+namespaces/namespace-select-badge.module.scss
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.NamespaceSelectBadge {
+  @include pseudo-link;
+  border-bottom: unset;
+}
\ No newline at end of file
diff --git a/src/renderer/components/+namespaces/namespace-select-badge.tsx b/src/renderer/components/+namespaces/namespace-select-badge.tsx
new file mode 100644
index 0000000000..9ae46b0342
--- /dev/null
+++ b/src/renderer/components/+namespaces/namespace-select-badge.tsx
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import styles from "./namespace-select-badge.module.scss";
+import React from "react";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { BadgeProps } from "../badge";
+import { Badge } from "../badge";
+import type {
+  FilterByNamespace,
+} from "./namespace-select-filter-model/filter-by-namespace.injectable";
+import filterByNamespaceInjectable
+  from "./namespace-select-filter-model/filter-by-namespace.injectable";
+import { prevDefault, cssNames } from "../../utils";
+
+export interface NamespaceSelectBadgeProps extends BadgeProps {
+  namespace: string;
+}
+
+export interface Dependencies {
+  filterByNamespace: FilterByNamespace;
+}
+
+export function NamespaceSelectBadgeNonInjected(
+  {
+    namespace,
+    label,
+    filterByNamespace,
+    ...props
+  }: NamespaceSelectBadgeProps & Dependencies) {
+  return (
+    <Badge
+      flat={true}
+      expandable={false}
+      {...props}
+      label={namespace ?? label}
+      tooltip={(
+        <>
+          Set global namespace filter to:
+          <b>{namespace}</b>
+        </>
+      )}
+      className={cssNames(styles.NamespaceSelectBadge, props.className)}
+      onClick={prevDefault(() => filterByNamespace(namespace))}
+    />
+  );
+}
+
+export const NamespaceSelectBadge = withInjectables<Dependencies, NamespaceSelectBadgeProps>(NamespaceSelectBadgeNonInjected, {
+  getProps(di, props) {
+    return {
+      ...props,
+      filterByNamespace: di.inject(filterByNamespaceInjectable),
+    };
+  },
+});
diff --git a/src/renderer/components/+network-endpoints/endpoints.scss b/src/renderer/components/+network-endpoints/endpoints.scss
index a79d36ff17..3e4ea7a85c 100644
--- a/src/renderer/components/+network-endpoints/endpoints.scss
+++ b/src/renderer/components/+network-endpoints/endpoints.scss
@@ -13,8 +13,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+network-endpoints/endpoints.tsx b/src/renderer/components/+network-endpoints/endpoints.tsx
index 4358906a67..55d1551860 100644
--- a/src/renderer/components/+network-endpoints/endpoints.tsx
+++ b/src/renderer/components/+network-endpoints/endpoints.tsx
@@ -11,12 +11,10 @@ import { KubeObjectListLayout } from "../kube-object-list-layout";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
-import { prevDefault } from "../../utils";
 import type { EndpointsStore } from "./store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import endpointsStoreInjectable from "./store.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -27,7 +25,6 @@ enum columnId {
 
 interface Dependencies {
   endpointsStore: EndpointsStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -59,13 +56,10 @@ class NonInjectedEndpoints extends React.Component<Dependencies> {
           renderTableContents={endpoint => [
             endpoint.getName(),
             <KubeObjectStatusIcon key="icon" object={endpoint} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(endpoint.getNs()))}
-            >
-              {endpoint.getNs()}
-            </a>,
+              namespace={endpoint.getNs()}
+            />,
             endpoint.toString(),
             <KubeObjectAge key="age" object={endpoint} />,
           ]}
@@ -86,6 +80,5 @@ export const Endpoints = withInjectables<Dependencies>(NonInjectedEndpoints, {
   getProps: (di, props) => ({
     ...props,
     endpointsStore: di.inject(endpointsStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+network-ingresses/ingresses.scss b/src/renderer/components/+network-ingresses/ingresses.scss
index fdf0bda6b8..4c6d5a75c1 100644
--- a/src/renderer/components/+network-ingresses/ingresses.scss
+++ b/src/renderer/components/+network-ingresses/ingresses.scss
@@ -32,8 +32,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+network-ingresses/ingresses.tsx b/src/renderer/components/+network-ingresses/ingresses.tsx
index e8c8745926..6817d967fb 100644
--- a/src/renderer/components/+network-ingresses/ingresses.tsx
+++ b/src/renderer/components/+network-ingresses/ingresses.tsx
@@ -12,12 +12,10 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import { computeRouteDeclarations } from "../../../common/k8s-api/endpoints";
-import { prevDefault } from "../../utils";
 import type { IngressStore } from "./ingress-store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import ingressStoreInjectable from "./ingress-store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -29,13 +27,11 @@ enum columnId {
 
 interface Dependencies {
   ingressStore: IngressStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 const NonInjectedIngresses = observer((props: Dependencies) => {
   const {
     ingressStore,
-    filterByNamespace,
   } = props;
 
   return (
@@ -66,13 +62,7 @@ const NonInjectedIngresses = observer((props: Dependencies) => {
         renderTableContents={ ingress => [
           ingress.getName(),
           <KubeObjectStatusIcon key="icon" object={ ingress } />,
-          <a
-            key="namespace"
-            className="filterNamespace"
-            onClick={prevDefault(() => filterByNamespace(ingress.getNs()))}
-          >
-            {ingress.getNs()}
-          </a>,
+          <NamespaceSelectBadge key="namespace" namespace={ingress.getNs()} />,
           ingress.getLoadBalancers().map(lb => <p key={ lb }>{ lb }</p>),
           computeRouteDeclarations(ingress).map(decl => (
             decl.displayAsLink
@@ -112,6 +102,5 @@ export const Ingresses = withInjectables<Dependencies>(NonInjectedIngresses, {
   getProps: (di, props) => ({
     ...props,
     ingressStore: di.inject(ingressStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+network-policies/network-policies.scss b/src/renderer/components/+network-policies/network-policies.scss
index d9170a4cb4..38e6cd3d75 100644
--- a/src/renderer/components/+network-policies/network-policies.scss
+++ b/src/renderer/components/+network-policies/network-policies.scss
@@ -9,8 +9,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+network-policies/network-policies.tsx b/src/renderer/components/+network-policies/network-policies.tsx
index a4aeac21f7..47f8e52776 100644
--- a/src/renderer/components/+network-policies/network-policies.tsx
+++ b/src/renderer/components/+network-policies/network-policies.tsx
@@ -12,11 +12,9 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import type { NetworkPolicyStore } from "./store";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import networkPolicyStoreInjectable from "./store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -27,7 +25,6 @@ enum columnId {
 
 interface Dependencies {
   networkPolicyStore: NetworkPolicyStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -59,13 +56,10 @@ class NonInjectedNetworkPolicies extends React.Component<Dependencies> {
           renderTableContents={networkPolicy => [
             networkPolicy.getName(),
             <KubeObjectStatusIcon key="icon" object={networkPolicy} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(networkPolicy.getNs()))}
-            >
-              {networkPolicy.getNs()}
-            </a>,
+              namespace={networkPolicy.getNs()}
+            />,
             networkPolicy.getTypes().join(", "),
             <KubeObjectAge key="age" object={networkPolicy} />,
           ]}
@@ -78,7 +72,6 @@ class NonInjectedNetworkPolicies extends React.Component<Dependencies> {
 export const NetworkPolicies = withInjectables<Dependencies>(NonInjectedNetworkPolicies, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     networkPolicyStore: di.inject(networkPolicyStoreInjectable),
   }),
 });
diff --git a/src/renderer/components/+network-port-forwards/port-forwards.scss b/src/renderer/components/+network-port-forwards/port-forwards.scss
index ede9873736..0da7b0e002 100644
--- a/src/renderer/components/+network-port-forwards/port-forwards.scss
+++ b/src/renderer/components/+network-port-forwards/port-forwards.scss
@@ -14,8 +14,6 @@
       flex: 0.6;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+network-port-forwards/port-forwards.tsx b/src/renderer/components/+network-port-forwards/port-forwards.tsx
index 8010bf9545..97ab37cdd6 100644
--- a/src/renderer/components/+network-port-forwards/port-forwards.tsx
+++ b/src/renderer/components/+network-port-forwards/port-forwards.tsx
@@ -19,9 +19,7 @@ import { computed, makeObservable } from "mobx";
 import portForwardsRouteParametersInjectable from "./port-forwards-route-parameters.injectable";
 import type { NavigateToPortForwards } from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable";
 import navigateToPortForwardsInjectable from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -37,7 +35,6 @@ interface Dependencies {
   portForwardStore: PortForwardStore;
   forwardport: IComputedValue<string>;
   navigateToPortForwards: NavigateToPortForwards;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -132,13 +129,10 @@ class NonInjectedPortForwards extends React.Component<Dependencies> {
           ]}
           renderTableContents={item => [
             item.getName(),
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(item.getNs()))}
-            >
-              {item.getNs()}
-            </a>,
+              namespace={item.getNs()}
+            />,
             item.getKind(),
             item.getPort(),
             item.getForwardPort(),
@@ -173,7 +167,6 @@ export const PortForwards = withInjectables<Dependencies>(NonInjectedPortForward
     portForwardStore: di.inject(portForwardStoreInjectable),
     ...di.inject(portForwardsRouteParametersInjectable),
     navigateToPortForwards: di.inject(navigateToPortForwardsInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
 
diff --git a/src/renderer/components/+network-services/services.scss b/src/renderer/components/+network-services/services.scss
index 5136582cf0..dcc8ed9d1d 100644
--- a/src/renderer/components/+network-services/services.scss
+++ b/src/renderer/components/+network-services/services.scss
@@ -26,8 +26,6 @@
       flex: 0.6;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+network-services/services.tsx b/src/renderer/components/+network-services/services.tsx
index 17295b0af8..7d9a7ba7f4 100644
--- a/src/renderer/components/+network-services/services.tsx
+++ b/src/renderer/components/+network-services/services.tsx
@@ -12,13 +12,11 @@ import { Badge } from "../badge";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
-import { prevDefault } from "../../utils";
 import type { ServiceStore } from "./store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import type { Service } from "../../../common/k8s-api/endpoints";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import serviceStoreInjectable from "./store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -48,7 +46,6 @@ const formatExternalIps = (service: Service) => {
 
 interface Dependencies {
   serviceStore: ServiceStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -92,13 +89,10 @@ class NonInjectedServices extends React.Component<Dependencies> {
           renderTableContents={service => [
             service.getName(),
             <KubeObjectStatusIcon key="icon" object={ service } />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={ prevDefault(() => this.props.filterByNamespace(service.getNs())) }
-            >
-              { service.getNs() }
-            </a>,
+              namespace={service.getNs()}
+            />,
             service.getType(),
             service.getClusterIp(),
             service.getPorts().join(", "),
@@ -116,7 +110,6 @@ class NonInjectedServices extends React.Component<Dependencies> {
 export const Services = withInjectables<Dependencies>(NonInjectedServices, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     serviceStore: di.inject(serviceStoreInjectable),
   }),
 });
diff --git a/src/renderer/components/+storage-volume-claims/volume-claims.scss b/src/renderer/components/+storage-volume-claims/volume-claims.scss
index ac476c595c..f34b575bb3 100644
--- a/src/renderer/components/+storage-volume-claims/volume-claims.scss
+++ b/src/renderer/components/+storage-volume-claims/volume-claims.scss
@@ -39,8 +39,6 @@
       flex: 0.4;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+user-management/+role-bindings/view.scss b/src/renderer/components/+user-management/+role-bindings/view.scss
index d57c5679c3..3c72d3f115 100644
--- a/src/renderer/components/+user-management/+role-bindings/view.scss
+++ b/src/renderer/components/+user-management/+role-bindings/view.scss
@@ -13,8 +13,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+user-management/+role-bindings/view.tsx b/src/renderer/components/+user-management/+role-bindings/view.tsx
index 3f5e458453..2489d9cfa3 100644
--- a/src/renderer/components/+user-management/+role-bindings/view.tsx
+++ b/src/renderer/components/+user-management/+role-bindings/view.tsx
@@ -14,17 +14,15 @@ import { KubeObjectAge } from "../../kube-object/age";
 import type { RoleStore } from "../+roles/store";
 import type { ServiceAccountStore } from "../+service-accounts/store";
 import type { RoleBindingStore } from "./store";
-import { prevDefault } from "../../../utils";
 import type { ClusterRoleStore } from "../+cluster-roles/store";
-import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import clusterRoleStoreInjectable from "../+cluster-roles/store.injectable";
-import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import roleBindingStoreInjectable from "./store.injectable";
 import roleStoreInjectable from "../+roles/store.injectable";
 import serviceAccountStoreInjectable from "../+service-accounts/store.injectable";
 import type { OpenRoleBindingDialog } from "./dialog/open.injectable";
 import openRoleBindingDialogInjectable from "./dialog/open.injectable";
+import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -38,7 +36,6 @@ interface Dependencies {
   roleStore: RoleStore;
   clusterRoleStore: ClusterRoleStore;
   serviceAccountStore: ServiceAccountStore;
-  filterByNamespace: FilterByNamespace;
   openRoleBindingDialog: OpenRoleBindingDialog;
 }
 
@@ -50,7 +47,6 @@ class NonInjectedRoleBindings extends React.Component<Dependencies> {
       roleBindingStore,
       roleStore,
       serviceAccountStore,
-      filterByNamespace,
       openRoleBindingDialog,
     } = this.props;
 
@@ -83,13 +79,10 @@ class NonInjectedRoleBindings extends React.Component<Dependencies> {
           renderTableContents={binding => [
             binding.getName(),
             <KubeObjectStatusIcon key="icon" object={binding} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => filterByNamespace(binding.getNs()))}
-            >
-              {binding.getNs()}
-            </a>,
+              namespace={binding.getNs()}
+            />,
             binding.getSubjectNames(),
             <KubeObjectAge key="age" object={binding} />,
           ]}
@@ -108,7 +101,6 @@ export const RoleBindings = withInjectables<Dependencies>(NonInjectedRoleBinding
   getProps: (di, props) => ({
     ...props,
     clusterRoleStore: di.inject(clusterRoleStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     roleBindingStore: di.inject(roleBindingStoreInjectable),
     roleStore: di.inject(roleStoreInjectable),
     serviceAccountStore: di.inject(serviceAccountStoreInjectable),
diff --git a/src/renderer/components/+user-management/+roles/view.scss b/src/renderer/components/+user-management/+roles/view.scss
index 7ed72f8cc2..6fae603fd3 100644
--- a/src/renderer/components/+user-management/+roles/view.scss
+++ b/src/renderer/components/+user-management/+roles/view.scss
@@ -13,8 +13,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+user-management/+roles/view.tsx b/src/renderer/components/+user-management/+roles/view.tsx
index bf308b38af..a299ac1085 100644
--- a/src/renderer/components/+user-management/+roles/view.tsx
+++ b/src/renderer/components/+user-management/+roles/view.tsx
@@ -13,12 +13,10 @@ import { AddRoleDialog } from "./add-dialog/view";
 import { SiblingsInTabLayout } from "../../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../../kube-object/age";
 import type { RoleStore } from "./store";
-import { prevDefault } from "../../../utils";
-import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import roleStoreInjectable from "./store.injectable";
 import openAddRoleDialogInjectable from "./add-dialog/open.injectable";
+import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -28,7 +26,6 @@ enum columnId {
 
 interface Dependencies {
   roleStore: RoleStore;
-  filterByNamespace: FilterByNamespace;
   openAddRoleDialog: () => void;
 }
 
@@ -36,7 +33,6 @@ interface Dependencies {
 class NonInjectedRoles extends React.Component<Dependencies> {
   render() {
     const {
-      filterByNamespace,
       roleStore,
       openAddRoleDialog,
     } = this.props;
@@ -66,13 +62,10 @@ class NonInjectedRoles extends React.Component<Dependencies> {
           renderTableContents={role => [
             role.getName(),
             <KubeObjectStatusIcon key="icon" object={role} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => filterByNamespace(role.getNs()))}
-            >
-              {role.getNs()}
-            </a>,
+              namespace={role.getNs()}
+            />,
             <KubeObjectAge key="age" object={role} />,
           ]}
           addRemoveButtons={{
@@ -89,7 +82,6 @@ class NonInjectedRoles extends React.Component<Dependencies> {
 export const Roles = withInjectables<Dependencies>(NonInjectedRoles, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     roleStore: di.inject(roleStoreInjectable),
     openAddRoleDialog: di.inject(openAddRoleDialogInjectable),
   }),
diff --git a/src/renderer/components/+user-management/+service-accounts/view.scss b/src/renderer/components/+user-management/+service-accounts/view.scss
index e1fa133b5e..4cc730d949 100644
--- a/src/renderer/components/+user-management/+service-accounts/view.scss
+++ b/src/renderer/components/+user-management/+service-accounts/view.scss
@@ -9,8 +9,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+user-management/+service-accounts/view.tsx b/src/renderer/components/+user-management/+service-accounts/view.tsx
index 1043250d73..ce7eb4988e 100644
--- a/src/renderer/components/+user-management/+service-accounts/view.tsx
+++ b/src/renderer/components/+user-management/+service-accounts/view.tsx
@@ -12,14 +12,12 @@ import { KubeObjectStatusIcon } from "../../kube-object-status-icon";
 import { CreateServiceAccountDialog } from "./create-dialog/view";
 import { SiblingsInTabLayout } from "../../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../../kube-object/age";
-import { prevDefault } from "../../../utils";
 import type { ServiceAccountStore } from "./store";
-import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import serviceAccountStoreInjectable from "./store.injectable";
 import type { OpenCreateServiceAccountDialog } from "./create-dialog/open.injectable";
 import openCreateServiceAccountDialogInjectable from "./create-dialog/open.injectable";
+import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -29,7 +27,6 @@ enum columnId {
 
 interface Dependencies {
   serviceAccountStore: ServiceAccountStore;
-  filterByNamespace: FilterByNamespace;
   openCreateServiceAccountDialog: OpenCreateServiceAccountDialog;
 }
 
@@ -37,7 +34,6 @@ interface Dependencies {
 class NonInjectedServiceAccounts extends React.Component<Dependencies> {
   render() {
     const {
-      filterByNamespace,
       serviceAccountStore,
       openCreateServiceAccountDialog,
     } = this.props;
@@ -67,13 +63,10 @@ class NonInjectedServiceAccounts extends React.Component<Dependencies> {
           renderTableContents={account => [
             account.getName(),
             <KubeObjectStatusIcon key="icon" object={account} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => filterByNamespace(account.getNs()))}
-            >
-              {account.getNs()}
-            </a>,
+              namespace={account.getNs()}
+            />,
             <KubeObjectAge key="age" object={account} />,
           ]}
           addRemoveButtons={{
@@ -90,7 +83,6 @@ class NonInjectedServiceAccounts extends React.Component<Dependencies> {
 export const ServiceAccounts = withInjectables<Dependencies>(NonInjectedServiceAccounts, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     serviceAccountStore: di.inject(serviceAccountStoreInjectable),
     openCreateServiceAccountDialog: di.inject(openCreateServiceAccountDialogInjectable),
   }),
diff --git a/src/renderer/components/+workloads-cronjobs/cronjobs.scss b/src/renderer/components/+workloads-cronjobs/cronjobs.scss
index 29b9fb18c1..9fc51383b7 100644
--- a/src/renderer/components/+workloads-cronjobs/cronjobs.scss
+++ b/src/renderer/components/+workloads-cronjobs/cronjobs.scss
@@ -9,8 +9,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx
index 1dba28c478..365c469917 100644
--- a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx
+++ b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx
@@ -17,9 +17,7 @@ import type { EventStore } from "../+events/store";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import cronJobStoreInjectable from "./store.injectable";
 import eventStoreInjectable from "../+events/store.injectable";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -34,14 +32,12 @@ enum columnId {
 interface Dependencies {
   cronJobStore: CronJobStore;
   eventStore: EventStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 const NonInjectedCronJobs = observer((props: Dependencies) => {
   const {
     cronJobStore,
     eventStore,
-    filterByNamespace,
   } = props;
 
   return (
@@ -82,13 +78,10 @@ const NonInjectedCronJobs = observer((props: Dependencies) => {
         renderTableContents={cronJob => [
           cronJob.getName(),
           <KubeObjectStatusIcon key="icon" object={cronJob} />,
-          <a
+          <NamespaceSelectBadge
             key="namespace"
-            className="filterNamespace"
-            onClick={prevDefault(() => filterByNamespace(cronJob.getNs()))}
-          >
-            {cronJob.getNs()}
-          </a>,
+            namespace={cronJob.getNs()}
+          />,
           cronJob.isNeverRun() ? "never"  : cronJob.getSchedule(),
           cronJob.getSuspendFlag(),
           cronJobStore.getActiveJobsNum(cronJob),
@@ -105,6 +98,5 @@ export const CronJobs = withInjectables<Dependencies>(NonInjectedCronJobs, {
     ...props,
     cronJobStore: di.inject(cronJobStoreInjectable),
     eventStore: di.inject(eventStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-daemonsets/daemonsets.scss b/src/renderer/components/+workloads-daemonsets/daemonsets.scss
index 1500c74d78..a5ea8e74be 100644
--- a/src/renderer/components/+workloads-daemonsets/daemonsets.scss
+++ b/src/renderer/components/+workloads-daemonsets/daemonsets.scss
@@ -22,8 +22,6 @@
       @include table-cell-labels-offsets;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+workloads-daemonsets/daemonsets.tsx b/src/renderer/components/+workloads-daemonsets/daemonsets.tsx
index 5fc4ac6bc8..9760cd2457 100644
--- a/src/renderer/components/+workloads-daemonsets/daemonsets.tsx
+++ b/src/renderer/components/+workloads-daemonsets/daemonsets.tsx
@@ -15,12 +15,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import type { DaemonSetStore } from "./store";
 import type { EventStore } from "../+events/store";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import daemonSetStoreInjectable from "./store.injectable";
 import eventStoreInjectable from "../+events/store.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -33,14 +31,12 @@ enum columnId {
 interface Dependencies {
   daemonSetStore: DaemonSetStore;
   eventStore: EventStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 const NonInjectedDaemonSets = observer((props: Dependencies) => {
   const {
     daemonSetStore,
     eventStore,
-    filterByNamespace,
   } = props;
 
   const getPodsLength = (daemonSet: DaemonSet) => daemonSetStore.getChildPods(daemonSet).length;
@@ -66,7 +62,12 @@ const NonInjectedDaemonSets = observer((props: Dependencies) => {
         renderHeaderTitle="Daemon Sets"
         renderTableHeader={[
           { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
-          { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace },
+          {
+            title: "Namespace",
+            className: "namespace",
+            sortBy: columnId.namespace,
+            id: columnId.namespace,
+          },
           { title: "Pods", className: "pods", sortBy: columnId.pods, id: columnId.pods },
           { className: "warning", showWithColumn: columnId.pods },
           { title: "Node Selector", className: "labels scrollable", id: columnId.labels },
@@ -74,13 +75,10 @@ const NonInjectedDaemonSets = observer((props: Dependencies) => {
         ]}
         renderTableContents={daemonSet => [
           daemonSet.getName(),
-          <a
+          <NamespaceSelectBadge
             key="namespace"
-            className="filterNamespace"
-            onClick={prevDefault(() => filterByNamespace(daemonSet.getNs()))}
-          >
-            {daemonSet.getNs()}
-          </a>,
+            namespace={daemonSet.getNs()}
+          />,
           getPodsLength(daemonSet),
           <KubeObjectStatusIcon key="icon" object={daemonSet} />,
           daemonSet.getNodeSelectors().map(selector => (
@@ -102,6 +100,5 @@ export const DaemonSets = withInjectables<Dependencies>(NonInjectedDaemonSets, {
     ...props,
     daemonSetStore: di.inject(daemonSetStoreInjectable),
     eventStore: di.inject(eventStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-deployments/deployments.scss b/src/renderer/components/+workloads-deployments/deployments.scss
index 322faa6d8d..5d9ed72c03 100644
--- a/src/renderer/components/+workloads-deployments/deployments.scss
+++ b/src/renderer/components/+workloads-deployments/deployments.scss
@@ -43,8 +43,6 @@
       }
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+workloads-deployments/deployments.tsx b/src/renderer/components/+workloads-deployments/deployments.tsx
index d069cd73c1..6fa9fff211 100644
--- a/src/renderer/components/+workloads-deployments/deployments.tsx
+++ b/src/renderer/components/+workloads-deployments/deployments.tsx
@@ -9,7 +9,7 @@ import React from "react";
 import { observer } from "mobx-react";
 import type { Deployment } from "../../../common/k8s-api/endpoints";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
-import { cssNames, prevDefault } from "../../utils";
+import { cssNames } from "../../utils";
 import kebabCase from "lodash/kebabCase";
 import orderBy from "lodash/orderBy";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
@@ -17,11 +17,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import type { DeploymentStore } from "./store";
 import type { EventStore } from "../+events/store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import deploymentStoreInjectable from "./store.injectable";
 import eventStoreInjectable from "../+events/store.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -35,7 +34,6 @@ enum columnId {
 interface Dependencies {
   deploymentStore: DeploymentStore;
   eventStore: EventStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -64,7 +62,6 @@ class NonInjectedDeployments extends React.Component<Dependencies> {
     const {
       deploymentStore,
       eventStore,
-      filterByNamespace,
     } = this.props;
 
     return (
@@ -90,22 +87,34 @@ class NonInjectedDeployments extends React.Component<Dependencies> {
           renderTableHeader={[
             { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
             { className: "warning", showWithColumn: columnId.name },
-            { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace },
+            {
+              title: "Namespace",
+              className: "namespace",
+              sortBy: columnId.namespace,
+              id: columnId.namespace,
+            },
             { title: "Pods", className: "pods", id: columnId.pods },
-            { title: "Replicas", className: "replicas", sortBy: columnId.replicas, id: columnId.replicas },
+            {
+              title: "Replicas",
+              className: "replicas",
+              sortBy: columnId.replicas,
+              id: columnId.replicas,
+            },
             { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
-            { title: "Conditions", className: "conditions", sortBy: columnId.condition, id: columnId.condition },
+            {
+              title: "Conditions",
+              className: "conditions",
+              sortBy: columnId.condition,
+              id: columnId.condition,
+            },
           ]}
           renderTableContents={deployment => [
             deployment.getName(),
             <KubeObjectStatusIcon key="icon" object={deployment} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => filterByNamespace(deployment.getNs()))}
-            >
-              {deployment.getNs()}
-            </a>,
+              namespace={deployment.getNs()}
+            />,
             this.renderPods(deployment),
             deployment.getReplicas(),
             <KubeObjectAge key="age" object={deployment} />,
@@ -122,6 +131,5 @@ export const Deployments = withInjectables<Dependencies>(NonInjectedDeployments,
     ...props,
     deploymentStore: di.inject(deploymentStoreInjectable),
     eventStore: di.inject(eventStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-jobs/jobs.scss b/src/renderer/components/+workloads-jobs/jobs.scss
index a24cfc7b06..f293ba5b38 100644
--- a/src/renderer/components/+workloads-jobs/jobs.scss
+++ b/src/renderer/components/+workloads-jobs/jobs.scss
@@ -19,8 +19,6 @@
       @include job-condition-colors;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+workloads-jobs/jobs.tsx b/src/renderer/components/+workloads-jobs/jobs.tsx
index c0bc9e2d66..5893a27708 100644
--- a/src/renderer/components/+workloads-jobs/jobs.tsx
+++ b/src/renderer/components/+workloads-jobs/jobs.tsx
@@ -14,12 +14,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import type { JobStore } from "./store";
 import type { EventStore } from "../+events/store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import { prevDefault } from "../../utils";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import eventStoreInjectable from "../+events/store.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import jobStoreInjectable from "./store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -32,13 +30,11 @@ enum columnId {
 interface Dependencies {
   jobStore: JobStore;
   eventStore: EventStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 const NonInjectedJobs = observer((props: Dependencies) => {
   const {
     eventStore,
-    filterByNamespace,
     jobStore,
   } = props;
 
@@ -73,13 +69,10 @@ const NonInjectedJobs = observer((props: Dependencies) => {
 
           return [
             job.getName(),
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => filterByNamespace(job.getNs()))}
-            >
-              {job.getNs()}
-            </a>,
+              namespace={job.getNs()}
+            />,
             `${job.getCompletions()} / ${job.getDesiredCompletions()}`,
             <KubeObjectStatusIcon key="icon" object={job} />,
             <KubeObjectAge key="age" object={job} />,
@@ -98,7 +91,6 @@ export const Jobs = withInjectables<Dependencies>(NonInjectedJobs, {
   getProps: (di, props) => ({
     ...props,
     eventStore: di.inject(eventStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     jobStore: di.inject(jobStoreInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-pods/pods.scss b/src/renderer/components/+workloads-pods/pods.scss
index ee606bc762..3555c54701 100644
--- a/src/renderer/components/+workloads-pods/pods.scss
+++ b/src/renderer/components/+workloads-pods/pods.scss
@@ -38,8 +38,6 @@
       flex-grow: 0.7;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+workloads-pods/pods.tsx b/src/renderer/components/+workloads-pods/pods.tsx
index 2e55562154..ab793359b0 100644
--- a/src/renderer/components/+workloads-pods/pods.tsx
+++ b/src/renderer/components/+workloads-pods/pods.tsx
@@ -11,7 +11,7 @@ import { Link } from "react-router-dom";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
 import type { NodeApi, Pod } from "../../../common/k8s-api/endpoints";
 import { StatusBrick } from "../status-brick";
-import { cssNames, getConvertedParts, object, prevDefault, stopPropagation } from "../../utils";
+import { cssNames, getConvertedParts, object, stopPropagation } from "../../utils";
 import startCase from "lodash/startCase";
 import kebabCase from "lodash/kebabCase";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
@@ -28,8 +28,7 @@ import type { PodStore } from "./store";
 import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable";
 import eventStoreInjectable from "../+events/store.injectable";
 import podStoreInjectable from "./store.injectable";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -45,7 +44,6 @@ enum columnId {
 
 interface Dependencies {
   getDetailsUrl: GetDetailsUrl;
-  filterByNamespace: FilterByNamespace;
   apiManager: ApiManager;
   eventStore: EventStore;
   podStore: PodStore;
@@ -111,7 +109,7 @@ class NonInjectedPods extends React.Component<Dependencies> {
           className="Pods"
           store={podStore}
           dependentStores={[eventStore]} // status icon component uses event store
-          tableId = "workloads_pods"
+          tableId="workloads_pods"
           isConfigurable
           sortingCallbacks={{
             [columnId.name]: pod => getConvertedParts(pod.getName()),
@@ -134,10 +132,30 @@ class NonInjectedPods extends React.Component<Dependencies> {
           renderTableHeader={[
             { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
             { className: "warning", showWithColumn: columnId.name },
-            { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace },
-            { title: "Containers", className: "containers", sortBy: columnId.containers, id: columnId.containers },
-            { title: "Restarts", className: "restarts", sortBy: columnId.restarts, id: columnId.restarts },
-            { title: "Controlled By", className: "owners", sortBy: columnId.owners, id: columnId.owners },
+            {
+              title: "Namespace",
+              className: "namespace",
+              sortBy: columnId.namespace,
+              id: columnId.namespace,
+            },
+            {
+              title: "Containers",
+              className: "containers",
+              sortBy: columnId.containers,
+              id: columnId.containers,
+            },
+            {
+              title: "Restarts",
+              className: "restarts",
+              sortBy: columnId.restarts,
+              id: columnId.restarts,
+            },
+            {
+              title: "Controlled By",
+              className: "owners",
+              sortBy: columnId.owners,
+              id: columnId.owners,
+            },
             { title: "Node", className: "node", sortBy: columnId.node, id: columnId.node },
             { title: "QoS", className: "qos", sortBy: columnId.qos, id: columnId.qos },
             { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
@@ -152,13 +170,10 @@ class NonInjectedPods extends React.Component<Dependencies> {
               expandable={false}
             />,
             <KubeObjectStatusIcon key="icon" object={pod} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(pod.getNs()))}
-            >
-              {pod.getNs()}
-            </a>,
+              namespace={pod.getNs()}
+            />,
             this.renderContainersStatus(pod),
             pod.getRestartsCount(),
             pod.getOwnerRefs().map(ref => {
@@ -186,7 +201,9 @@ class NonInjectedPods extends React.Component<Dependencies> {
                 tooltip={pod.getNodeName()}
                 expandable={false}
               >
-                <Link to={getDetailsUrl(nodeApi.getUrl({ name: pod.getNodeName() }))} onClick={stopPropagation}>
+                <Link
+                  to={getDetailsUrl(nodeApi.getUrl({ name: pod.getNodeName() }))}
+                  onClick={stopPropagation}>
                   {pod.getNodeName()}
                 </Link>
               </Badge>
@@ -210,6 +227,5 @@ export const Pods = withInjectables<Dependencies>(NonInjectedPods, {
     nodeApi: di.inject(nodeApiInjectable),
     eventStore: di.inject(eventStoreInjectable),
     podStore: di.inject(podStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-replicasets/replicasets.scss b/src/renderer/components/+workloads-replicasets/replicasets.scss
index 07e70c53c1..15274677e2 100644
--- a/src/renderer/components/+workloads-replicasets/replicasets.scss
+++ b/src/renderer/components/+workloads-replicasets/replicasets.scss
@@ -13,8 +13,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+workloads-replicasets/replicasets.tsx b/src/renderer/components/+workloads-replicasets/replicasets.tsx
index 685315551c..92eb0c45ac 100644
--- a/src/renderer/components/+workloads-replicasets/replicasets.tsx
+++ b/src/renderer/components/+workloads-replicasets/replicasets.tsx
@@ -13,12 +13,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import type { ReplicaSetStore } from "./store";
 import type { EventStore } from "../+events/store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import { prevDefault } from "../../utils";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import eventStoreInjectable from "../+events/store.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import replicaSetStoreInjectable from "./store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -32,13 +30,11 @@ enum columnId {
 interface Dependencies {
   replicaSetStore: ReplicaSetStore;
   eventStore: EventStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 const NonInjectedReplicaSets = observer((props: Dependencies) => {
   const {
     eventStore,
-    filterByNamespace,
     replicaSetStore,
   } = props;
 
@@ -65,22 +61,34 @@ const NonInjectedReplicaSets = observer((props: Dependencies) => {
         renderTableHeader={[
           { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
           { className: "warning", showWithColumn: columnId.name },
-          { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace },
-          { title: "Desired", className: "desired", sortBy: columnId.desired, id: columnId.desired },
-          { title: "Current", className: "current", sortBy: columnId.current, id: columnId.current },
+          {
+            title: "Namespace",
+            className: "namespace",
+            sortBy: columnId.namespace,
+            id: columnId.namespace,
+          },
+          {
+            title: "Desired",
+            className: "desired",
+            sortBy: columnId.desired,
+            id: columnId.desired,
+          },
+          {
+            title: "Current",
+            className: "current",
+            sortBy: columnId.current,
+            id: columnId.current,
+          },
           { title: "Ready", className: "ready", sortBy: columnId.ready, id: columnId.ready },
           { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
         ]}
         renderTableContents={replicaSet => [
           replicaSet.getName(),
           <KubeObjectStatusIcon key="icon" object={replicaSet} />,
-          <a
+          <NamespaceSelectBadge
             key="namespace"
-            className="filterNamespace"
-            onClick={prevDefault(() => filterByNamespace(replicaSet.getNs()))}
-          >
-            {replicaSet.getNs()}
-          </a>,
+            namespace={replicaSet.getNs()}
+          />,
           replicaSet.getDesired(),
           replicaSet.getCurrent(),
           replicaSet.getReady(),
@@ -95,7 +103,6 @@ export const ReplicaSets = withInjectables<Dependencies>(NonInjectedReplicaSets,
   getProps: (di, props) => ({
     ...props,
     eventStore: di.inject(eventStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     replicaSetStore: di.inject(replicaSetStoreInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-statefulsets/statefulsets.scss b/src/renderer/components/+workloads-statefulsets/statefulsets.scss
index 23b4da9242..ce9277c6bb 100644
--- a/src/renderer/components/+workloads-statefulsets/statefulsets.scss
+++ b/src/renderer/components/+workloads-statefulsets/statefulsets.scss
@@ -17,8 +17,6 @@
       @include table-cell-warning;
     }
 
-    a.filterNamespace {
-      border-bottom: unset;
-    }
+
   }
 }
diff --git a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx
index 30a3970c69..0e35cd6584 100644
--- a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx
+++ b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx
@@ -14,12 +14,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import type { StatefulSetStore } from "./store";
 import type { EventStore } from "../+events/store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import eventStoreInjectable from "../+events/store.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import statefulSetStoreInjectable from "./store.injectable";
-import { prevDefault } from "../../utils";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -32,7 +30,6 @@ enum columnId {
 interface Dependencies {
   statefulSetStore: StatefulSetStore;
   eventStore: EventStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 const renderPodCounts = (statefulSet: StatefulSet) => {
@@ -44,7 +41,6 @@ const renderPodCounts = (statefulSet: StatefulSet) => {
 const NonInjectedStatefulSets = observer((props: Dependencies) => {
   const {
     eventStore,
-    filterByNamespace,
     statefulSetStore,
   } = props;
 
@@ -68,21 +64,28 @@ const NonInjectedStatefulSets = observer((props: Dependencies) => {
         renderHeaderTitle="Stateful Sets"
         renderTableHeader={[
           { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
-          { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace },
+          {
+            title: "Namespace",
+            className: "namespace",
+            sortBy: columnId.namespace,
+            id: columnId.namespace,
+          },
           { title: "Pods", className: "pods", id: columnId.pods },
-          { title: "Replicas", className: "replicas", sortBy: columnId.replicas, id: columnId.replicas },
+          {
+            title: "Replicas",
+            className: "replicas",
+            sortBy: columnId.replicas,
+            id: columnId.replicas,
+          },
           { className: "warning", showWithColumn: columnId.replicas },
           { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
         ]}
         renderTableContents={statefulSet => [
           statefulSet.getName(),
-          <a
+          <NamespaceSelectBadge
             key="namespace"
-            className="filterNamespace"
-            onClick={prevDefault(() => filterByNamespace(statefulSet.getNs()))}
-          >
-            {statefulSet.getNs()}
-          </a>,
+            namespace={statefulSet.getNs()}
+          />,
           renderPodCounts(statefulSet),
           statefulSet.getReplicas(),
           <KubeObjectStatusIcon key="icon" object={statefulSet} />,
@@ -97,7 +100,6 @@ export const StatefulSets = withInjectables<Dependencies>(NonInjectedStatefulSet
   getProps: (di, props) => ({
     ...props,
     eventStore: di.inject(eventStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     statefulSetStore: di.inject(statefulSetStoreInjectable),
   }),
 });

From d3b1b0e3b68b1c488471d04233de93f6c4164c5d Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 18 Jan 2023 09:12:21 -0800
Subject: [PATCH 05/16] Fix KubeJsonApi.forCluster as part of extension API
 (#6973)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/extensions/common-api/k8s-api.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/extensions/common-api/k8s-api.ts b/src/extensions/common-api/k8s-api.ts
index 3150c920f6..5e47da3b33 100644
--- a/src/extensions/common-api/k8s-api.ts
+++ b/src/extensions/common-api/k8s-api.ts
@@ -31,6 +31,7 @@ import type { JsonApiConfig } from "../../common/k8s-api/json-api";
 import type { KubeJsonApi as InternalKubeJsonApi } from "../../common/k8s-api/kube-json-api";
 import createKubeJsonApiInjectable from "../../common/k8s-api/create-kube-json-api.injectable";
 import type { RequestInit } from "node-fetch";
+import createKubeJsonApiForClusterInjectable from "../../common/k8s-api/create-kube-json-api-for-cluster.injectable";
 
 export const apiManager = asLegacyGlobalForExtensionApi(apiManagerInjectable);
 export const forCluster = asLegacyGlobalFunctionForExtensionApi(createKubeApiForClusterInjectable);
@@ -125,7 +126,7 @@ function KubeJsonApiCstr(config: JsonApiConfig, reqInit?: RequestInit) {
 export const KubeJsonApi = Object.assign(
   KubeJsonApiCstr as unknown as new (config: JsonApiConfig, reqInit?: RequestInit) => InternalKubeJsonApi,
   {
-    forCluster,
+    forCluster: asLegacyGlobalForExtensionApi(createKubeJsonApiForClusterInjectable),
   },
 );
 

From a5c62da002f2418e075f881a7ca901c9fa190434 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Wed, 18 Jan 2023 21:36:48 +0200
Subject: [PATCH 06/16] Finish using NamespaceSelectBadge in all places (#6972)

Signed-off-by: Roman <ixrock@gmail.com>

Signed-off-by: Roman <ixrock@gmail.com>
---
 .../components/+config-autoscalers/hpa.tsx      | 16 +++++-----------
 .../+config-limit-ranges/limit-ranges.tsx       | 15 ++++-----------
 .../+custom-resources/crd-resources.scss        |  3 ---
 .../+custom-resources/crd-resources.tsx         | 14 ++------------
 src/renderer/components/+events/events.tsx      | 17 +++--------------
 .../+storage-volume-claims/volume-claims.tsx    | 17 +++++------------
 6 files changed, 19 insertions(+), 63 deletions(-)

diff --git a/src/renderer/components/+config-autoscalers/hpa.tsx b/src/renderer/components/+config-autoscalers/hpa.tsx
index 8900d7b73d..efdc7fd48d 100644
--- a/src/renderer/components/+config-autoscalers/hpa.tsx
+++ b/src/renderer/components/+config-autoscalers/hpa.tsx
@@ -10,15 +10,14 @@ import { observer } from "mobx-react";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
 import type { HorizontalPodAutoscaler } from "../../../common/k8s-api/endpoints/horizontal-pod-autoscaler.api";
 import { Badge } from "../badge";
-import { cssNames, prevDefault } from "../../utils";
+import { cssNames } from "../../utils";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
 import type { HorizontalPodAutoscalerStore } from "./store";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import horizontalPodAutoscalerStoreInjectable from "./store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -33,7 +32,6 @@ enum columnId {
 
 interface Dependencies {
   horizontalPodAutoscalerStore: HorizontalPodAutoscalerStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -90,13 +88,10 @@ class NonInjectedHorizontalPodAutoscalers extends React.Component<Dependencies>
           renderTableContents={hpa => [
             hpa.getName(),
             <KubeObjectStatusIcon key="icon" object={hpa} />,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(hpa.getNs()))}
-            >
-              {hpa.getNs()}
-            </a>,
+              namespace={hpa.getNs()}
+            />,
             this.getTargets(hpa),
             hpa.getMinPods(),
             hpa.getMaxPods(),
@@ -124,7 +119,6 @@ class NonInjectedHorizontalPodAutoscalers extends React.Component<Dependencies>
 export const HorizontalPodAutoscalers = withInjectables<Dependencies>(NonInjectedHorizontalPodAutoscalers, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     horizontalPodAutoscalerStore: di.inject(horizontalPodAutoscalerStoreInjectable),
   }),
 });
diff --git a/src/renderer/components/+config-limit-ranges/limit-ranges.tsx b/src/renderer/components/+config-limit-ranges/limit-ranges.tsx
index ed189ed184..b89c7478f9 100644
--- a/src/renderer/components/+config-limit-ranges/limit-ranges.tsx
+++ b/src/renderer/components/+config-limit-ranges/limit-ranges.tsx
@@ -11,12 +11,10 @@ import React from "react";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import type { LimitRangeStore } from "./store";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import limitRangeStoreInjectable from "./store.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -25,7 +23,6 @@ enum columnId {
 }
 
 interface Dependencies {
-  filterByNamespace: FilterByNamespace;
   limitRangeStore: LimitRangeStore;
 }
 
@@ -58,13 +55,10 @@ class NonInjectedLimitRanges extends React.Component<Dependencies> {
           renderTableContents={limitRange => [
             limitRange.getName(),
             <KubeObjectStatusIcon key="icon" object={limitRange}/>,
-            <a
+            <NamespaceSelectBadge
               key="namespace"
-              className="filterNamespace"
-              onClick={prevDefault(() => this.props.filterByNamespace(limitRange.getNs()))}
-            >
-              {limitRange.getNs()}
-            </a>,
+              namespace={limitRange.getNs()}
+            />,
             <KubeObjectAge key="age" object={limitRange} />,
           ]}
         />
@@ -76,7 +70,6 @@ class NonInjectedLimitRanges extends React.Component<Dependencies> {
 export const LimitRanges = withInjectables<Dependencies>(NonInjectedLimitRanges, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     limitRangeStore: di.inject(limitRangeStoreInjectable),
   }),
 });
diff --git a/src/renderer/components/+custom-resources/crd-resources.scss b/src/renderer/components/+custom-resources/crd-resources.scss
index 3b217a77bf..0d0ee419d8 100644
--- a/src/renderer/components/+custom-resources/crd-resources.scss
+++ b/src/renderer/components/+custom-resources/crd-resources.scss
@@ -4,7 +4,4 @@
  */
 
 .CrdResources {
-  a.filterNamespace {
-    border-bottom: unset;
-  }
 }
diff --git a/src/renderer/components/+custom-resources/crd-resources.tsx b/src/renderer/components/+custom-resources/crd-resources.tsx
index 51ecd656ae..3cd0864c36 100644
--- a/src/renderer/components/+custom-resources/crd-resources.tsx
+++ b/src/renderer/components/+custom-resources/crd-resources.tsx
@@ -19,9 +19,7 @@ import { KubeObjectAge } from "../kube-object/age";
 import type { CustomResourceDefinitionStore } from "./definition.store";
 import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
 import customResourceDefinitionStoreInjectable from "./definition.store.injectable";
-import { prevDefault } from "../../utils";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -34,7 +32,6 @@ interface Dependencies {
   name: IComputedValue<string>;
   apiManager: ApiManager;
   customResourceDefinitionStore: CustomResourceDefinitionStore;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -107,13 +104,7 @@ class NonInjectedCustomResources extends React.Component<Dependencies> {
           renderTableContents={customResource => [
             customResource.getName(),
             isNamespaced && (
-              <a
-                key="namespace"
-                className="filterNamespace"
-                onClick={prevDefault(() => this.props.filterByNamespace(customResource.getNs() as string))}
-              >
-                {customResource.getNs()}
-              </a>
+              <NamespaceSelectBadge namespace={customResource.getNs() as string} />
             ),
             ...extraColumns.map((column) => safeJSONPathValue(customResource, column.jsonPath)),
             <KubeObjectAge key="age" object={customResource} />,
@@ -141,7 +132,6 @@ export const CustomResources = withInjectables<Dependencies>(NonInjectedCustomRe
     ...di.inject(customResourcesRouteParametersInjectable),
     apiManager: di.inject(apiManagerInjectable),
     customResourceDefinitionStore: di.inject(customResourceDefinitionStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
   }),
 });
 
diff --git a/src/renderer/components/+events/events.tsx b/src/renderer/components/+events/events.tsx
index e1b9e57bb8..d68bb21a53 100644
--- a/src/renderer/components/+events/events.tsx
+++ b/src/renderer/components/+events/events.tsx
@@ -19,7 +19,7 @@ import type { HeaderCustomizer } from "../item-object-list";
 import { Tooltip } from "../tooltip";
 import { Link } from "react-router-dom";
 import type { IClassName } from "../../utils";
-import { prevDefault, cssNames, stopPropagation } from "../../utils";
+import { cssNames, stopPropagation } from "../../utils";
 import { Icon } from "../icon";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
 import { withInjectables } from "@ogre-tools/injectable-react";
@@ -28,10 +28,9 @@ import { KubeObjectAge } from "../kube-object/age";
 import { ReactiveDuration } from "../duration/reactive-duration";
 import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
 import eventStoreInjectable from "./store.injectable";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   message = "message",
@@ -58,7 +57,6 @@ interface Dependencies {
   navigateToEvents: () => void;
   eventStore: EventStore;
   apiManager: ApiManager;
-  filterByNamespace: FilterByNamespace;
   getDetailsUrl: GetDetailsUrl;
 }
 
@@ -202,15 +200,7 @@ class NonInjectedEvents extends React.Component<Dependencies & EventsProps> {
               ),
             },
             compact
-              ? (
-                <a
-                  key="namespace"
-                  className="filterNamespace"
-                  onClick={prevDefault(() => this.props.filterByNamespace(event.getNs()))}
-                >
-                  {event.getNs()}
-                </a>
-              )
+              ? <NamespaceSelectBadge key="namespace" namespace={event.getNs()} />
               : event.getNs(),
             <Link
               key="link"
@@ -246,7 +236,6 @@ export const Events = withInjectables<Dependencies, EventsProps>(NonInjectedEven
     navigateToEvents: di.inject(navigateToEventsInjectable),
     apiManager: di.inject(apiManagerInjectable),
     eventStore: di.inject(eventStoreInjectable),
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     getDetailsUrl: di.inject(getDetailsUrlInjectable),
   }),
 });
diff --git a/src/renderer/components/+storage-volume-claims/volume-claims.tsx b/src/renderer/components/+storage-volume-claims/volume-claims.tsx
index 31ebee4bc4..39ec81f8de 100644
--- a/src/renderer/components/+storage-volume-claims/volume-claims.tsx
+++ b/src/renderer/components/+storage-volume-claims/volume-claims.tsx
@@ -10,7 +10,7 @@ import { observer } from "mobx-react";
 import { Link } from "react-router-dom";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
 import { unitsToBytes } from "../../../common/utils/convertMemory";
-import { prevDefault, stopPropagation } from "../../utils";
+import { stopPropagation } from "../../utils";
 import type { StorageClassApi } from "../../../common/k8s-api/endpoints";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
@@ -18,13 +18,12 @@ import { KubeObjectAge } from "../kube-object/age";
 import type { PersistentVolumeClaimStore } from "./store";
 import type { PodStore } from "../+workloads-pods/store";
 import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
-import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
 import persistentVolumeClaimStoreInjectable from "./store.injectable";
 import podStoreInjectable from "../+workloads-pods/store.injectable";
 import storageClassApiInjectable from "../../../common/k8s-api/endpoints/storage-class.api.injectable";
+import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
 
 enum columnId {
   name = "name",
@@ -41,7 +40,6 @@ interface Dependencies {
   storageClassApi: StorageClassApi;
   podStore: PodStore;
   getDetailsUrl: GetDetailsUrl;
-  filterByNamespace: FilterByNamespace;
 }
 
 @observer
@@ -49,7 +47,6 @@ class NonInjectedPersistentVolumeClaims extends React.Component<Dependencies> {
   render() {
     const {
       persistentVolumeClaimStore,
-      filterByNamespace,
       getDetailsUrl,
       podStore,
       storageClassApi,
@@ -97,13 +94,10 @@ class NonInjectedPersistentVolumeClaims extends React.Component<Dependencies> {
             return [
               pvc.getName(),
               <KubeObjectStatusIcon key="icon" object={pvc} />,
-              <a
+              <NamespaceSelectBadge
                 key="namespace"
-                className="filterNamespace"
-                onClick={prevDefault(() => filterByNamespace(pvc.getNs()))}
-              >
-                {pvc.getNs()}
-              </a>,
+                namespace={pvc.getNs()}
+              />,
               <Link
                 key="link"
                 to={storageClassDetailsUrl}
@@ -134,7 +128,6 @@ class NonInjectedPersistentVolumeClaims extends React.Component<Dependencies> {
 export const PersistentVolumeClaims = withInjectables<Dependencies>(NonInjectedPersistentVolumeClaims, {
   getProps: (di, props) => ({
     ...props,
-    filterByNamespace: di.inject(filterByNamespaceInjectable),
     getDetailsUrl: di.inject(getDetailsUrlInjectable),
     persistentVolumeClaimStore: di.inject(persistentVolumeClaimStoreInjectable),
     podStore: di.inject(podStoreInjectable),

From b8d1ef708ef104b55cf9e649397b18597455f9c7 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Thu, 19 Jan 2023 13:27:33 +0300
Subject: [PATCH 07/16] Add KubeEventDetails empty placeholder (#6978)

* KubeEventDetails empty placeholder

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Updaing snapshots

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 ...when-cluster-is-not-relevant.test.tsx.snap | 21 ++++++++++++++++---
 ...hide-kube-object-detail-item.test.tsx.snap | 14 +++++++++++--
 ...ls.scss => kube-event-details.module.scss} |  8 +++----
 .../components/+events/kube-event-details.tsx | 15 ++++++++-----
 4 files changed, 44 insertions(+), 14 deletions(-)
 rename src/renderer/components/+events/{kube-event-details.scss => kube-event-details.module.scss} (91%)

diff --git a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
index 5f9f15db46..6a0943b664 100644
--- a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -104,12 +104,17 @@ exports[`disable kube object detail items when cluster is not relevant given ext
           </div>
           <div>
             <div
-              class="DrawerTitle flex gaps align-center title"
+              class="DrawerTitle title"
             >
               <span>
                 Events
               </span>
             </div>
+            <div
+              class="empty"
+            >
+              No events found
+            </div>
           </div>
         </div>
       </div>
@@ -725,12 +730,17 @@ exports[`disable kube object detail items when cluster is not relevant given ext
           </div>
           <div>
             <div
-              class="DrawerTitle flex gaps align-center title"
+              class="DrawerTitle title"
             >
               <span>
                 Events
               </span>
             </div>
+            <div
+              class="empty"
+            >
+              No events found
+            </div>
           </div>
         </div>
       </div>
@@ -1346,12 +1356,17 @@ exports[`disable kube object detail items when cluster is not relevant given not
           </div>
           <div>
             <div
-              class="DrawerTitle flex gaps align-center title"
+              class="DrawerTitle title"
             >
               <span>
                 Events
               </span>
             </div>
+            <div
+              class="empty"
+            >
+              No events found
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap b/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
index b6c14ca470..578fcae9e9 100644
--- a/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
+++ b/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
@@ -99,12 +99,17 @@ exports[`reactively hide kube object detail item renders 1`] = `
           </div>
           <div>
             <div
-              class="DrawerTitle flex gaps align-center title"
+              class="DrawerTitle title"
             >
               <span>
                 Events
               </span>
             </div>
+            <div
+              class="empty"
+            >
+              No events found
+            </div>
           </div>
         </div>
       </div>
@@ -725,12 +730,17 @@ exports[`reactively hide kube object detail item when the item is shown renders
           </div>
           <div>
             <div
-              class="DrawerTitle flex gaps align-center title"
+              class="DrawerTitle title"
             >
               <span>
                 Events
               </span>
             </div>
+            <div
+              class="empty"
+            >
+              No events found
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/renderer/components/+events/kube-event-details.scss b/src/renderer/components/+events/kube-event-details.module.scss
similarity index 91%
rename from src/renderer/components/+events/kube-event-details.scss
rename to src/renderer/components/+events/kube-event-details.module.scss
index 4e781eaf2e..4e6b9cd5a0 100644
--- a/src/renderer/components/+events/kube-event-details.scss
+++ b/src/renderer/components/+events/kube-event-details.module.scss
@@ -22,8 +22,8 @@
       }
     }
   }
-
-  .no-items {
-    text-align: center;
-  }
+}
+
+.empty {
+  opacity: 0.6;
 }
diff --git a/src/renderer/components/+events/kube-event-details.tsx b/src/renderer/components/+events/kube-event-details.tsx
index aef3bf7b10..80c6938630 100644
--- a/src/renderer/components/+events/kube-event-details.tsx
+++ b/src/renderer/components/+events/kube-event-details.tsx
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import "./kube-event-details.scss";
+import styles from "./kube-event-details.module.scss";
 
 import React from "react";
 import { disposeOnUnmount, observer } from "mobx-react";
@@ -57,14 +57,14 @@ class NonInjectedKubeEventDetails extends React.Component<KubeEventDetailsProps
 
     return (
       <div>
-        <DrawerTitle className="flex gaps align-center">
+        <DrawerTitle>
           <span>Events</span>
         </DrawerTitle>
         {events.length > 0 && (
-          <div className="KubeEventDetails">
+          <div className={styles.KubeEventDetails}>
             {events.map(event => (
-              <div className="event" key={event.getId()}>
-                <div className={cssNames("title", { warning: event.isWarning() })}>
+              <div className={styles.event} key={event.getId()}>
+                <div className={cssNames(styles.title, { [styles.warning]: event.isWarning() })}>
                   {event.message}
                 </div>
                 <DrawerItem name="Source">
@@ -85,6 +85,11 @@ class NonInjectedKubeEventDetails extends React.Component<KubeEventDetailsProps
             ))}
           </div>
         )}
+        {events.length === 0 && (
+          <div className={styles.empty}>
+            No events found
+          </div>
+        )}
       </div>
     );
   }

From 943756bad92002a5b72bc5b9155ffd2cb3b4fa5a Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Thu, 19 Jan 2023 13:40:25 +0300
Subject: [PATCH 08/16] Fix KubeObjectDetails light theme table view (#6981)

* Add flat TableHead param

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Use flat headers across details panel tables

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 src/renderer/components/+events/event-details.tsx            | 2 +-
 .../components/+network-ingresses/ingress-details.tsx        | 2 +-
 .../+network-services/service-details-endpoint.tsx           | 2 +-
 src/renderer/components/+nodes/details-resources.tsx         | 2 +-
 .../+workloads-deployments/deployment-replicasets.tsx        | 2 +-
 src/renderer/components/+workloads-pods/pod-details-list.tsx | 2 +-
 src/renderer/components/drawer/drawer.scss                   | 4 ----
 src/renderer/components/table/table-head.scss                | 5 +++++
 src/renderer/components/table/table-head.tsx                 | 4 +++-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/renderer/components/+events/event-details.tsx b/src/renderer/components/+events/event-details.tsx
index 07842b6f78..afe2af1dc5 100644
--- a/src/renderer/components/+events/event-details.tsx
+++ b/src/renderer/components/+events/event-details.tsx
@@ -78,7 +78,7 @@ const NonInjectedEventDetails = observer(({
 
       <DrawerTitle>Involved object</DrawerTitle>
       <Table>
-        <TableHead>
+        <TableHead flat>
           <TableCell>Name</TableCell>
           <TableCell>Namespace</TableCell>
           <TableCell>Kind</TableCell>
diff --git a/src/renderer/components/+network-ingresses/ingress-details.tsx b/src/renderer/components/+network-ingresses/ingress-details.tsx
index d49d1e49a5..a01ced5b7f 100644
--- a/src/renderer/components/+network-ingresses/ingress-details.tsx
+++ b/src/renderer/components/+network-ingresses/ingress-details.tsx
@@ -37,7 +37,7 @@ class NonInjectedIngressDetails extends React.Component<IngressDetailsProps & De
           )}
           {rule.http && (
             <Table className="paths">
-              <TableHead>
+              <TableHead flat>
                 <TableCell className="path">Path</TableCell>
                 <TableCell className="link">Link</TableCell>
                 <TableCell className="backends">Backends</TableCell>
diff --git a/src/renderer/components/+network-services/service-details-endpoint.tsx b/src/renderer/components/+network-services/service-details-endpoint.tsx
index f7dec5077a..7e3eaaf34b 100644
--- a/src/renderer/components/+network-services/service-details-endpoint.tsx
+++ b/src/renderer/components/+network-services/service-details-endpoint.tsx
@@ -46,7 +46,7 @@ class NonInjectedServiceDetailsEndpoint extends React.Component<ServiceDetailsEn
           scrollable={false}
           className="box grow"
         >
-          <TableHead>
+          <TableHead flat>
             <TableCell className="name" >Name</TableCell>
             <TableCell className="endpoints">Endpoints</TableCell>
           </TableHead>
diff --git a/src/renderer/components/+nodes/details-resources.tsx b/src/renderer/components/+nodes/details-resources.tsx
index b8cb2663a1..0ea4e37019 100644
--- a/src/renderer/components/+nodes/details-resources.tsx
+++ b/src/renderer/components/+nodes/details-resources.tsx
@@ -38,7 +38,7 @@ export function NodeDetailsResources({ type, node: { status = {}}}: NodeDetailsR
         selectable
         scrollable={false}
       >
-        <TableHead sticky={false}>
+        <TableHead sticky={false} flat>
           <TableCell className="cpu">CPU</TableCell>
           <TableCell className="memory">Memory</TableCell>
           <TableCell className="ephemeral-storage">Ephemeral Storage</TableCell>
diff --git a/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx b/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx
index d46e3e7f31..fc334f87f0 100644
--- a/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx
+++ b/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx
@@ -78,7 +78,7 @@ class NonInjectedDeploymentReplicaSets extends React.Component<DeploymentReplica
           sortSyncWithUrl={false}
           className="box grow"
         >
-          <TableHead>
+          <TableHead flat>
             <TableCell className="name" sortBy={sortBy.name}>Name</TableCell>
             <TableCell className="warning"/>
             <TableCell className="namespace" sortBy={sortBy.namespace}>Namespace</TableCell>
diff --git a/src/renderer/components/+workloads-pods/pod-details-list.tsx b/src/renderer/components/+workloads-pods/pod-details-list.tsx
index 37e8dab23f..83e15f794e 100644
--- a/src/renderer/components/+workloads-pods/pod-details-list.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details-list.tsx
@@ -190,7 +190,7 @@ class NonInjectedPodDetailsList extends React.Component<PodDetailsListProps & De
           )}
           className="box grow"
         >
-          <TableHead>
+          <TableHead flat>
             <TableCell className="name" sortBy={sortBy.name}>Name</TableCell>
             <TableCell className="warning"/>
             <TableCell className="node" sortBy={sortBy.node}>Node</TableCell>
diff --git a/src/renderer/components/drawer/drawer.scss b/src/renderer/components/drawer/drawer.scss
index 2ef81a82dc..58bb056f51 100644
--- a/src/renderer/components/drawer/drawer.scss
+++ b/src/renderer/components/drawer/drawer.scss
@@ -86,9 +86,5 @@
   .drawer-content {
     overflow: auto;
     padding: var(--spacing);
-
-    .Table .TableHead {
-      border-bottom: 1px solid var(--borderFaintColor);
-    }
   }
 }
diff --git a/src/renderer/components/table/table-head.scss b/src/renderer/components/table/table-head.scss
index ff9c6afec7..6df8517389 100644
--- a/src/renderer/components/table/table-head.scss
+++ b/src/renderer/components/table/table-head.scss
@@ -36,4 +36,9 @@
       }
     }
   }
+
+  &.flat {
+    background-color: transparent;
+    font-weight: 600;
+  }
 }
diff --git a/src/renderer/components/table/table-head.tsx b/src/renderer/components/table/table-head.tsx
index d697d38365..6424d43041 100644
--- a/src/renderer/components/table/table-head.tsx
+++ b/src/renderer/components/table/table-head.tsx
@@ -15,6 +15,7 @@ export interface TableHeadProps extends React.DOMAttributes<HTMLDivElement> {
   showTopLine?: boolean; // show border line at the top
   sticky?: boolean; // keep header on top when scrolling
   nowrap?: boolean; // white-space: nowrap, align inner <TableCell> in one line
+  flat?: boolean; // no header background
 }
 
 export class TableHead extends React.Component<TableHeadProps> {
@@ -23,10 +24,11 @@ export class TableHead extends React.Component<TableHeadProps> {
   };
 
   render() {
-    const { className, sticky, nowrap, showTopLine, children, ...headProps } = this.props;
+    const { className, sticky, nowrap, showTopLine, flat, children, ...headProps } = this.props;
     const classNames = cssNames("TableHead", className, {
       sticky, nowrap,
       topLine: showTopLine,
+      flat,
     });
 
     return (

From 4b3fad57cb698bd1295c793edf1eed0e514189c1 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 19 Jan 2023 05:17:50 -0800
Subject: [PATCH 09/16] Fix extension API version being specified by library
 user (#6974)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 ...tension-api-version.global-override-for-injectable.ts | 9 +++++++++
 src/common/vars/extension-api-version.injectable.ts      | 7 ++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 src/common/vars/extension-api-version.global-override-for-injectable.ts

diff --git a/src/common/vars/extension-api-version.global-override-for-injectable.ts b/src/common/vars/extension-api-version.global-override-for-injectable.ts
new file mode 100644
index 0000000000..6d473eb1de
--- /dev/null
+++ b/src/common/vars/extension-api-version.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import extensionApiVersionInjectable from "./extension-api-version.injectable";
+
+export default getGlobalOverride(extensionApiVersionInjectable, () => "6.0.0");
diff --git a/src/common/vars/extension-api-version.injectable.ts b/src/common/vars/extension-api-version.injectable.ts
index 9b84cf1177..d4ddb92f00 100644
--- a/src/common/vars/extension-api-version.injectable.ts
+++ b/src/common/vars/extension-api-version.injectable.ts
@@ -4,15 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { SemVer } from "semver";
-import applicationInformationToken from "./application-information-token";
+import packageJson from "../../../package.json";
 
 const extensionApiVersionInjectable = getInjectable({
   id: "extension-api-version",
-  instantiate: (di) => {
-    const { major, minor, patch } = new SemVer(di.inject(applicationInformationToken).version);
+  instantiate: () => {
+    const { major, minor, patch } = new SemVer(packageJson.version);
 
     return `${major}.${minor}.${patch}`;
   },
+  causesSideEffects: true,
 });
 
 export default extensionApiVersionInjectable;

From 09e7ec1543438e85908140010a1b0b2f1ecdfaf1 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 19 Jan 2023 05:23:30 -0800
Subject: [PATCH 10/16] Release 6.4.0-alpha.4 (#6975)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9a520c79c7..c386bfe778 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "OpenLens",
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.4.0-alpha.3",
+  "version": "6.4.0-alpha.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"

From 2cc7ad111ab63722f3c835fcbbff8fed7b262d35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 08:23:41 -0500
Subject: [PATCH 11/16] Bump esbuild from 0.17.2 to 0.17.3 (#6977)

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.17.2 to 0.17.3.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.17.2...v0.17.3)

---
updated-dependencies:
- dependency-name: esbuild
  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>
---
 package.json |   2 +-
 yarn.lock    | 228 +++++++++++++++++++++++++--------------------------
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/package.json b/package.json
index c386bfe778..15e9b59c2e 100644
--- a/package.json
+++ b/package.json
@@ -387,7 +387,7 @@
     "electron": "^19.1.9",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
-    "esbuild": "^0.17.2",
+    "esbuild": "^0.17.3",
     "esbuild-loader": "^2.21.0",
     "eslint": "^8.32.0",
     "eslint-import-resolver-typescript": "^3.5.3",
diff --git a/yarn.lock b/yarn.lock
index 8fddc7a474..7b6934699b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -603,220 +603,220 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23"
   integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==
 
-"@esbuild/android-arm64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.2.tgz#73aa058f1fdc43770afd9a7b39654ce7e1b2e774"
-  integrity sha512-QSkmYISXr2uFoR+NdmmKyR5svYb0cXDCfzwNblLsrC8wTpx/I1L7u/zrjrf4aLoHoRTycZFIewJwBiUrO5DWtQ==
+"@esbuild/android-arm64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.3.tgz#35d045f69c9b4cf3f8efcd1ced24a560213d3346"
+  integrity sha512-XvJsYo3dO3Pi4kpalkyMvfQsjxPWHYjoX4MDiB/FUM4YMfWcXa5l4VCwFWVYI1+92yxqjuqrhNg0CZg3gSouyQ==
 
 "@esbuild/android-arm@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2"
   integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==
 
-"@esbuild/android-arm@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.2.tgz#7cdb67672350177edbaa1de1bedd71b295989fab"
-  integrity sha512-Art7v3xYfqH1gEMUSP0Nx67pNAlC/Y3qSg3mOw8Wg7MP9bJLXL0DrmJaV1Qz1o4FwagtvDgkVOeBDpZgxdj13Q==
+"@esbuild/android-arm@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.3.tgz#4986d26306a7440078d42b3bf580d186ef714286"
+  integrity sha512-1Mlz934GvbgdDmt26rTLmf03cAgLg5HyOgJN+ZGCeP3Q9ynYTNMn2/LQxIl7Uy+o4K6Rfi2OuLsr12JQQR8gNg==
 
 "@esbuild/android-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e"
   integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==
 
-"@esbuild/android-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.2.tgz#58cb40ea9502a619551dab8145ec19de3192f3d8"
-  integrity sha512-5VOaFBI0RK8jJVDHdeU1YJmpxXoOf1RPoiOBhk/Tvpulw7R1SwCsxHvC3eDQcoF0gV7YM4V2wJO0PR9tem6gCQ==
+"@esbuild/android-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.3.tgz#a1928cd681e4055103384103c8bd34df7b9c7b19"
+  integrity sha512-nuV2CmLS07Gqh5/GrZLuqkU9Bm6H6vcCspM+zjp9TdQlxJtIe+qqEXQChmfc7nWdyr/yz3h45Utk1tUn8Cz5+A==
 
 "@esbuild/darwin-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220"
   integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==
 
-"@esbuild/darwin-arm64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.2.tgz#d9d60f704e13611db85acf2cc1ce2ed34fe5e46a"
-  integrity sha512-iQJu1Zn1Wi91D5x/sslEn/jwae1tgSAEHK0R/kYzIr5jO992IJwDDuWhSGll23jHt18RECxahhGG0BWY/bVUTw==
+"@esbuild/darwin-arm64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.3.tgz#e4af2b392e5606a4808d3a78a99d38c27af39f1d"
+  integrity sha512-01Hxaaat6m0Xp9AXGM8mjFtqqwDjzlMP0eQq9zll9U85ttVALGCGDuEvra5Feu/NbP5AEP1MaopPwzsTcUq1cw==
 
 "@esbuild/darwin-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4"
   integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==
 
-"@esbuild/darwin-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.2.tgz#4ae5735e1cd09b584cff4b8066a246cc62b06c97"
-  integrity sha512-j750nyrwoRZd3VnPo5sd12/5U27TxFGmvmoDv93G2jiaGJPYKJ/+5IfRAvHahGePTUIRPyOlE5YLFw9MlzuBnw==
+"@esbuild/darwin-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.3.tgz#cbcbfb32c8d5c86953f215b48384287530c5a38e"
+  integrity sha512-Eo2gq0Q/er2muf8Z83X21UFoB7EU6/m3GNKvrhACJkjVThd0uA+8RfKpfNhuMCl1bKRfBzKOk6xaYKQZ4lZqvA==
 
 "@esbuild/freebsd-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27"
   integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==
 
-"@esbuild/freebsd-arm64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.2.tgz#0265bd51eb1951b27eb693fd4989a4154e32bd58"
-  integrity sha512-ti7GU+/KUQQXEPmSUep7efZpA3KR2SkKsVuSL2FE7Yxka9apuqKfymAgQmVPMxstzAgCRBIu8uEu0KFmTfs3/Q==
+"@esbuild/freebsd-arm64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.3.tgz#90ec1755abca4c3ffe1ad10819cd9d31deddcb89"
+  integrity sha512-CN62ESxaquP61n1ZjQP/jZte8CE09M6kNn3baos2SeUfdVBkWN5n6vGp2iKyb/bm/x4JQzEvJgRHLGd5F5b81w==
 
 "@esbuild/freebsd-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72"
   integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==
 
-"@esbuild/freebsd-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.2.tgz#7b29d68def0ab7c5a21e3d8ec67a7a47db5f9993"
-  integrity sha512-NgooSKWSnrNKRuiumY1dg7KAGpsyXIMcwyOXN9imnqe8VFjqqrEOMqZRik0C1wlfLjiSCuMsj+YUSmBMAJMt0A==
+"@esbuild/freebsd-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.3.tgz#8760eedc466af253c3ed0dfa2940d0e59b8b0895"
+  integrity sha512-feq+K8TxIznZE+zhdVurF3WNJ/Sa35dQNYbaqM/wsCbWdzXr5lyq+AaTUSER2cUR+SXPnd/EY75EPRjf4s1SLg==
 
 "@esbuild/linux-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca"
   integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==
 
-"@esbuild/linux-arm64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.2.tgz#4ac9edc5011e0d5e3f8673c3c3b00dc5c9bf4459"
-  integrity sha512-jcJ4cxwQyqEqgDwkqj7820nKx9cM5WBPCCU4oUXvTeG+DkkJE6/P75od0VPHmItFfEJu+/2vV85ebvFVomZcBg==
+"@esbuild/linux-arm64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.3.tgz#13916fc8873115d7d546656e19037267b12d4567"
+  integrity sha512-JHeZXD4auLYBnrKn6JYJ0o5nWJI9PhChA/Nt0G4MvLaMrvXuWnY93R3a7PiXeJQphpL1nYsaMcoV2QtuvRnF/g==
 
 "@esbuild/linux-arm@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196"
   integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==
 
-"@esbuild/linux-arm@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.2.tgz#5b3f46608b682e32255f6dce10ddcc150826df4d"
-  integrity sha512-8dfrRTd39n+THdAetwQKNwK6zBPR5oPjMtgRNXvRq8gsn/J5o69zTaOWVi3QO09BljqdShxU2dxDA09lDhdIqQ==
+"@esbuild/linux-arm@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.3.tgz#15f876d127b244635ddc09eaaa65ae97bc472a63"
+  integrity sha512-CLP3EgyNuPcg2cshbwkqYy5bbAgK+VhyfMU7oIYyn+x4Y67xb5C5ylxsNUjRmr8BX+MW3YhVNm6Lq6FKtRTWHQ==
 
 "@esbuild/linux-ia32@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54"
   integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==
 
-"@esbuild/linux-ia32@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.2.tgz#21e123e2557236c847b38c2ea4dac3d8fbd1081c"
-  integrity sha512-dXZ3m++zaRVD2fqOUPP8QTh1Lfg6WO6uZDo/QJ3KdfnIR7dDToDtaA12AgKYvCed9Nuzf/gpKs/7/f6I02b/sg==
+"@esbuild/linux-ia32@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.3.tgz#6691f02555d45b698195c81c9070ab4e521ef005"
+  integrity sha512-FyXlD2ZjZqTFh0sOQxFDiWG1uQUEOLbEh9gKN/7pFxck5Vw0qjWSDqbn6C10GAa1rXJpwsntHcmLqydY9ST9ZA==
 
 "@esbuild/linux-loong64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8"
   integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==
 
-"@esbuild/linux-loong64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.2.tgz#05e2ca319a925de0a28fe2d8a31e158f8172dac9"
-  integrity sha512-/vntXkzSe9TUp0Rh35Wgye1EOhDtmIMjwC4rtahHcALmDXL+iuQGvwGFvXrP+sBigia/ltLryMAvCiqGV6plqw==
+"@esbuild/linux-loong64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.3.tgz#f77ef657f222d8b3a8fbd530a09e40976c458d48"
+  integrity sha512-OrDGMvDBI2g7s04J8dh8/I7eSO+/E7nMDT2Z5IruBfUO/RiigF1OF6xoH33Dn4W/OwAWSUf1s2nXamb28ZklTA==
 
 "@esbuild/linux-mips64el@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726"
   integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==
 
-"@esbuild/linux-mips64el@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.2.tgz#98f0e25b86153d725d4379bc267a2cd4c9bcdd24"
-  integrity sha512-guYcNHjMRO1BMxWAeb8LDfgQaU8oeUO65xtlclwBD+hX3163KBifEHyao1hK96J10BP9n0UmZug6GhtGZaNm2Q==
+"@esbuild/linux-mips64el@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.3.tgz#fa38833cfc8bfaadaa12b243257fe6d19d0f6f79"
+  integrity sha512-DcnUpXnVCJvmv0TzuLwKBC2nsQHle8EIiAJiJ+PipEVC16wHXaPEKP0EqN8WnBe0TPvMITOUlP2aiL5YMld+CQ==
 
 "@esbuild/linux-ppc64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8"
   integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==
 
-"@esbuild/linux-ppc64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.2.tgz#45252f5343c5178dae93f8f7fc97aa4304cc5cca"
-  integrity sha512-fzHTnIGIVqgUGZcFnnisguKD4UneF4uwWwkG+i8kBspMDdU1wJ0jha1VdtxWP7Ob1KGxuXcoUlrQkCVO+Z5iOw==
+"@esbuild/linux-ppc64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.3.tgz#c157a602b627c90d174743e4b0dfb7630b101dbf"
+  integrity sha512-BDYf/l1WVhWE+FHAW3FzZPtVlk9QsrwsxGzABmN4g8bTjmhazsId3h127pliDRRu5674k1Y2RWejbpN46N9ZhQ==
 
 "@esbuild/linux-riscv64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9"
   integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==
 
-"@esbuild/linux-riscv64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.2.tgz#6c4446ad19a4d8b070ea0ddf124b6ea53750d5e2"
-  integrity sha512-Sa+z7csvNVeAsTD83tVSggOb8CAU7EdDuihC8WhtoJfuDVkF5+Vi0imaiCjXQ7Ci5rz/a8IJ1H1MWX3eI9AmuQ==
+"@esbuild/linux-riscv64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.3.tgz#7bf79614bd544bd932839b1fcff6cf1f8f6bdf1a"
+  integrity sha512-WViAxWYMRIi+prTJTyV1wnqd2mS2cPqJlN85oscVhXdb/ZTFJdrpaqm/uDsZPGKHtbg5TuRX/ymKdOSk41YZow==
 
 "@esbuild/linux-s390x@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87"
   integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==
 
-"@esbuild/linux-s390x@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.2.tgz#5c03feb73b0c3fa80834eb150cd9c14206681b4e"
-  integrity sha512-jUFCO+/VA1Y/oeauSNBubp2UtGu4xjBUEFVgMPm0qLuw6xw18yOagKwBOPVmyE3ZSFqGd9BAPZM/JrtadgBryA==
+"@esbuild/linux-s390x@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.3.tgz#6bb50c5a2613d31ce1137fe5c249ecadbecccdea"
+  integrity sha512-Iw8lkNHUC4oGP1O/KhumcVy77u2s6+KUjieUqzEU3XuWJqZ+AY7uVMrrCbAiwWTkpQHkr00BuXH5RpC6Sb/7Ug==
 
 "@esbuild/linux-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f"
   integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==
 
-"@esbuild/linux-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.2.tgz#60405f2a40fb792557293a11ba0c380cfe744fcc"
-  integrity sha512-naygxkSmr6x9tuvpa8iGefnXo3Rc3Noz7c4+Dn0MSfSWJwLaN2YR686e7HkI09irfjDdU5UAq9wcxUwjkYQNUA==
+"@esbuild/linux-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.3.tgz#aa140d99f0d9e0af388024823bfe4558d73fbbf9"
+  integrity sha512-0AGkWQMzeoeAtXQRNB3s4J1/T2XbigM2/Mn2yU1tQSmQRmHIZdkGbVq2A3aDdNslPyhb9/lH0S5GMTZ4xsjBqg==
 
 "@esbuild/netbsd-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775"
   integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==
 
-"@esbuild/netbsd-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.2.tgz#be8afb6d91827ecb8a8f42a43c63b528bbdd9c53"
-  integrity sha512-Hagbdq4EpiG9XXJY6Ozfrl2RN5jkXZXd6BD39f43tWz0d8yyOrRZlofM1eA6JYQbdv6c8BUsUOcgopavIqwx4Q==
+"@esbuild/netbsd-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.3.tgz#b6ae9948b03e4c95dc581c68358fb61d9d12a625"
+  integrity sha512-4+rR/WHOxIVh53UIQIICryjdoKdHsFZFD4zLSonJ9RRw7bhKzVyXbnRPsWSfwybYqw9sB7ots/SYyufL1mBpEg==
 
 "@esbuild/openbsd-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35"
   integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==
 
-"@esbuild/openbsd-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.2.tgz#18e9f4c8284ade701039df1de246a35161dd382e"
-  integrity sha512-Pkby+VEXY7+aWP8J2RUCfqWbbZz2M1GavRGGnE2kEPzwarba/BOk3B45PSaKwc3iKdK2rgCPCTjC/p9JoKNejA==
+"@esbuild/openbsd-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.3.tgz#cda007233e211fc9154324bfa460540cfc469408"
+  integrity sha512-cVpWnkx9IYg99EjGxa5Gc0XmqumtAwK3aoz7O4Dii2vko+qXbkHoujWA68cqXjhh6TsLaQelfDO4MVnyr+ODeA==
 
 "@esbuild/sunos-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c"
   integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==
 
-"@esbuild/sunos-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.2.tgz#c45c5b6fa406af451e3ebe2ba610bfaad106d20b"
-  integrity sha512-WAyg4dBTUsAPJ9cRnuQ23cwJWYRhP4e4y0M/l2+EpRjWW+g1MNAXKQQNNhRQ71zc8UixRVrqj+43ReHeZC8mJQ==
+"@esbuild/sunos-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.3.tgz#f1385b092000c662d360775f3fad80943d2169c4"
+  integrity sha512-RxmhKLbTCDAY2xOfrww6ieIZkZF+KBqG7S2Ako2SljKXRFi+0863PspK74QQ7JpmWwncChY25JTJSbVBYGQk2Q==
 
 "@esbuild/win32-arm64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a"
   integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==
 
-"@esbuild/win32-arm64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.2.tgz#6b6d31077cba24bd8bc9e173b9ae052b0bef5b0c"
-  integrity sha512-rMbO3gPpxuENd+AnZLgo4J/g+BkwxT3NK7nYpSZ0KlYtSdlxYMIMG5pznX7a1ISZKo67aGStne+K41jdkBywpA==
+"@esbuild/win32-arm64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.3.tgz#14e9dd9b1b55aa991f80c120fef0c4492d918801"
+  integrity sha512-0r36VeEJ4efwmofxVJRXDjVRP2jTmv877zc+i+Pc7MNsIr38NfsjkQj23AfF7l0WbB+RQ7VUb+LDiqC/KY/M/A==
 
 "@esbuild/win32-ia32@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09"
   integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==
 
-"@esbuild/win32-ia32@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.2.tgz#88bb3a510006114d8291506b6ec9ff93f66d0d5c"
-  integrity sha512-73dWKDMhFk+4owS19OjEVbEDGFPRS1fyga3qOu5HPd5eTxJTjtlVTT/fG/S7AchA0vXS7hOqY70AAir1CkmICg==
+"@esbuild/win32-ia32@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.3.tgz#de584423513d13304a6925e01233499a37a4e075"
+  integrity sha512-wgO6rc7uGStH22nur4aLFcq7Wh86bE9cOFmfTr/yxN3BXvDEdCSXyKkO+U5JIt53eTOgC47v9k/C1bITWL/Teg==
 
 "@esbuild/win32-x64@0.16.17":
   version "0.16.17"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091"
   integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==
 
-"@esbuild/win32-x64@0.17.2":
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.2.tgz#a7ce1ae475e14febb80e2690430e399491206a61"
-  integrity sha512-QFJlhf73HCBjTqAWWSIlD8JQBtmue0Dd6UV+KGccycJ3HKj1dCkXdRKJGwc5bZWiI9hrxcWsVEa1kVFaltC4vQ==
+"@esbuild/win32-x64@0.17.3":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.3.tgz#2f69ea6b37031b0d1715dd2da832a8ae5eb36e74"
+  integrity sha512-FdVl64OIuiKjgXBjwZaJLKp0eaEckifbhn10dXWhysMJkWblg3OEEGKSIyhiD5RSgAya8WzP3DNkngtIg3Nt7g==
 
 "@eslint/eslintrc@^1.4.1":
   version "1.4.1"
@@ -5762,33 +5762,33 @@ esbuild@^0.16.17:
     "@esbuild/win32-ia32" "0.16.17"
     "@esbuild/win32-x64" "0.16.17"
 
-esbuild@^0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.2.tgz#c37ee608434be1c0e79f872c8bd484fb46af59df"
-  integrity sha512-odaHSgtYafOXt2nSISwdWlfRkb4ceMX3akY1mWspQpT08jsqVYEK1XtVusr250Rmbx8AVNWjMPI/yyvKqxOKMw==
+esbuild@^0.17.3:
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.3.tgz#d9aa02a3bc441ed35f9569cd9505812ae3fcae61"
+  integrity sha512-9n3AsBRe6sIyOc6kmoXg2ypCLgf3eZSraWFRpnkto+svt8cZNuKTkb1bhQcitBcvIqjNiK7K0J3KPmwGSfkA8g==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.2"
-    "@esbuild/android-arm64" "0.17.2"
-    "@esbuild/android-x64" "0.17.2"
-    "@esbuild/darwin-arm64" "0.17.2"
-    "@esbuild/darwin-x64" "0.17.2"
-    "@esbuild/freebsd-arm64" "0.17.2"
-    "@esbuild/freebsd-x64" "0.17.2"
-    "@esbuild/linux-arm" "0.17.2"
-    "@esbuild/linux-arm64" "0.17.2"
-    "@esbuild/linux-ia32" "0.17.2"
-    "@esbuild/linux-loong64" "0.17.2"
-    "@esbuild/linux-mips64el" "0.17.2"
-    "@esbuild/linux-ppc64" "0.17.2"
-    "@esbuild/linux-riscv64" "0.17.2"
-    "@esbuild/linux-s390x" "0.17.2"
-    "@esbuild/linux-x64" "0.17.2"
-    "@esbuild/netbsd-x64" "0.17.2"
-    "@esbuild/openbsd-x64" "0.17.2"
-    "@esbuild/sunos-x64" "0.17.2"
-    "@esbuild/win32-arm64" "0.17.2"
-    "@esbuild/win32-ia32" "0.17.2"
-    "@esbuild/win32-x64" "0.17.2"
+    "@esbuild/android-arm" "0.17.3"
+    "@esbuild/android-arm64" "0.17.3"
+    "@esbuild/android-x64" "0.17.3"
+    "@esbuild/darwin-arm64" "0.17.3"
+    "@esbuild/darwin-x64" "0.17.3"
+    "@esbuild/freebsd-arm64" "0.17.3"
+    "@esbuild/freebsd-x64" "0.17.3"
+    "@esbuild/linux-arm" "0.17.3"
+    "@esbuild/linux-arm64" "0.17.3"
+    "@esbuild/linux-ia32" "0.17.3"
+    "@esbuild/linux-loong64" "0.17.3"
+    "@esbuild/linux-mips64el" "0.17.3"
+    "@esbuild/linux-ppc64" "0.17.3"
+    "@esbuild/linux-riscv64" "0.17.3"
+    "@esbuild/linux-s390x" "0.17.3"
+    "@esbuild/linux-x64" "0.17.3"
+    "@esbuild/netbsd-x64" "0.17.3"
+    "@esbuild/openbsd-x64" "0.17.3"
+    "@esbuild/sunos-x64" "0.17.3"
+    "@esbuild/win32-arm64" "0.17.3"
+    "@esbuild/win32-ia32" "0.17.3"
+    "@esbuild/win32-x64" "0.17.3"
 
 escalade@^3.1.1:
   version "3.1.1"

From 8009d96957ea1f2df67a81d2edffccc42d7e06b9 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 19 Jan 2023 05:23:50 -0800
Subject: [PATCH 12/16] Broadcast error messages within
 Cluster.getConnectionStatus (#6964)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/common/cluster/cluster.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/common/cluster/cluster.ts b/src/common/cluster/cluster.ts
index c8e7e69e90..c68fd41c8a 100644
--- a/src/common/cluster/cluster.ts
+++ b/src/common/cluster/cluster.ts
@@ -560,6 +560,8 @@ export class Cluster implements ClusterModel {
         const message = String(error.error || error.message) || String(error);
 
         this.broadcastConnectUpdate(message, true);
+      } else if (error instanceof Error || typeof error === "string") {
+        this.broadcastConnectUpdate(`${error}`, true);
       } else {
         this.broadcastConnectUpdate("Unknown error has occurred", true);
       }

From d059956c1ebec4f809e4fce060900ab599d4fc40 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 19 Jan 2023 05:24:42 -0800
Subject: [PATCH 13/16] Upgrade to codeql@v2 (#6976)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .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 e764763208..b43814b584 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,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.
@@ -54,7 +54,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
@@ -68,4 +68,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

From 8e65a0acd616bcf0769109b3b1c6c7e30ace8ab6 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 19 Jan 2023 06:34:31 -0800
Subject: [PATCH 14/16] Improve the injectability of cluster metadata detection
 (#6910)

* Improve the injectability of cluster metadata detection

- Remove unnecessary and complex base class

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Remove dead code

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Remove dead code

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/common/cluster/cluster.ts                 |  92 +++++----
 src/common/utils/type-narrowing.ts            |   2 +-
 .../base-cluster-detector.ts                  |  25 ---
 ...luster-distribution-detector.injectable.ts | 141 +++++++++++++
 .../cluster-id-detector.injectable.ts         |  43 ++++
 .../cluster-detectors/cluster-id-detector.ts  |  31 ---
 .../cluster-last-seen-detector.injectable.ts  |  32 +++
 ...cluster-nodes-count-detector.injectable.ts |  40 ++++
 .../cluster-version-detector.injectable.ts    |  28 +++
 .../create-version-detector.injectable.ts     |  21 --
 .../detect-cluster-metadata.injectable.ts     |  51 +++++
 .../detector-registry.injectable.ts           |  16 --
 .../cluster-detectors/detector-registry.ts    |  55 -----
 .../distribution-detector.ts                  | 189 ------------------
 .../cluster-detectors/last-seen-detector.ts   |  19 --
 .../cluster-detectors/nodes-count-detector.ts |  24 ---
 .../request-cluster-version.injectable.ts     |  22 ++
 src/main/cluster-detectors/token.ts           |  26 +++
 .../cluster-detectors/version-detector.ts     |  23 ---
 .../create-cluster.injectable.ts              |  10 +-
 .../setup-detector-registry.injectable.ts     |  36 ----
 .../cluster/create-cluster.injectable.ts      |   9 +-
 22 files changed, 443 insertions(+), 492 deletions(-)
 delete mode 100644 src/main/cluster-detectors/base-cluster-detector.ts
 create mode 100644 src/main/cluster-detectors/cluster-distribution-detector.injectable.ts
 create mode 100644 src/main/cluster-detectors/cluster-id-detector.injectable.ts
 delete mode 100644 src/main/cluster-detectors/cluster-id-detector.ts
 create mode 100644 src/main/cluster-detectors/cluster-last-seen-detector.injectable.ts
 create mode 100644 src/main/cluster-detectors/cluster-nodes-count-detector.injectable.ts
 create mode 100644 src/main/cluster-detectors/cluster-version-detector.injectable.ts
 delete mode 100644 src/main/cluster-detectors/create-version-detector.injectable.ts
 create mode 100644 src/main/cluster-detectors/detect-cluster-metadata.injectable.ts
 delete mode 100644 src/main/cluster-detectors/detector-registry.injectable.ts
 delete mode 100644 src/main/cluster-detectors/detector-registry.ts
 delete mode 100644 src/main/cluster-detectors/distribution-detector.ts
 delete mode 100644 src/main/cluster-detectors/last-seen-detector.ts
 delete mode 100644 src/main/cluster-detectors/nodes-count-detector.ts
 create mode 100644 src/main/cluster-detectors/request-cluster-version.injectable.ts
 create mode 100644 src/main/cluster-detectors/token.ts
 delete mode 100644 src/main/cluster-detectors/version-detector.ts
 delete mode 100644 src/main/start-main-application/runnables/setup-detector-registry.injectable.ts

diff --git a/src/common/cluster/cluster.ts b/src/common/cluster/cluster.ts
index c68fd41c8a..c769865086 100644
--- a/src/common/cluster/cluster.ts
+++ b/src/common/cluster/cluster.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { action, comparer, computed, makeObservable, observable, reaction, when } from "mobx";
+import { action, comparer, computed, makeObservable, observable, reaction, runInAction, when } from "mobx";
 import type { ClusterContextHandler } from "../../main/context-handler/context-handler";
 import type { KubeConfig } from "@kubernetes/client-node";
 import { HttpError } from "@kubernetes/client-node";
@@ -11,8 +11,6 @@ import type { Kubectl } from "../../main/kubectl/kubectl";
 import type { KubeconfigManager } from "../../main/kubeconfig-manager/kubeconfig-manager";
 import type { KubeApiResource, KubeApiResourceDescriptor } from "../rbac";
 import { formatKubeApiResource } from "../rbac";
-import type { VersionDetector } from "../../main/cluster-detectors/version-detector";
-import type { DetectorRegistry } from "../../main/cluster-detectors/detector-registry";
 import plimit from "p-limit";
 import type { ClusterState, ClusterMetricsResourceType, ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences, UpdateClusterModel, KubeAuthUpdate, ClusterConfigData } from "../cluster-types";
 import { ClusterMetadataKey, initialNodeShellImage, ClusterStatus, clusterModelIdChecker, updateClusterModelChecker } from "../cluster-types";
@@ -27,11 +25,14 @@ import type { BroadcastMessage } from "../ipc/broadcast-message.injectable";
 import type { LoadConfigfromFile } from "../kube-helpers/load-config-from-file.injectable";
 import type { CanListResource, RequestNamespaceListPermissions, RequestNamespaceListPermissionsFor } from "./request-namespace-list-permissions.injectable";
 import type { RequestApiResources } from "../../main/cluster/request-api-resources.injectable";
+import type { DetectClusterMetadata } from "../../main/cluster-detectors/detect-cluster-metadata.injectable";
+import type { FalibleOnlyClusterMetadataDetector } from "../../main/cluster-detectors/token";
 
 export interface ClusterDependencies {
   readonly directoryForKubeConfigs: string;
   readonly logger: Logger;
-  readonly detectorRegistry: DetectorRegistry;
+  readonly clusterVersionDetector: FalibleOnlyClusterMetadataDetector;
+  detectClusterMetadata: DetectClusterMetadata;
   createKubeconfigManager: (cluster: Cluster) => KubeconfigManager;
   createContextHandler: (cluster: Cluster) => ClusterContextHandler;
   createKubectl: (clusterVersion: string) => Kubectl;
@@ -39,7 +40,6 @@ export interface ClusterDependencies {
   requestApiResources: RequestApiResources;
   requestNamespaceListPermissionsFor: RequestNamespaceListPermissionsFor;
   createListNamespaces: (config: KubeConfig) => ListNamespaces;
-  createVersionDetector: (cluster: Cluster) => VersionDetector;
   broadcastMessage: BroadcastMessage;
   loadConfigfromFile: LoadConfigfromFile;
 }
@@ -444,57 +444,62 @@ export class Cluster implements ClusterModel {
   /**
    * @internal
    */
-   @action
+  @action
   async refreshAccessibilityAndMetadata() {
     await this.refreshAccessibility();
     await this.refreshMetadata();
   }
 
-   /**
-   * @internal
-   */
-   async refreshMetadata() {
-     this.dependencies.logger.info(`[CLUSTER]: refreshMetadata`, this.getMeta());
-     const metadata = await this.dependencies.detectorRegistry.detectForCluster(this);
-     const existingMetadata = this.metadata;
+  /**
+  * @internal
+  */
+  async refreshMetadata() {
+    this.dependencies.logger.info(`[CLUSTER]: refreshMetadata`, this.getMeta());
 
-     this.metadata = Object.assign(existingMetadata, metadata);
-   }
+    const newMetadata = await this.dependencies.detectClusterMetadata(this);
 
-   /**
-   * @internal
-   */
-   private async refreshAccessibility(): Promise<void> {
-     this.dependencies.logger.info(`[CLUSTER]: refreshAccessibility`, this.getMeta());
-     const proxyConfig = await this.getProxyKubeconfig();
-     const canI = this.dependencies.createAuthorizationReview(proxyConfig);
-     const requestNamespaceListPermissions = this.dependencies.requestNamespaceListPermissionsFor(proxyConfig);
+    runInAction(() => {
+      this.metadata = {
+        ...this.metadata,
+        ...newMetadata,
+      };
+    });
+  }
 
-     this.isAdmin = await canI({
-       namespace: "kube-system",
-       resource: "*",
-       verb: "create",
-     });
-     this.isGlobalWatchEnabled = await canI({
-       verb: "watch",
-       resource: "*",
-     });
-     this.allowedNamespaces.replace(await this.requestAllowedNamespaces(proxyConfig));
-     this.knownResources.replace(await this.dependencies.requestApiResources(this));
-     this.allowedResources.replace(await this.getAllowedResources(requestNamespaceListPermissions));
-     this.ready = true;
-   }
+  /**
+  * @internal
+  */
+  private async refreshAccessibility(): Promise<void> {
+    this.dependencies.logger.info(`[CLUSTER]: refreshAccessibility`, this.getMeta());
+    const proxyConfig = await this.getProxyKubeconfig();
+    const canI = this.dependencies.createAuthorizationReview(proxyConfig);
+    const requestNamespaceListPermissions = this.dependencies.requestNamespaceListPermissionsFor(proxyConfig);
+
+    this.isAdmin = await canI({
+      namespace: "kube-system",
+      resource: "*",
+      verb: "create",
+    });
+    this.isGlobalWatchEnabled = await canI({
+      verb: "watch",
+      resource: "*",
+    });
+    this.allowedNamespaces.replace(await this.requestAllowedNamespaces(proxyConfig));
+    this.knownResources.replace(await this.dependencies.requestApiResources(this));
+    this.allowedResources.replace(await this.getAllowedResources(requestNamespaceListPermissions));
+    this.ready = true;
+  }
 
   /**
    * @internal
    */
   @action
-   async refreshConnectionStatus() {
-     const connectionStatus = await this.getConnectionStatus();
+  async refreshConnectionStatus() {
+    const connectionStatus = await this.getConnectionStatus();
 
-     this.online = connectionStatus > ClusterStatus.Offline;
-     this.accessible = connectionStatus == ClusterStatus.AccessGranted;
-   }
+    this.online = connectionStatus > ClusterStatus.Offline;
+    this.accessible = connectionStatus == ClusterStatus.AccessGranted;
+  }
 
   async getKubeconfig(): Promise<KubeConfig> {
     const { config } = await this.dependencies.loadConfigfromFile(this.kubeConfigPath);
@@ -521,8 +526,7 @@ export class Cluster implements ClusterModel {
 
   protected async getConnectionStatus(): Promise<ClusterStatus> {
     try {
-      const versionDetector = this.dependencies.createVersionDetector(this);
-      const versionData = await versionDetector.detect();
+      const versionData = await this.dependencies.clusterVersionDetector.detect(this);
 
       this.metadata.version = versionData.value;
 
diff --git a/src/common/utils/type-narrowing.ts b/src/common/utils/type-narrowing.ts
index 41552c3136..68d5265237 100644
--- a/src/common/utils/type-narrowing.ts
+++ b/src/common/utils/type-narrowing.ts
@@ -130,7 +130,7 @@ export function isFunction(val: unknown): val is (...args: unknown[]) => unknown
 /**
  * Checks if the value in the second position is non-nullable
  */
-export function hasDefinedTupleValue<K, V>(pair: [K, V | undefined | null]): pair is [K, V] {
+export function hasDefinedTupleValue<K, V>(pair: readonly [K, V | undefined | null]): pair is [K, V] {
   return pair[1] != null;
 }
 
diff --git a/src/main/cluster-detectors/base-cluster-detector.ts b/src/main/cluster-detectors/base-cluster-detector.ts
deleted file mode 100644
index 1aca321dfe..0000000000
--- a/src/main/cluster-detectors/base-cluster-detector.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { RequestPromiseOptions } from "request-promise-native";
-import type { Cluster } from "../../common/cluster/cluster";
-import type { K8sRequest } from "../k8s-request.injectable";
-
-export interface ClusterDetectionResult {
-  value: string | number | boolean;
-  accuracy: number;
-}
-
-export abstract class BaseClusterDetector {
-  abstract readonly key: string;
-
-  constructor(public readonly cluster: Cluster, private _k8sRequest: K8sRequest) {}
-
-  abstract detect(): Promise<ClusterDetectionResult | null>;
-
-  protected async k8sRequest<T = any>(path: string, options: RequestPromiseOptions = {}): Promise<T> {
-    return this._k8sRequest(this.cluster, path, options);
-  }
-}
diff --git a/src/main/cluster-detectors/cluster-distribution-detector.injectable.ts b/src/main/cluster-detectors/cluster-distribution-detector.injectable.ts
new file mode 100644
index 0000000000..7a13c62515
--- /dev/null
+++ b/src/main/cluster-detectors/cluster-distribution-detector.injectable.ts
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { clusterMetadataDetectorInjectionToken } from "./token";
+import { ClusterMetadataKey } from "../../common/cluster-types";
+import { getInjectable } from "@ogre-tools/injectable";
+import k8SRequestInjectable from "../k8s-request.injectable";
+import type { Cluster } from "../../common/cluster/cluster";
+import requestClusterVersionInjectable from "./request-cluster-version.injectable";
+
+const isGKE = (version: string) => version.includes("gke");
+const isEKS = (version: string) => version.includes("eks");
+const isIKS = (version: string) => version.includes("IKS");
+const isAKS = (cluster: Cluster) => cluster.apiUrl.includes("azmk8s.io");
+const isMirantis = (version: string) => version.includes("-mirantis-") || version.includes("-docker-");
+const isDigitalOcean = (cluster: Cluster) => cluster.apiUrl.endsWith("k8s.ondigitalocean.com");
+const isMinikube = (cluster: Cluster) => cluster.contextName.startsWith("minikube");
+const isMicrok8s = (cluster: Cluster) => cluster.contextName.startsWith("microk8s");
+const isKind = (cluster: Cluster) => cluster.contextName.startsWith("kubernetes-admin@kind-");
+const isDockerDesktop = (cluster: Cluster) => cluster.contextName === "docker-desktop";
+const isTke = (version: string) => version.includes("-tke.");
+const isCustom = (version: string) => version.includes("+");
+const isVMWare = (version: string) => version.includes("+vmware");
+const isRke = (version: string) => version.includes("-rancher");
+const isRancherDesktop = (cluster: Cluster) => cluster.contextName === "rancher-desktop";
+const isK3s = (version: string) => version.includes("+k3s");
+const isK0s = (version: string) => version.includes("-k0s") || version.includes("+k0s");
+const isAlibaba = (version: string) => version.includes("-aliyun");
+const isHuawei = (version: string) => version.includes("-CCE");
+
+const clusterDistributionDetectorInjectable = getInjectable({
+  id: "cluster-distribution-detector",
+  instantiate: (di) => {
+    const k8sRequest = di.inject(k8SRequestInjectable);
+    const requestClusterVersion = di.inject(requestClusterVersionInjectable);
+    const isOpenshift = async (cluster: Cluster) => {
+      try {
+        const { paths = [] } = await k8sRequest(cluster, "") as { paths?: string[] };
+
+        return paths.includes("/apis/project.openshift.io");
+      } catch (e) {
+        return false;
+      }
+    };
+
+    return {
+      key: ClusterMetadataKey.DISTRIBUTION,
+      detect: async (cluster) => {
+        const version = await requestClusterVersion(cluster);
+
+        if (isRke(version)) {
+          return { value: "rke", accuracy: 80 };
+        }
+
+        if (isRancherDesktop(cluster)) {
+          return { value: "rancher-desktop", accuracy: 80 };
+        }
+
+        if (isK3s(version)) {
+          return { value: "k3s", accuracy: 80 };
+        }
+
+        if (isGKE(version)) {
+          return { value: "gke", accuracy: 80 };
+        }
+
+        if (isEKS(version)) {
+          return { value: "eks", accuracy: 80 };
+        }
+
+        if (isIKS(version)) {
+          return { value: "iks", accuracy: 80 };
+        }
+
+        if (isAKS(cluster)) {
+          return { value: "aks", accuracy: 80 };
+        }
+
+        if (isDigitalOcean(cluster)) {
+          return { value: "digitalocean", accuracy: 90 };
+        }
+
+        if (isK0s(version)) {
+          return { value: "k0s", accuracy: 80 };
+        }
+
+        if (isVMWare(version)) {
+          return { value: "vmware", accuracy: 90 };
+        }
+
+        if (isMirantis(version)) {
+          return { value: "mirantis", accuracy: 90 };
+        }
+
+        if (isAlibaba(version)) {
+          return { value: "alibaba", accuracy: 90 };
+        }
+
+        if (isHuawei(version)) {
+          return { value: "huawei", accuracy: 90 };
+        }
+
+        if (isTke(version)) {
+          return { value: "tencent", accuracy: 90 };
+        }
+
+        if (isMinikube(cluster)) {
+          return { value: "minikube", accuracy: 80 };
+        }
+
+        if (isMicrok8s(cluster)) {
+          return { value: "microk8s", accuracy: 80 };
+        }
+
+        if (isKind(cluster)) {
+          return { value: "kind", accuracy: 70 };
+        }
+
+        if (isDockerDesktop(cluster)) {
+          return { value: "docker-desktop", accuracy: 80 };
+        }
+
+        if (isCustom(version)) {
+          if (await isOpenshift(cluster)) {
+            return { value: "openshift", accuracy: 90 };
+          }
+
+          return { value: "custom", accuracy: 10 };
+        }
+
+        return { value: "unknown", accuracy: 10 };
+      },
+    };
+  },
+  injectionToken: clusterMetadataDetectorInjectionToken,
+});
+
+export default clusterDistributionDetectorInjectable;
+
diff --git a/src/main/cluster-detectors/cluster-id-detector.injectable.ts b/src/main/cluster-detectors/cluster-id-detector.injectable.ts
new file mode 100644
index 0000000000..8d7a90fedc
--- /dev/null
+++ b/src/main/cluster-detectors/cluster-id-detector.injectable.ts
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { clusterMetadataDetectorInjectionToken } from "./token";
+import { createHash } from "crypto";
+import { ClusterMetadataKey } from "../../common/cluster-types";
+import { getInjectable } from "@ogre-tools/injectable";
+import k8SRequestInjectable from "../k8s-request.injectable";
+import type { Cluster } from "../../common/cluster/cluster";
+
+const clusterIdDetectorFactoryInjectable = getInjectable({
+  id: "cluster-id-detector-factory",
+  instantiate: (di) => {
+    const k8sRequest = di.inject(k8SRequestInjectable);
+    const getDefaultNamespaceId = async (cluster: Cluster) => {
+      const { metadata } = await k8sRequest(cluster, "/api/v1/namespaces/default") as { metadata: { uid: string }};
+
+      return metadata.uid;
+    };
+
+    return {
+      key: ClusterMetadataKey.CLUSTER_ID,
+      detect: async (cluster) => {
+        let id: string;
+
+        try {
+          id = await getDefaultNamespaceId(cluster);
+        } catch(_) {
+          id = cluster.apiUrl;
+        }
+        const value = createHash("sha256").update(id).digest("hex");
+
+        return { value, accuracy: 100 };
+      },
+    };
+  },
+  injectionToken: clusterMetadataDetectorInjectionToken,
+});
+
+export default clusterIdDetectorFactoryInjectable;
+
diff --git a/src/main/cluster-detectors/cluster-id-detector.ts b/src/main/cluster-detectors/cluster-id-detector.ts
deleted file mode 100644
index 8f1486fcb1..0000000000
--- a/src/main/cluster-detectors/cluster-id-detector.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { BaseClusterDetector } from "./base-cluster-detector";
-import { createHash } from "crypto";
-import { ClusterMetadataKey } from "../../common/cluster-types";
-
-export class ClusterIdDetector extends BaseClusterDetector {
-  key = ClusterMetadataKey.CLUSTER_ID;
-
-  public async detect() {
-    let id: string;
-
-    try {
-      id = await this.getDefaultNamespaceId();
-    } catch(_) {
-      id = this.cluster.apiUrl;
-    }
-    const value = createHash("sha256").update(id).digest("hex");
-
-    return { value, accuracy: 100 };
-  }
-
-  protected async getDefaultNamespaceId() {
-    const response = await this.k8sRequest("/api/v1/namespaces/default");
-
-    return response.metadata.uid;
-  }
-}
diff --git a/src/main/cluster-detectors/cluster-last-seen-detector.injectable.ts b/src/main/cluster-detectors/cluster-last-seen-detector.injectable.ts
new file mode 100644
index 0000000000..64b05b22ab
--- /dev/null
+++ b/src/main/cluster-detectors/cluster-last-seen-detector.injectable.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { clusterMetadataDetectorInjectionToken } from "./token";
+import { ClusterMetadataKey } from "../../common/cluster-types";
+import { getInjectable } from "@ogre-tools/injectable";
+import requestClusterVersionInjectable from "./request-cluster-version.injectable";
+
+const clusterLastSeenDetectorInjectable = getInjectable({
+  id: "cluster-last-seen-detector",
+  instantiate: (di) => {
+    const requestClusterVersion = di.inject(requestClusterVersionInjectable);
+
+    return {
+      key: ClusterMetadataKey.LAST_SEEN,
+      detect: async (cluster) => {
+        try {
+          await requestClusterVersion(cluster);
+
+          return { value: new Date().toJSON(), accuracy: 100 };
+        } catch {
+          return null;
+        }
+      },
+    };
+  },
+  injectionToken: clusterMetadataDetectorInjectionToken,
+});
+
+export default clusterLastSeenDetectorInjectable;
diff --git a/src/main/cluster-detectors/cluster-nodes-count-detector.injectable.ts b/src/main/cluster-detectors/cluster-nodes-count-detector.injectable.ts
new file mode 100644
index 0000000000..e9f0f91e65
--- /dev/null
+++ b/src/main/cluster-detectors/cluster-nodes-count-detector.injectable.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { clusterMetadataDetectorInjectionToken } from "./token";
+import { ClusterMetadataKey } from "../../common/cluster-types";
+import { getInjectable } from "@ogre-tools/injectable";
+import k8SRequestInjectable from "../k8s-request.injectable";
+import type { Cluster } from "../../common/cluster/cluster";
+
+const clusterNodeCountDetectorInjectable = getInjectable({
+  id: "cluster-node-count-detector",
+  instantiate: (di) => {
+    const k8sRequest = di.inject(k8SRequestInjectable);
+    const requestNodeCount = async (cluster: Cluster) => {
+      const { items } = await k8sRequest(cluster, "/api/v1/nodes") as { items: unknown[] };
+
+      return items.length;
+    };
+
+    return {
+      key: ClusterMetadataKey.NODES_COUNT,
+      detect: async (cluster) => {
+        try {
+          return {
+            value: await requestNodeCount(cluster),
+            accuracy: 1000,
+          };
+        } catch {
+          return null;
+        }
+      },
+    };
+  },
+  injectionToken: clusterMetadataDetectorInjectionToken,
+});
+
+export default clusterNodeCountDetectorInjectable;
+
diff --git a/src/main/cluster-detectors/cluster-version-detector.injectable.ts b/src/main/cluster-detectors/cluster-version-detector.injectable.ts
new file mode 100644
index 0000000000..82d8c18fdc
--- /dev/null
+++ b/src/main/cluster-detectors/cluster-version-detector.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { clusterMetadataDetectorInjectionToken } from "./token";
+import { ClusterMetadataKey } from "../../common/cluster-types";
+import { getInjectable } from "@ogre-tools/injectable";
+import requestClusterVersionInjectable from "./request-cluster-version.injectable";
+
+const clusterVersionDetectorInjectable = getInjectable({
+  id: "cluster-version-detector",
+  instantiate: (di) => {
+    const requestClusterVersion = di.inject(requestClusterVersionInjectable);
+
+    return {
+      key: ClusterMetadataKey.VERSION,
+      detect: async (cluster) => ({
+        value: await requestClusterVersion(cluster),
+        accuracy: 100,
+      }),
+    };
+  },
+  injectionToken: clusterMetadataDetectorInjectionToken,
+});
+
+export default clusterVersionDetectorInjectable;
+
diff --git a/src/main/cluster-detectors/create-version-detector.injectable.ts b/src/main/cluster-detectors/create-version-detector.injectable.ts
deleted file mode 100644
index efd59dcfc3..0000000000
--- a/src/main/cluster-detectors/create-version-detector.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { VersionDetector } from "./version-detector";
-import k8sRequestInjectable from "../k8s-request.injectable";
-import type { Cluster } from "../../common/cluster/cluster";
-
-const createVersionDetectorInjectable = getInjectable({
-  id: "create-version-detector",
-
-  instantiate: (di) => {
-    const k8sRequest = di.inject(k8sRequestInjectable);
-
-    return (cluster: Cluster) =>
-      new VersionDetector(cluster, k8sRequest);
-  },
-});
-
-export default createVersionDetectorInjectable;
diff --git a/src/main/cluster-detectors/detect-cluster-metadata.injectable.ts b/src/main/cluster-detectors/detect-cluster-metadata.injectable.ts
new file mode 100644
index 0000000000..3665f74f52
--- /dev/null
+++ b/src/main/cluster-detectors/detect-cluster-metadata.injectable.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { pipeline } from "@ogre-tools/fp";
+import { getInjectable } from "@ogre-tools/injectable";
+import { groupBy, reduce } from "lodash";
+import { filter, map } from "lodash/fp";
+import type { ClusterMetadata } from "../../common/cluster-types";
+import type { Cluster } from "../../common/cluster/cluster";
+import { hasDefinedTupleValue, isDefined, object } from "../../common/utils";
+import type { ClusterDetectionResult, ClusterMetadataDetector } from "./token";
+import { clusterMetadataDetectorInjectionToken } from "./token";
+
+export type DetectClusterMetadata = (cluster: Cluster) => Promise<ClusterMetadata>;
+
+const pickHighestAccuracy = (prev: ClusterDetectionResult, curr: ClusterDetectionResult) => (
+  prev.accuracy > curr.accuracy
+    ? prev
+    : curr
+);
+
+const detectMetadataWithFor = (cluster: Cluster) => async (clusterMetadataDetector: ClusterMetadataDetector) => {
+  try {
+    return await clusterMetadataDetector.detect(cluster);
+  } catch {
+    return null;
+  }
+};
+
+const detectClusterMetadataInjectable = getInjectable({
+  id: "detect-cluster-metadata",
+  instantiate: (di): DetectClusterMetadata => {
+    const clusterMetadataDetectors = di.injectMany(clusterMetadataDetectorInjectionToken);
+
+    return async (cluster) => {
+      const entries = pipeline(
+        await Promise.all(clusterMetadataDetectors.map(detectMetadataWithFor(cluster))),
+        filter(isDefined),
+        (arg) => groupBy(arg, "key"),
+        (arg) => object.entries(arg),
+        map(([ key, results ]) => [key, reduce(results, pickHighestAccuracy)] as const),
+        filter(hasDefinedTupleValue),
+      );
+
+      return object.fromEntries(entries);
+    };
+  },
+});
+
+export default detectClusterMetadataInjectable;
diff --git a/src/main/cluster-detectors/detector-registry.injectable.ts b/src/main/cluster-detectors/detector-registry.injectable.ts
deleted file mode 100644
index 344e82003f..0000000000
--- a/src/main/cluster-detectors/detector-registry.injectable.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { DetectorRegistry } from "./detector-registry";
-import k8sRequestInjectable from "../k8s-request.injectable";
-
-const detectorRegistryInjectable = getInjectable({
-  id: "detector-registry",
-
-  instantiate: (di) =>
-    new DetectorRegistry({ k8sRequest: di.inject(k8sRequestInjectable) }),
-});
-
-export default detectorRegistryInjectable;
diff --git a/src/main/cluster-detectors/detector-registry.ts b/src/main/cluster-detectors/detector-registry.ts
deleted file mode 100644
index 395d819850..0000000000
--- a/src/main/cluster-detectors/detector-registry.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { observable } from "mobx";
-import type { ClusterMetadata } from "../../common/cluster-types";
-import type { Cluster } from "../../common/cluster/cluster";
-import type { BaseClusterDetector, ClusterDetectionResult } from "./base-cluster-detector";
-import type { K8sRequest } from "../k8s-request.injectable";
-
-interface Dependencies {
-  k8sRequest: K8sRequest;
-}
-
-export type DetectorConstructor = new (cluster: Cluster, k8sRequest: K8sRequest) => BaseClusterDetector;
-
-export class DetectorRegistry {
-  constructor(private dependencies: Dependencies) {}
-
-  registry = observable.array<DetectorConstructor>([], { deep: false });
-
-  add(detectorClass: DetectorConstructor): this {
-    this.registry.push(detectorClass);
-
-    return this;
-  }
-
-  async detectForCluster(cluster: Cluster): Promise<ClusterMetadata> {
-    const results: { [key: string]: ClusterDetectionResult } = {};
-
-    for (const detectorClass of this.registry) {
-      const detector = new detectorClass(cluster, this.dependencies.k8sRequest);
-
-      try {
-        const data = await detector.detect();
-
-        if (!data) continue;
-        const existingValue = results[detector.key];
-
-        if (existingValue && existingValue.accuracy > data.accuracy) continue; // previous value exists and is more accurate
-        results[detector.key] = data;
-      } catch (e) {
-        // detector raised error, do nothing
-      }
-    }
-    const metadata: ClusterMetadata = {};
-
-    for (const [key, result] of Object.entries(results)) {
-      metadata[key] = result.value;
-    }
-
-    return metadata;
-  }
-}
diff --git a/src/main/cluster-detectors/distribution-detector.ts b/src/main/cluster-detectors/distribution-detector.ts
deleted file mode 100644
index dcdacfb253..0000000000
--- a/src/main/cluster-detectors/distribution-detector.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { BaseClusterDetector } from "./base-cluster-detector";
-import { ClusterMetadataKey } from "../../common/cluster-types";
-
-export class DistributionDetector extends BaseClusterDetector {
-  key = ClusterMetadataKey.DISTRIBUTION;
-
-  public async detect() {
-    const version = await this.getKubernetesVersion();
-
-    if (this.isRke(version)) {
-      return { value: "rke", accuracy: 80 };
-    }
-
-    if (this.isRancherDesktop()) {
-      return { value: "rancher-desktop", accuracy: 80 };
-    }
-
-    if (this.isK3s(version)) {
-      return { value: "k3s", accuracy: 80 };
-    }
-
-    if (this.isGKE(version)) {
-      return { value: "gke", accuracy: 80 };
-    }
-
-    if (this.isEKS(version)) {
-      return { value: "eks", accuracy: 80 };
-    }
-
-    if (this.isIKS(version)) {
-      return { value: "iks", accuracy: 80 };
-    }
-
-    if (this.isAKS()) {
-      return { value: "aks", accuracy: 80 };
-    }
-
-    if (this.isDigitalOcean()) {
-      return { value: "digitalocean", accuracy: 90 };
-    }
-
-    if (this.isK0s(version)) {
-      return { value: "k0s", accuracy: 80 };
-    }
-
-    if (this.isVMWare(version)) {
-      return { value: "vmware", accuracy: 90 };
-    }
-
-    if (this.isMirantis(version)) {
-      return { value: "mirantis", accuracy: 90 };
-    }
-
-    if (this.isAlibaba(version)) {
-      return { value: "alibaba", accuracy: 90 };
-    }
-
-    if (this.isHuawei(version)) {
-      return { value: "huawei", accuracy: 90 };
-    }
-
-    if (this.isTke(version)) {
-      return { value: "tencent", accuracy: 90 };
-    }
-
-    if (this.isMinikube()) {
-      return { value: "minikube", accuracy: 80 };
-    }
-
-    if (this.isMicrok8s()) {
-      return { value: "microk8s", accuracy: 80 };
-    }
-
-    if (this.isKind()) {
-      return { value: "kind", accuracy: 70 };
-    }
-
-    if (this.isDockerDesktop()) {
-      return { value: "docker-desktop", accuracy: 80 };
-    }
-
-    if (this.isCustom(version) && await this.isOpenshift()) {
-      return { value: "openshift", accuracy: 90 };
-    }
-
-    if (this.isCustom(version)) {
-      return { value: "custom", accuracy: 10 };
-    }
-
-    return { value: "unknown", accuracy: 10 };
-  }
-
-  public async getKubernetesVersion() {
-    const response = await this.k8sRequest("/version");
-
-    return response.gitVersion;
-  }
-
-  protected isGKE(version: string) {
-    return version.includes("gke");
-  }
-
-  protected isEKS(version: string) {
-    return version.includes("eks");
-  }
-
-  protected isIKS(version: string) {
-    return version.includes("IKS");
-  }
-
-  protected isAKS() {
-    return this.cluster.apiUrl.includes("azmk8s.io");
-  }
-
-  protected isMirantis(version: string) {
-    return version.includes("-mirantis-") || version.includes("-docker-");
-  }
-
-  protected isDigitalOcean() {
-    return this.cluster.apiUrl.endsWith("k8s.ondigitalocean.com");
-  }
-
-  protected isMinikube() {
-    return this.cluster.contextName.startsWith("minikube");
-  }
-
-  protected isMicrok8s() {
-    return this.cluster.contextName.startsWith("microk8s");
-  }
-
-  protected isKind() {
-    return this.cluster.contextName.startsWith("kubernetes-admin@kind-");
-  }
-
-  protected isDockerDesktop() {
-    return this.cluster.contextName === "docker-desktop";
-  }
-
-  protected isTke(version: string) {
-    return version.includes("-tke.");
-  }
-
-  protected isCustom(version: string) {
-    return version.includes("+");
-  }
-
-  protected isVMWare(version: string) {
-    return version.includes("+vmware");
-  }
-
-  protected isRke(version: string) {
-    return version.includes("-rancher");
-  }
-
-  protected isRancherDesktop() {
-    return this.cluster.contextName === "rancher-desktop";
-  }
-
-  protected isK3s(version: string) {
-    return version.includes("+k3s");
-  }
-
-  protected isK0s(version: string) {
-    return version.includes("-k0s") || version.includes("+k0s");
-  }
-
-  protected isAlibaba(version: string) {
-    return version.includes("-aliyun");
-  }
-
-  protected isHuawei(version: string) {
-    return version.includes("-CCE");
-  }
-
-  protected async isOpenshift() {
-    try {
-      const response = await this.k8sRequest("");
-
-      return response.paths?.includes("/apis/project.openshift.io");
-    } catch (e) {
-      return false;
-    }
-  }
-}
diff --git a/src/main/cluster-detectors/last-seen-detector.ts b/src/main/cluster-detectors/last-seen-detector.ts
deleted file mode 100644
index 087557f083..0000000000
--- a/src/main/cluster-detectors/last-seen-detector.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { BaseClusterDetector } from "./base-cluster-detector";
-import { ClusterMetadataKey } from "../../common/cluster-types";
-
-export class LastSeenDetector extends BaseClusterDetector {
-  key = ClusterMetadataKey.LAST_SEEN;
-
-  public async detect() {
-    if (!this.cluster.accessible) return null;
-
-    await this.k8sRequest("/version");
-
-    return { value: new Date().toJSON(), accuracy: 100 };
-  }
-}
diff --git a/src/main/cluster-detectors/nodes-count-detector.ts b/src/main/cluster-detectors/nodes-count-detector.ts
deleted file mode 100644
index f9b3c02dbf..0000000000
--- a/src/main/cluster-detectors/nodes-count-detector.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { BaseClusterDetector } from "./base-cluster-detector";
-import { ClusterMetadataKey } from "../../common/cluster-types";
-
-export class NodesCountDetector extends BaseClusterDetector {
-  key = ClusterMetadataKey.NODES_COUNT;
-
-  public async detect() {
-    if (!this.cluster.accessible) return null;
-    const nodeCount = await this.getNodeCount();
-
-    return { value: nodeCount, accuracy: 100 };
-  }
-
-  protected async getNodeCount(): Promise<number> {
-    const response = await this.k8sRequest("/api/v1/nodes");
-
-    return response.items.length;
-  }
-}
diff --git a/src/main/cluster-detectors/request-cluster-version.injectable.ts b/src/main/cluster-detectors/request-cluster-version.injectable.ts
new file mode 100644
index 0000000000..3863e75a0c
--- /dev/null
+++ b/src/main/cluster-detectors/request-cluster-version.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Cluster } from "../../common/cluster/cluster";
+import k8SRequestInjectable from "../k8s-request.injectable";
+
+const requestClusterVersionInjectable = getInjectable({
+  id: "request-cluster-version",
+  instantiate: (di) => {
+    const k8sRequest = di.inject(k8SRequestInjectable);
+
+    return async (cluster: Cluster) => {
+      const { gitVersion } = await k8sRequest(cluster, "/version") as { gitVersion: string };
+
+      return gitVersion;
+    };
+  },
+});
+
+export default requestClusterVersionInjectable;
diff --git a/src/main/cluster-detectors/token.ts b/src/main/cluster-detectors/token.ts
new file mode 100644
index 0000000000..fc9031c815
--- /dev/null
+++ b/src/main/cluster-detectors/token.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { Cluster } from "../../common/cluster/cluster";
+
+export interface ClusterDetectionResult {
+  value: string | number | boolean;
+  accuracy: number;
+}
+
+export interface FalibleOnlyClusterMetadataDetector {
+  readonly key: string;
+  detect(cluster: Cluster): Promise<ClusterDetectionResult>;
+}
+
+export interface ClusterMetadataDetector {
+  readonly key: string;
+  detect(cluster: Cluster): Promise<ClusterDetectionResult | null>;
+}
+
+export const clusterMetadataDetectorInjectionToken = getInjectionToken<ClusterMetadataDetector>({
+  id: "cluster-metadata-detector-token",
+});
diff --git a/src/main/cluster-detectors/version-detector.ts b/src/main/cluster-detectors/version-detector.ts
deleted file mode 100644
index cc228734c5..0000000000
--- a/src/main/cluster-detectors/version-detector.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { BaseClusterDetector } from "./base-cluster-detector";
-import { ClusterMetadataKey } from "../../common/cluster-types";
-
-export class VersionDetector extends BaseClusterDetector {
-  key = ClusterMetadataKey.VERSION;
-
-  public async detect() {
-    const version = await this.getKubernetesVersion();
-
-    return { value: version, accuracy: 100 };
-  }
-
-  public async getKubernetesVersion() {
-    const response = await this.k8sRequest("/version");
-
-    return response.gitVersion;
-  }
-}
diff --git a/src/main/create-cluster/create-cluster.injectable.ts b/src/main/create-cluster/create-cluster.injectable.ts
index 760e8e2e75..79eee5a151 100644
--- a/src/main/create-cluster/create-cluster.injectable.ts
+++ b/src/main/create-cluster/create-cluster.injectable.ts
@@ -14,11 +14,11 @@ import authorizationReviewInjectable from "../../common/cluster/authorization-re
 import listNamespacesInjectable from "../../common/cluster/list-namespaces.injectable";
 import createListApiResourcesInjectable from "../cluster/request-api-resources.injectable";
 import loggerInjectable from "../../common/logger.injectable";
-import detectorRegistryInjectable from "../cluster-detectors/detector-registry.injectable";
-import createVersionDetectorInjectable from "../cluster-detectors/create-version-detector.injectable";
 import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable";
 import loadConfigfromFileInjectable from "../../common/kube-helpers/load-config-from-file.injectable";
 import requestNamespaceListPermissionsForInjectable from "../../common/cluster/request-namespace-list-permissions.injectable";
+import detectClusterMetadataInjectable from "../cluster-detectors/detect-cluster-metadata.injectable";
+import clusterVersionDetectorInjectable from "../cluster-detectors/cluster-version-detector.injectable";
 
 const createClusterInjectable = getInjectable({
   id: "create-cluster",
@@ -26,6 +26,8 @@ const createClusterInjectable = getInjectable({
   instantiate: (di) => {
     const dependencies: ClusterDependencies = {
       directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable),
+      logger: di.inject(loggerInjectable),
+      clusterVersionDetector: di.inject(clusterVersionDetectorInjectable),
       createKubeconfigManager: di.inject(createKubeconfigManagerInjectable),
       createKubectl: di.inject(createKubectlInjectable),
       createContextHandler: di.inject(createContextHandlerInjectable),
@@ -33,11 +35,9 @@ const createClusterInjectable = getInjectable({
       requestNamespaceListPermissionsFor: di.inject(requestNamespaceListPermissionsForInjectable),
       requestApiResources: di.inject(createListApiResourcesInjectable),
       createListNamespaces: di.inject(listNamespacesInjectable),
-      logger: di.inject(loggerInjectable),
-      detectorRegistry: di.inject(detectorRegistryInjectable),
-      createVersionDetector: di.inject(createVersionDetectorInjectable),
       broadcastMessage: di.inject(broadcastMessageInjectable),
       loadConfigfromFile: di.inject(loadConfigfromFileInjectable),
+      detectClusterMetadata: di.inject(detectClusterMetadataInjectable),
     };
 
     return (model, configData) => new Cluster(dependencies, model, configData);
diff --git a/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts b/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts
deleted file mode 100644
index 0e8b7ffba2..0000000000
--- a/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { ClusterIdDetector } from "../../cluster-detectors/cluster-id-detector";
-import { LastSeenDetector } from "../../cluster-detectors/last-seen-detector";
-import { VersionDetector } from "../../cluster-detectors/version-detector";
-import { DistributionDetector } from "../../cluster-detectors/distribution-detector";
-import { NodesCountDetector } from "../../cluster-detectors/nodes-count-detector";
-import detectorRegistryInjectable from "../../cluster-detectors/detector-registry.injectable";
-import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token";
-
-const setupDetectorRegistryInjectable = getInjectable({
-  id: "setup-detector-registry",
-
-  instantiate: (di) => {
-    const detectorRegistry = di.inject(detectorRegistryInjectable);
-
-    return {
-      id: "setup-detector-registry",
-      run: () => {
-        detectorRegistry
-          .add(ClusterIdDetector)
-          .add(LastSeenDetector)
-          .add(VersionDetector)
-          .add(DistributionDetector)
-          .add(NodesCountDetector);
-      },
-    };
-  },
-
-  injectionToken: onLoadOfApplicationInjectionToken,
-});
-
-export default setupDetectorRegistryInjectable;
diff --git a/src/renderer/cluster/create-cluster.injectable.ts b/src/renderer/cluster/create-cluster.injectable.ts
index 385dfe8d66..ff8ea38fff 100644
--- a/src/renderer/cluster/create-cluster.injectable.ts
+++ b/src/renderer/cluster/create-cluster.injectable.ts
@@ -29,9 +29,12 @@ const createClusterInjectable = getInjectable({
       createAuthorizationReview: () => { throw new Error("Tried to access back-end feature in front-end."); },
       requestNamespaceListPermissionsFor: () => { throw new Error("Tried to access back-end feature in front-end."); },
       createListNamespaces: () => { throw new Error("Tried to access back-end feature in front-end."); },
-      requestApiResources: ()=> { throw new Error("Tried to access back-end feature in front-end."); },
-      detectorRegistry: undefined as never,
-      createVersionDetector: () => { throw new Error("Tried to access back-end feature in front-end."); },
+      requestApiResources: () => { throw new Error("Tried to access back-end feature in front-end."); },
+      detectClusterMetadata: () => { throw new Error("Tried to access back-end feature in front-end."); },
+      clusterVersionDetector: {
+        detect: () => { throw new Error("Tried to access back-end feature in front-end."); },
+        key: "irrelavent",
+      },
     };
 
     return (model, configData) => new Cluster(dependencies, model, configData);

From 305c4a5573e9e2c8b8768b2515052f54b446061b Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 19 Jan 2023 06:35:33 -0800
Subject: [PATCH 15/16] Remove last usages of request in our code (#6911)

* Improve the injectability of cluster metadata detection

- Remove unnecessary and complex base class

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Remove dead code

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Remove dead code

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Remove last usages of request in our code

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Remove more deps

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix lensFetch

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 package.json                                  |  5 --
 src/common/cluster/cluster.ts                 |  3 +-
 ...ns-fetch.global-override-for-injectable.ts |  9 ++++
 src/common/fetch/lens-fetch.injectable.ts     | 37 ++++++++++++++
 src/main/get-metrics.injectable.ts            | 14 ++++--
 src/main/k8s-request.injectable.ts            | 48 ++++++++++++-------
 yarn.lock                                     | 48 ++++---------------
 7 files changed, 98 insertions(+), 66 deletions(-)
 create mode 100644 src/common/fetch/lens-fetch.global-override-for-injectable.ts
 create mode 100644 src/common/fetch/lens-fetch.injectable.ts

diff --git a/package.json b/package.json
index 15e9b59c2e..d17c26f248 100644
--- a/package.json
+++ b/package.json
@@ -287,8 +287,6 @@
     "react-router": "^5.3.4",
     "react-virtualized-auto-sizer": "^1.0.7",
     "readable-stream": "^3.6.0",
-    "request": "^2.88.2",
-    "request-promise-native": "^1.0.9",
     "rfc6902": "^5.0.1",
     "selfsigned": "^2.1.1",
     "semver": "^7.3.8",
@@ -355,8 +353,6 @@
     "@types/react-virtualized-auto-sizer": "^1.0.1",
     "@types/react-window": "^1.8.5",
     "@types/readable-stream": "^2.3.13",
-    "@types/request": "^2.48.7",
-    "@types/request-promise-native": "^1.0.18",
     "@types/semver": "^7.3.13",
     "@types/sharp": "^0.31.1",
     "@types/tar": "^6.1.3",
@@ -461,7 +457,6 @@
     "@types/react-router-dom": "^5.3.3",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
     "@types/react-window": "^1.8.5",
-    "@types/request-promise-native": "^1.0.18",
     "@types/tar": "^6.1.3",
     "@types/tcp-port-used": "^1.0.1",
     "@types/url-parse": "^1.4.8",
diff --git a/src/common/cluster/cluster.ts b/src/common/cluster/cluster.ts
index c769865086..3f353dfee4 100644
--- a/src/common/cluster/cluster.ts
+++ b/src/common/cluster/cluster.ts
@@ -15,7 +15,6 @@ import plimit from "p-limit";
 import type { ClusterState, ClusterMetricsResourceType, ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences, UpdateClusterModel, KubeAuthUpdate, ClusterConfigData } from "../cluster-types";
 import { ClusterMetadataKey, initialNodeShellImage, ClusterStatus, clusterModelIdChecker, updateClusterModelChecker } from "../cluster-types";
 import { disposer, isDefined, isRequestError, toJS } from "../utils";
-import type { Response } from "request";
 import { clusterListNamespaceForbiddenChannel } from "../ipc/cluster";
 import type { CanI } from "./authorization-review.injectable";
 import type { ListNamespaces } from "./list-namespaces.injectable";
@@ -658,7 +657,7 @@ export class Cluster implements ClusterModel {
       const namespaceList = [ctx?.namespace].filter(isDefined);
 
       if (namespaceList.length === 0 && error instanceof HttpError && error.statusCode === 403) {
-        const { response } = error as HttpError & { response: Response };
+        const { response } = error as HttpError & { response: { body: unknown }};
 
         this.dependencies.logger.info("[CLUSTER]: listing namespaces is forbidden, broadcasting", { clusterId: this.id, error: response.body });
         this.dependencies.broadcastMessage(clusterListNamespaceForbiddenChannel, this.id);
diff --git a/src/common/fetch/lens-fetch.global-override-for-injectable.ts b/src/common/fetch/lens-fetch.global-override-for-injectable.ts
new file mode 100644
index 0000000000..0bc144b1be
--- /dev/null
+++ b/src/common/fetch/lens-fetch.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverrideForFunction } from "../test-utils/get-global-override-for-function";
+import lensFetchInjectable from "./lens-fetch.injectable";
+
+export default getGlobalOverrideForFunction(lensFetchInjectable);
diff --git a/src/common/fetch/lens-fetch.injectable.ts b/src/common/fetch/lens-fetch.injectable.ts
new file mode 100644
index 0000000000..a90818e6cb
--- /dev/null
+++ b/src/common/fetch/lens-fetch.injectable.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { Agent } from "https";
+import type { RequestInit, Response } from "node-fetch";
+import lensProxyPortInjectable from "../../main/lens-proxy/lens-proxy-port.injectable";
+import lensProxyCertificateInjectable from "../certificate/lens-proxy-certificate.injectable";
+import nodeFetchModuleInjectable from "./fetch-module.injectable";
+
+export type LensRequestInit = Omit<RequestInit, "agent">;
+
+export type LensFetch = (pathnameAndQuery: string, init?: LensRequestInit) => Promise<Response>;
+
+const lensFetchInjectable = getInjectable({
+  id: "lens-fetch",
+  instantiate: (di): LensFetch => {
+    const { default: fetch } = di.inject(nodeFetchModuleInjectable);
+    const lensProxyPort = di.inject(lensProxyPortInjectable);
+    const lensProxyCertificate = di.inject(lensProxyCertificateInjectable);
+
+    return async (pathnameAndQuery, init = {}) => {
+      const agent = new Agent({
+        ca: lensProxyCertificate.get().cert,
+      });
+
+      return fetch(`https://127.0.0.1:${lensProxyPort.get()}${pathnameAndQuery}`, {
+        ...init,
+        agent,
+      });
+    };
+  },
+  causesSideEffects: true,
+});
+
+export default lensFetchInjectable;
diff --git a/src/main/get-metrics.injectable.ts b/src/main/get-metrics.injectable.ts
index 0ceaf01735..7a17ce3884 100644
--- a/src/main/get-metrics.injectable.ts
+++ b/src/main/get-metrics.injectable.ts
@@ -4,16 +4,19 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { Cluster } from "../common/cluster/cluster";
+import nodeFetchModuleInjectable from "../common/fetch/fetch-module.injectable";
 import type { RequestMetricsParams } from "../common/k8s-api/endpoints/metrics.api/request-metrics.injectable";
+import { object } from "../common/utils";
 import k8sRequestInjectable from "./k8s-request.injectable";
 
-export type GetMetrics = (cluster: Cluster, prometheusPath: string, queryParams: RequestMetricsParams & { query: string }) => Promise<any>;
+export type GetMetrics = (cluster: Cluster, prometheusPath: string, queryParams: RequestMetricsParams & { query: string }) => Promise<unknown>;
 
 const getMetricsInjectable = getInjectable({
   id: "get-metrics",
 
   instantiate: (di): GetMetrics => {
     const k8sRequest = di.inject(k8sRequestInjectable);
+    const { FormData } = di.inject(nodeFetchModuleInjectable);
 
     return async (
       cluster,
@@ -22,13 +25,16 @@ const getMetricsInjectable = getInjectable({
     ) => {
       const prometheusPrefix = cluster.preferences.prometheus?.prefix || "";
       const metricsPath = `/api/v1/namespaces/${prometheusPath}/proxy${prometheusPrefix}/api/v1/query_range`;
+      const body = new FormData();
+
+      for (const [key, value] of object.entries(queryParams)) {
+        body.set(key, value.toString());
+      }
 
       return k8sRequest(cluster, metricsPath, {
         timeout: 0,
-        resolveWithFullResponse: false,
-        json: true,
         method: "POST",
-        form: queryParams,
+        body,
       });
     };
   },
diff --git a/src/main/k8s-request.injectable.ts b/src/main/k8s-request.injectable.ts
index c00e70ec3f..b15056b50b 100644
--- a/src/main/k8s-request.injectable.ts
+++ b/src/main/k8s-request.injectable.ts
@@ -2,35 +2,49 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { RequestPromiseOptions } from "request-promise-native";
-import request from "request-promise-native";
 import type { Cluster } from "../common/cluster/cluster";
 import { getInjectable } from "@ogre-tools/injectable";
-import lensProxyPortInjectable from "./lens-proxy/lens-proxy-port.injectable";
-import lensProxyCertificateInjectable from "../common/certificate/lens-proxy-certificate.injectable";
+import type { LensRequestInit } from "../common/fetch/lens-fetch.injectable";
+import lensFetchInjectable from "../common/fetch/lens-fetch.injectable";
+import { withTimeout } from "../common/fetch/timeout-controller";
 
-export type K8sRequest = (cluster: Cluster, path: string, options?: RequestPromiseOptions) => Promise<any>;
+export interface K8sRequestInit extends LensRequestInit {
+  timeout?: number;
+}
+
+export type K8sRequest = (cluster: Cluster, pathnameAndQuery: string, init?: K8sRequestInit) => Promise<unknown>;
 
 const k8sRequestInjectable = getInjectable({
   id: "k8s-request",
 
-  instantiate: (di) => {
-    const lensProxyPort = di.inject(lensProxyPortInjectable);
-    const lensProxyCertificate = di.inject(lensProxyCertificateInjectable);
+  instantiate: (di): K8sRequest => {
+    const lensFetch = di.inject(lensFetchInjectable);
 
     return async (
-      cluster: Cluster,
-      path: string,
-      options: RequestPromiseOptions = {},
+      cluster,
+      pathnameAndQuery,
+      {
+        timeout = 30_000,
+        signal,
+        ...init
+      } = {},
     ) => {
-      const kubeProxyUrl = `https://127.0.0.1:${lensProxyPort.get()}/${cluster.id}`;
+      const controller = timeout ? withTimeout(timeout) : undefined;
 
-      options.ca = lensProxyCertificate.get().cert;
-      options.headers ??= {};
-      options.json ??= true;
-      options.timeout ??= 30000;
+      if (controller) {
+        signal?.addEventListener("abort", () => controller.abort());
+      }
 
-      return request(kubeProxyUrl + path, options);
+      const response = await lensFetch(`/${cluster.id}${pathnameAndQuery}`, {
+        ...init,
+        signal: controller?.signal ?? signal,
+      });
+
+      if (response.status < 200 || response.status >= 300) {
+        throw new Error(`Failed to ${init.method ?? "get"} ${pathnameAndQuery} for clusterId=${cluster.id}: ${response.statusText}`, { cause: response });
+      }
+
+      return response.json();
     };
   },
 });
diff --git a/yarn.lock b/yarn.lock
index 7b6934699b..7a28c3c71b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2619,14 +2619,7 @@
   resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.29.tgz#68ccecec3d4ffdafb9c577fe764f912afc050fe6"
   integrity sha512-QSvevZ+IRww2ldtfv1QskYsqVVVwCKQf1XbwtcyyoRvLIQzfyPhj/C+3+PKzSDRdiyejaiLgnq//XTkleorpLg==
 
-"@types/request-promise-native@^1.0.18":
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/@types/request-promise-native/-/request-promise-native-1.0.18.tgz#437ee2d0b772e01c9691a983b558084b4b3efc2c"
-  integrity sha512-tPnODeISFc/c1LjWyLuZUY+Z0uLB3+IMfNoQyDEi395+j6kTFTTRAqjENjoPJUid4vHRGEozoTrcTrfZM+AcbA==
-  dependencies:
-    "@types/request" "*"
-
-"@types/request@*", "@types/request@^2.47.1", "@types/request@^2.48.7":
+"@types/request@^2.47.1":
   version "2.48.8"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.8.tgz#0b90fde3b655ab50976cb8c5ac00faca22f5a82c"
   integrity sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==
@@ -11471,23 +11464,7 @@ repeat-string@^1.5.2, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.88.0, request@^2.88.2:
+request@^2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -12346,11 +12323,6 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 stream-buffers@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521"
@@ -12906,14 +12878,6 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tough-cookie@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
@@ -12923,6 +12887,14 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"

From 8634c3b56f9e38703f24aecb325c115140160a55 Mon Sep 17 00:00:00 2001
From: Juho Heikka <juho.heikka@gmail.com>
Date: Thu, 19 Jan 2023 18:47:20 +0200
Subject: [PATCH 16/16] Do not show Created on DetailsPane when there's no
 timestamp. (#6984)

---
 ...when-cluster-is-not-relevant.test.tsx.snap | 45 -------------------
 ...hide-kube-object-detail-item.test.tsx.snap | 30 -------------
 .../kube-object-meta/kube-object-meta.tsx     |  2 +-
 3 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
index 6a0943b664..71d807a43d 100644
--- a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -54,21 +54,6 @@ exports[`disable kube object detail items when cluster is not relevant given ext
         <div
           class="drawer-content flex column box grow"
         >
-          <div
-            class="DrawerItem"
-          >
-            <span
-              class="name"
-            >
-              Created
-            </span>
-            <span
-              class="value"
-            >
-              &lt;unknown&gt;
-               ago 
-            </span>
-          </div>
           <div
             class="DrawerItem"
           >
@@ -685,21 +670,6 @@ exports[`disable kube object detail items when cluster is not relevant given ext
         <div
           class="drawer-content flex column box grow"
         >
-          <div
-            class="DrawerItem"
-          >
-            <span
-              class="name"
-            >
-              Created
-            </span>
-            <span
-              class="value"
-            >
-              &lt;unknown&gt;
-               ago 
-            </span>
-          </div>
           <div
             class="DrawerItem"
           >
@@ -1311,21 +1281,6 @@ exports[`disable kube object detail items when cluster is not relevant given not
         <div
           class="drawer-content flex column box grow"
         >
-          <div
-            class="DrawerItem"
-          >
-            <span
-              class="name"
-            >
-              Created
-            </span>
-            <span
-              class="value"
-            >
-              &lt;unknown&gt;
-               ago 
-            </span>
-          </div>
           <div
             class="DrawerItem"
           >
diff --git a/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap b/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
index 578fcae9e9..9222e8a538 100644
--- a/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
+++ b/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap
@@ -54,21 +54,6 @@ exports[`reactively hide kube object detail item renders 1`] = `
         <div
           class="drawer-content flex column box grow"
         >
-          <div
-            class="DrawerItem"
-          >
-            <span
-              class="name"
-            >
-              Created
-            </span>
-            <span
-              class="value"
-            >
-              &lt;unknown&gt;
-               ago 
-            </span>
-          </div>
           <div
             class="DrawerItem"
           >
@@ -680,21 +665,6 @@ exports[`reactively hide kube object detail item when the item is shown renders
         <div
           class="drawer-content flex column box grow"
         >
-          <div
-            class="DrawerItem"
-          >
-            <span
-              class="name"
-            >
-              Created
-            </span>
-            <span
-              class="value"
-            >
-              &lt;unknown&gt;
-               ago 
-            </span>
-          </div>
           <div
             class="DrawerItem"
           >
diff --git a/src/renderer/components/kube-object-meta/kube-object-meta.tsx b/src/renderer/components/kube-object-meta/kube-object-meta.tsx
index 593f2cb2ae..a61ee7dd60 100644
--- a/src/renderer/components/kube-object-meta/kube-object-meta.tsx
+++ b/src/renderer/components/kube-object-meta/kube-object-meta.tsx
@@ -62,7 +62,7 @@ const NonInjectedKubeObjectMeta = observer(({
 
   return (
     <>
-      <DrawerItem name="Created" hidden={isHidden("creationTimestamp")}>
+      <DrawerItem name="Created" hidden={isHidden("creationTimestamp") || !creationTimestamp}>
         <KubeObjectAge object={object} compact={false} />
         {" ago "}
         {creationTimestamp && <LocaleDate date={creationTimestamp} />}