From 70967294e78597b4cf85a0181887fea8453b0fd0 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 29 Aug 2022 07:39:14 -0700 Subject: [PATCH 01/21] Revert eslint-plugin-react to 7.30.1 to fix linting (#6130) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 523e78c75b..b0be4336de 100644 --- a/package.json +++ b/package.json @@ -383,7 +383,7 @@ "eslint": "^8.22.0", "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.26.0", - "eslint-plugin-react": "^7.31.0", + "eslint-plugin-react": "7.30.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-unused-imports": "^2.0.0", "flex.box": "^3.4.4", diff --git a/yarn.lock b/yarn.lock index bd1ba7712e..f1315fb493 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5852,10 +5852,10 @@ eslint-plugin-react-hooks@^4.6.0: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== -eslint-plugin-react@^7.31.0: - version "7.31.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.1.tgz#d29793ed27743f3ed8a473c347b1bf5a0a8fb9af" - integrity sha512-j4/2xWqt/R7AZzG8CakGHA6Xa/u7iR8Q3xCxY+AUghdT92bnIDOBEefV456OeH0QvBcroVc0eyvrrLSyQGYIfg== +eslint-plugin-react@7.30.1: + version "7.30.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz#2be4ab23ce09b5949c6631413ba64b2810fd3e22" + integrity sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg== dependencies: array-includes "^3.1.5" array.prototype.flatmap "^1.3.0" From 45a4de5ae5ad4ef9607197ee88353226523f19af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:48:39 -0400 Subject: [PATCH 02/21] Bump @types/semver from 7.3.10 to 7.3.12 (#6127) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b0be4336de..2447201e14 100644 --- a/package.json +++ b/package.json @@ -348,7 +348,7 @@ "@types/readable-stream": "^2.3.13", "@types/request": "^2.48.7", "@types/request-promise-native": "^1.0.18", - "@types/semver": "^7.3.10", + "@types/semver": "^7.3.12", "@types/sharp": "^0.30.5", "@types/spdy": "^3.4.5", "@types/tar": "^4.0.5", diff --git a/yarn.lock b/yarn.lock index f1315fb493..d6351cfad4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2337,10 +2337,10 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@types/semver@^7.3.10", "@types/semver@^7.3.6": - version "7.3.10" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73" - integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw== +"@types/semver@^7.3.12", "@types/semver@^7.3.6": + version "7.3.12" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c" + integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A== "@types/serve-index@^1.9.1": version "1.9.1" From 63d7b9b99155a106c061bf9eb7ce1d8233b50d3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:49:37 -0400 Subject: [PATCH 03/21] Bump typedoc from 0.23.10 to 0.23.11 (#6124) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 2447201e14..e6347a1702 100644 --- a/package.json +++ b/package.json @@ -426,7 +426,7 @@ "ts-node": "^10.9.1", "type-fest": "^2.14.0", "typed-emitter": "^1.4.0", - "typedoc": "0.23.10", + "typedoc": "0.23.11", "typedoc-plugin-markdown": "^3.13.1", "typescript": "^4.7.4", "typescript-plugin-css-modules": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index d6351cfad4..9104ed23fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9387,7 +9387,7 @@ markdown@^0.5.0: dependencies: nopt "~2.1.1" -marked@^4.0.18, marked@^4.0.19: +marked@^4.0.19: version "4.0.19" resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.19.tgz#d36198d1ac1255525153c351c68c75bc1d7aee46" integrity sha512-rgQF/OxOiLcvgUAj1Q1tAf4Bgxn5h5JZTp04Fx4XUkVhs7B+7YA9JEWJhJpoO8eJt8MkZMwqLCNeNqj1bCREZQ== @@ -12321,14 +12321,14 @@ shelljs@^0.8.5: interpret "^1.0.0" rechoir "^0.6.2" -shiki@^0.10.1: - version "0.10.1" - resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.10.1.tgz#6f9a16205a823b56c072d0f1a0bcd0f2646bef14" - integrity sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng== +shiki@^0.11.1: + version "0.11.1" + resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.11.1.tgz#df0f719e7ab592c484d8b73ec10e215a503ab8cc" + integrity sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA== dependencies: jsonc-parser "^3.0.0" vscode-oniguruma "^1.6.1" - vscode-textmate "5.2.0" + vscode-textmate "^6.0.0" side-channel@^1.0.4: version "1.0.4" @@ -13464,15 +13464,15 @@ typedoc-plugin-markdown@^3.13.1: dependencies: handlebars "^4.7.7" -typedoc@0.23.10: - version "0.23.10" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.10.tgz#285d595a5f2e35ccdf6f38eba4dfe951d5bff461" - integrity sha512-03EUiu/ZuScUBMnY6p0lY+HTH8SwhzvRE3gImoemdPDWXPXlks83UGTx++lyquWeB1MTwm9D9Ca8RIjkK3AFfQ== +typedoc@0.23.11: + version "0.23.11" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.11.tgz#eacdc389038efd6de40a3c4561c413ad00f1ab16" + integrity sha512-FhZ2HfqlS++53UwHk4txCsTrTlpYR0So/0osMyBeP1E7llRNRqycJGfYK1qx9Wvvv5VO8tGdpwzOwDW5FrTi7A== dependencies: lunr "^2.3.9" - marked "^4.0.18" + marked "^4.0.19" minimatch "^5.1.0" - shiki "^0.10.1" + shiki "^0.11.1" typescript-plugin-css-modules@^3.4.0: version "3.4.0" @@ -13798,10 +13798,10 @@ vscode-oniguruma@^1.6.1: resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz#aeb9771a2f1dbfc9083c8a7fdd9cccaa3f386607" integrity sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA== -vscode-textmate@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" - integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== +vscode-textmate@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-6.0.0.tgz#a3777197235036814ac9a92451492f2748589210" + integrity sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ== w3c-hr-time@^1.0.2: version "1.0.2" From f2c392edde3e619a211d1f88e3a679f7b1fca788 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:49:54 -0400 Subject: [PATCH 04/21] Bump playwright from 1.24.2 to 1.25.1 (#6126) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index e6347a1702..19de3e7750 100644 --- a/package.json +++ b/package.json @@ -404,7 +404,7 @@ "node-gyp": "^8.3.0", "node-loader": "^2.0.0", "nodemon": "^2.0.19", - "playwright": "^1.24.2", + "playwright": "^1.25.1", "postcss": "^8.4.16", "postcss-loader": "^6.2.1", "randomcolor": "^0.6.2", diff --git a/yarn.lock b/yarn.lock index 9104ed23fc..5eb918bee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10884,17 +10884,17 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -playwright-core@1.24.2: - version "1.24.2" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.24.2.tgz#47bc5adf3dcfcc297a5a7a332449c9009987db26" - integrity sha512-zfAoDoPY/0sDLsgSgLZwWmSCevIg1ym7CppBwllguVBNiHeixZkc1AdMuYUPZC6AdEYc4CxWEyLMBTw2YcmRrA== +playwright-core@1.25.1: + version "1.25.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.25.1.tgz#abe56aec8bef645fba988320d9f9328fafab0446" + integrity sha512-lSvPCmA2n7LawD2Hw7gSCLScZ+vYRkhU8xH0AapMyzwN+ojoDqhkH/KIEUxwNu2PjPoE/fcE0wLAksdOhJ2O5g== -playwright@^1.24.2: - version "1.24.2" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.24.2.tgz#51e60f128b386023e5ee83deca23453aaf73ba6d" - integrity sha512-iMWDLgaFRT+7dXsNeYwgl8nhLHsUrzFyaRVC+ftr++P1dVs70mPrFKBZrGp1fOKigHV9d1syC03IpPbqLKlPsg== +playwright@^1.25.1: + version "1.25.1" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.25.1.tgz#23fe129ca05568a72ee2a3842baa0a1985d1b345" + integrity sha512-kOlW7mllnQ70ALTwAor73q/FhdH9EEXLUqjdzqioYLcSVC4n4NBfDqeCikGuayFZrLECLkU6Hcbziy/szqTXSA== dependencies: - playwright-core "1.24.2" + playwright-core "1.25.1" plist@^3.0.1, plist@^3.0.4: version "3.0.5" From 642300c71fa0ca0af9801825b14fbbb0754cdb75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:50:17 -0400 Subject: [PATCH 05/21] Bump eslint from 8.22.0 to 8.23.0 (#6125) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 19de3e7750..3f53e2aabe 100644 --- a/package.json +++ b/package.json @@ -380,7 +380,7 @@ "electron-notarize": "^0.3.0", "esbuild": "^0.15.5", "esbuild-loader": "^2.19.0", - "eslint": "^8.22.0", + "eslint": "^8.23.0", "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.26.0", "eslint-plugin-react": "7.30.1", diff --git a/yarn.lock b/yarn.lock index 5eb918bee7..514e0dde3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -608,14 +608,14 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.5.tgz#91aef76d332cdc7c8942b600fa2307f3387e6f82" integrity sha512-UHkDFCfSGTuXq08oQltXxSZmH1TXyWsL+4QhZDWvvLl6mEJQqk3u7/wq1LjhrrAXYIllaTtRSzUXl4Olkf2J8A== -"@eslint/eslintrc@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" - integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== +"@eslint/eslintrc@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d" + integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.2" + espree "^9.4.0" globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -753,6 +753,11 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d" integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA== +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" @@ -5917,14 +5922,15 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.22.0: - version "8.22.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz#78fcb044196dfa7eef30a9d65944f6f980402c48" - integrity sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA== +eslint@^8.23.0: + version "8.23.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040" + integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA== dependencies: - "@eslint/eslintrc" "^1.3.0" + "@eslint/eslintrc" "^1.3.1" "@humanwhocodes/config-array" "^0.10.4" "@humanwhocodes/gitignore-to-minimatch" "^1.0.2" + "@humanwhocodes/module-importer" "^1.0.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -5934,7 +5940,7 @@ eslint@^8.22.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.3" + espree "^9.4.0" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -5960,12 +5966,11 @@ eslint@^8.22.0: strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -espree@^9.3.2, espree@^9.3.3: - version "9.3.3" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d" - integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng== +espree@^9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a" + integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" @@ -13736,11 +13741,6 @@ v8-compile-cache-lib@^3.0.1: resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== -v8-compile-cache@^2.0.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== - v8-to-istanbul@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" From 77672161671d8f8c25ace59dcf9bc4c15cd00fd0 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 29 Aug 2022 23:46:52 -0700 Subject: [PATCH 06/21] Fix issues when using newer @types/semver (#6132) - All the removed uses of `includePrerelease` that are removed were not actually used within the semver package Signed-off-by: Sebastian Malton Signed-off-by: Sebastian Malton --- src/common/utils/sort-compare.ts | 2 +- .../is-compatible-extension/is-compatible-extension.ts | 1 - src/main/kubectl/kubectl.ts | 2 +- .../+extensions/attempt-install-by-info.injectable.tsx | 2 +- src/renderer/components/+helm-charts/helm-chart.store.ts | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/utils/sort-compare.ts b/src/common/utils/sort-compare.ts index df4c59b961..ee32ab45c4 100644 --- a/src/common/utils/sort-compare.ts +++ b/src/common/utils/sort-compare.ts @@ -81,7 +81,7 @@ export function sortCharts(charts: RawHelmChart[]) { iter.map( charts, chart => { - const __version = coerce(chart.version, { includePrerelease: true, loose: true }); + const __version = coerce(chart.version, { loose: true }); if (!__version) { logger.warn(`[HELM-SERVICE]: Version from helm chart is not loosely coercable to semver.`, { name: chart.name, version: chart.version, repo: chart.repo }); diff --git a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts index 44b0f1782d..717effa1c6 100644 --- a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts +++ b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts @@ -27,7 +27,6 @@ export const isCompatibleExtension = ({ appSemVer }: Dependencies): ((manifest: const { major: extMajor, minor: extMinor } = semver.coerce(manifestLensEngine, { loose: true, - includePrerelease: false, }) as semver.SemVer; const supportedVersionsByExtension = semver.validRange(`^${extMajor}.${extMinor}`) as string; diff --git a/src/main/kubectl/kubectl.ts b/src/main/kubectl/kubectl.ts index 6fde083de5..2e70f3c7ee 100644 --- a/src/main/kubectl/kubectl.ts +++ b/src/main/kubectl/kubectl.ts @@ -67,7 +67,7 @@ export class Kubectl { let version: SemVer; try { - version = new SemVer(clusterVersion, { includePrerelease: false }); + version = new SemVer(clusterVersion); } catch { version = new SemVer(Kubectl.bundledKubectlVersion); } diff --git a/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx b/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx index 0af3149e1b..dd320407a5 100644 --- a/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx +++ b/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx @@ -91,7 +91,7 @@ const attemptInstallByInfo = ({ } } else { const versions = Object.keys(json.versions) - .map(version => new SemVer(version, { loose: true, includePrerelease: true })) + .map(version => new SemVer(version, { loose: true })) // ignore pre-releases for auto picking the version .filter(version => version.prerelease.length === 0); diff --git a/src/renderer/components/+helm-charts/helm-chart.store.ts b/src/renderer/components/+helm-charts/helm-chart.store.ts index 1a3c4d7d7f..415fe3e333 100644 --- a/src/renderer/components/+helm-charts/helm-chart.store.ts +++ b/src/renderer/components/+helm-charts/helm-chart.store.ts @@ -55,7 +55,7 @@ export class HelmChartStore extends ItemStore { protected sortVersions = (versions: ChartVersion[]) => { return versions - .map(chartVersion => ({ ...chartVersion, __version: semver.coerce(chartVersion.version, { includePrerelease: true, loose: true }) })) + .map(chartVersion => ({ ...chartVersion, __version: semver.coerce(chartVersion.version, { loose: true }) })) .sort(sortCompareChartVersions) .map(({ __version, ...chartVersion }) => chartVersion); }; From 4b1c9fb5fdcedca4c7cb371cbd24c4410ad8b6e7 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 30 Aug 2022 04:54:18 -0700 Subject: [PATCH 07/21] Fix doughnut graphs on workload overview sometimes not showing (#5727) --- .../allowed-resources-injection-token.ts | 4 +- src/extensions/renderer-api/theming.ts | 12 +- .../order-of-sidebar-items.test.tsx.snap | 2 + ...-and-tab-navigation-for-core.test.tsx.snap | 5 + ...ab-navigation-for-extensions.test.tsx.snap | 5 + .../visibility-of-sidebar-items.test.tsx.snap | 2 + .../workload-overview.test.tsx.snap | 576 ++++++++++++++++++ ...when-cluster-is-not-relevant.test.tsx.snap | 2 + ...when-cluster-is-not-relevant.test.tsx.snap | 3 + ...e-from-previously-opened-tab.test.tsx.snap | 2 + .../cluster/workload-overview.test.tsx | 37 ++ ...when-cluster-is-not-relevant.test.tsx.snap | 3 + ...rt-from-previously-opened-tab.test.ts.snap | 2 + .../components/+cluster/cluster-issues.tsx | 11 +- .../+cluster/cluster-pie-charts.tsx | 13 +- .../release-details-model.injectable.tsx | 14 +- .../components/+nodes/node-charts.tsx | 13 +- .../volume-claim-disk-chart.tsx | 13 +- .../+workloads-overview/overview-statuses.tsx | 2 +- .../overview-workload-status.tsx | 141 +++-- .../+workloads-overview/overview.tsx | 2 +- .../workloads/workload-injection-token.ts | 3 +- .../+workloads-pods/container-charts.tsx | 13 +- src/renderer/components/chart/bar-chart.tsx | 13 +- src/renderer/components/chart/chart.tsx | 36 +- src/renderer/components/chart/pie-chart.tsx | 28 +- .../components/dock/terminal/view.tsx | 11 +- .../components/item-object-list/content.tsx | 13 +- .../monaco-editor/monaco-editor.tsx | 11 +- src/renderer/components/select/select.tsx | 12 +- .../test-utils/get-application-builder.tsx | 9 +- .../__snapshots__/cluster-frame.test.tsx.snap | 1 + src/renderer/themes/active.injectable.ts | 18 + src/renderer/themes/lens-dark.ts | 4 +- src/renderer/themes/lens-light.ts | 4 +- src/renderer/themes/store.ts | 12 +- 36 files changed, 868 insertions(+), 184 deletions(-) create mode 100644 src/features/cluster/__snapshots__/workload-overview.test.tsx.snap create mode 100644 src/features/cluster/workload-overview.test.tsx create mode 100644 src/renderer/themes/active.injectable.ts diff --git a/src/common/cluster-store/allowed-resources-injection-token.ts b/src/common/cluster-store/allowed-resources-injection-token.ts index ad387d26a2..353d0b309c 100644 --- a/src/common/cluster-store/allowed-resources-injection-token.ts +++ b/src/common/cluster-store/allowed-resources-injection-token.ts @@ -6,8 +6,6 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { IComputedValue } from "mobx"; -export const allowedResourcesInjectionToken = getInjectionToken< - IComputedValue> ->({ +export const allowedResourcesInjectionToken = getInjectionToken>>({ id: "allowed-resources", }); diff --git a/src/extensions/renderer-api/theming.ts b/src/extensions/renderer-api/theming.ts index a39efc80b7..435cf23504 100644 --- a/src/extensions/renderer-api/theming.ts +++ b/src/extensions/renderer-api/theming.ts @@ -3,11 +3,17 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import themeStoreInjectable from "../../renderer/themes/store.injectable"; +import activeThemeInjectable from "../../renderer/themes/active.injectable"; +import type { LensTheme } from "../../renderer/themes/store"; import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; -const themeStore = asLegacyGlobalForExtensionApi(themeStoreInjectable); +export const activeTheme = asLegacyGlobalForExtensionApi(activeThemeInjectable); +/** + * @deprecated This hides the reactivity of active theme, use {@link activeTheme} instead + */ export function getActiveTheme() { - return themeStore.activeTheme; + return activeTheme.get(); } + +export type { LensTheme }; diff --git a/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap index 3dccc2e925..b9d854220c 100644 --- a/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap +++ b/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap @@ -350,6 +350,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+ + Pods (0) + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+ +`; diff --git a/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap index 1ec0fb09cb..8d5a23815e 100644 --- a/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap +++ b/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap @@ -691,6 +691,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
{ + let rendered: RenderResult; + let applicationBuilder: ApplicationBuilder; + + beforeEach(async () => { + applicationBuilder = getApplicationBuilder().setEnvironmentToClusterFrame(); + applicationBuilder.allowKubeResource("pods"); + rendered = await applicationBuilder.render(); + }); + + describe("when navigating to workload overview", () => { + beforeEach(() => { + applicationBuilder.navigateWith(navigateToWorkloadsOverviewInjectable); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows workload overview", () => { + expect(rendered.queryByTestId("page-for-workloads-overview")).toBeInTheDocument(); + }); + + it("shows pods pie chart", () => { + expect(rendered.queryByTestId("workload-overview-status-chart-pods")).toBeInTheDocument(); + }); + }); +}); diff --git a/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap index 5040538e31..27900116a3 100644 --- a/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap +++ b/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap @@ -290,6 +290,7 @@ exports[`disable workloads overview details when cluster is not relevant given e
; nodeStore: NodeStore; eventStore: EventStore; apiManager: ApiManager; @@ -166,7 +167,7 @@ class NonInjectedClusterIssues extends React.Component Message @@ -191,7 +192,7 @@ class NonInjectedClusterIssues extends React.Component(NonInjectedClusterIssues, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), apiManager: di.inject(apiManagerInjectable), eventStore: di.inject(eventStoreInjectable), nodeStore: di.inject(nodeStoreInjectable), diff --git a/src/renderer/components/+cluster/cluster-pie-charts.tsx b/src/renderer/components/+cluster/cluster-pie-charts.tsx index 94612d2229..6d633c9eb9 100644 --- a/src/renderer/components/+cluster/cluster-pie-charts.tsx +++ b/src/renderer/components/+cluster/cluster-pie-charts.tsx @@ -16,12 +16,13 @@ import type { PieChartData } from "../chart"; import { PieChart } from "../chart"; import { ClusterNoMetrics } from "./cluster-no-metrics"; import { bytesToUnits, cssNames } from "../../utils"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { getMetricLastPoints } from "../../../common/k8s-api/endpoints/metrics.api"; import { withInjectables } from "@ogre-tools/injectable-react"; import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-overview-store.injectable"; import nodeStoreInjectable from "../+nodes/store.injectable"; -import themeStoreInjectable from "../../themes/store.injectable"; +import type { IComputedValue } from "mobx"; +import activeThemeInjectable from "../../themes/active.injectable"; function createLabels(rawLabelData: [string, number | undefined][]): string[] { return rawLabelData.map(([key, value]) => `${key}: ${value?.toFixed(2) || "N/A"}`); @@ -30,13 +31,13 @@ function createLabels(rawLabelData: [string, number | undefined][]): string[] { interface Dependencies { clusterOverviewStore: ClusterOverviewStore; nodeStore: NodeStore; - themeStore: ThemeStore; + activeTheme: IComputedValue; } const NonInjectedClusterPieCharts = observer(({ clusterOverviewStore, nodeStore, - themeStore, + activeTheme, }: Dependencies) => { const renderLimitWarning = () => { return ( @@ -54,7 +55,7 @@ const NonInjectedClusterPieCharts = observer(({ const { podUsage, podAllocatableCapacity, podCapacity } = data; const cpuLimitsOverload = cpuLimits > cpuAllocatableCapacity; const memoryLimitsOverload = memoryLimits > memoryAllocatableCapacity; - const defaultColor = themeStore.activeTheme.colors.pieChartDefaultColor; + const defaultColor = activeTheme.get().colors.pieChartDefaultColor; if (!memoryCapacity || !cpuCapacity || !podCapacity || !memoryAllocatableCapacity || !cpuAllocatableCapacity || !podAllocatableCapacity) return null; const cpuData: PieChartData = { @@ -261,6 +262,6 @@ export const ClusterPieCharts = withInjectables(NonInjectedCluster getProps: (di) => ({ clusterOverviewStore: di.inject(clusterOverviewStoreInjectable), nodeStore: di.inject(nodeStoreInjectable), - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx index 640ee88412..f36e3c8cce 100644 --- a/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx @@ -3,13 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; -import type { IObservableValue } from "mobx"; +import type { IComputedValue, IObservableValue } from "mobx"; import { runInAction, action, observable, computed } from "mobx"; import type { TargetHelmRelease } from "../target-helm-release.injectable"; import type { CallForHelmRelease, DetailedHelmRelease } from "./call-for-helm-release/call-for-helm-release.injectable"; import callForHelmReleaseInjectable from "./call-for-helm-release/call-for-helm-release.injectable"; -import type { ThemeStore } from "../../../../themes/store"; -import themeStoreInjectable from "../../../../themes/store.injectable"; +import type { LensTheme } from "../../../../themes/store"; import type { CallForHelmReleaseConfiguration } from "./call-for-helm-release-configuration/call-for-helm-release-configuration.injectable"; import callForHelmReleaseConfigurationInjectable from "./call-for-helm-release-configuration/call-for-helm-release-configuration.injectable"; import { toHelmRelease } from "../../releases.injectable"; @@ -31,6 +30,7 @@ import type { NavigateToHelmReleases } from "../../../../../common/front-end-rou import navigateToHelmReleasesInjectable from "../../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; import assert from "assert"; import withOrphanPromiseInjectable from "../../../../../common/utils/with-orphan-promise/with-orphan-promise.injectable"; +import activeThemeInjectable from "../../../../themes/active.injectable"; const releaseDetailsModelInjectable = getInjectable({ id: "release-details-model", @@ -38,7 +38,7 @@ const releaseDetailsModelInjectable = getInjectable({ instantiate: (di, targetRelease: TargetHelmRelease) => { const callForHelmRelease = di.inject(callForHelmReleaseInjectable); const callForHelmReleaseConfiguration = di.inject(callForHelmReleaseConfigurationInjectable); - const themeStore = di.inject(themeStoreInjectable); + const activeTheme = di.inject(activeThemeInjectable); const getResourceDetailsUrl = di.inject(getResourceDetailsUrlInjectable); const updateRelease = di.inject(updateReleaseInjectable); const showCheckedErrorNotification = di.inject(showCheckedErrorNotificationInjectable); @@ -50,7 +50,7 @@ const releaseDetailsModelInjectable = getInjectable({ const model = new ReleaseDetailsModel({ callForHelmRelease, targetRelease, - themeStore, + activeTheme, callForHelmReleaseConfiguration, getResourceDetailsUrl, updateRelease, @@ -92,7 +92,7 @@ export interface ConfigurationInput { interface Dependencies { callForHelmRelease: CallForHelmRelease; targetRelease: TargetHelmRelease; - themeStore: ThemeStore; + activeTheme: IComputedValue; callForHelmReleaseConfiguration: CallForHelmReleaseConfiguration; getResourceDetailsUrl: GetResourceDetailsUrl; updateRelease: CallForHelmReleaseUpdate; @@ -259,7 +259,7 @@ export class ReleaseDetailsModel { } @computed get activeTheme() { - return this.dependencies.themeStore.activeTheme.type; + return this.dependencies.activeTheme.get().type; } close = () => { diff --git a/src/renderer/components/+nodes/node-charts.tsx b/src/renderer/components/+nodes/node-charts.tsx index 2214721a33..36ec85227e 100644 --- a/src/renderer/components/+nodes/node-charts.tsx +++ b/src/renderer/components/+nodes/node-charts.tsx @@ -12,18 +12,19 @@ import { ResourceMetricsContext } from "../resource-metrics"; import { observer } from "mobx-react"; import { mapValues } from "lodash"; import { type MetricsTab, metricTabOptions } from "../chart/options"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; +import type { IComputedValue } from "mobx"; +import activeThemeInjectable from "../../themes/active.injectable"; export interface NodeChartsProps {} interface Dependencies { - themeStore: ThemeStore; + activeTheme: IComputedValue; } const NonInjectedNodeCharts = observer(({ - themeStore, + activeTheme, }: Dependencies & NodeChartsProps) => { const { metrics, tab, object } = useContext(ResourceMetricsContext) ?? {}; @@ -31,7 +32,7 @@ const NonInjectedNodeCharts = observer(({ if (isMetricsEmpty(metrics)) return ; const id = object.getId(); - const { chartCapacityColor } = themeStore.activeTheme.colors; + const { chartCapacityColor } = activeTheme.get().colors; const { memoryUsage, workloadMemoryUsage, @@ -162,6 +163,6 @@ const NonInjectedNodeCharts = observer(({ export const NodeCharts = withInjectables(NonInjectedNodeCharts, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx b/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx index 3e3af50bb6..044bb3399d 100644 --- a/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx +++ b/src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx @@ -10,18 +10,19 @@ import { BarChart, memoryOptions } from "../chart"; import { isMetricsEmpty, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; import { NoMetrics } from "../resource-metrics/no-metrics"; import { ResourceMetricsContext } from "../resource-metrics"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; +import type { IComputedValue } from "mobx"; +import activeThemeInjectable from "../../themes/active.injectable"; export interface VolumeClaimDiskChartProps {} interface Dependencies { - themeStore: ThemeStore; + activeTheme: IComputedValue; } const NonInjectedVolumeClaimDiskChart = observer(({ - themeStore, + activeTheme, }: Dependencies & VolumeClaimDiskChartProps) => { const { metrics, tab, object } = useContext(ResourceMetricsContext) ?? {}; @@ -29,7 +30,7 @@ const NonInjectedVolumeClaimDiskChart = observer(({ if (isMetricsEmpty(metrics)) return ; const id = object.getId(); - const { chartCapacityColor } = themeStore.activeTheme.colors; + const { chartCapacityColor } = activeTheme.get().colors; const { diskUsage, diskCapacity } = metrics; const usage = normalizeMetrics(diskUsage).data.result[0].values; const capacity = normalizeMetrics(diskCapacity).data.result[0].values; @@ -65,6 +66,6 @@ const NonInjectedVolumeClaimDiskChart = observer(({ export const VolumeClaimDiskChart = withInjectables(NonInjectedVolumeClaimDiskChart, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/+workloads-overview/overview-statuses.tsx b/src/renderer/components/+workloads-overview/overview-statuses.tsx index 1a77288c46..2430409d30 100644 --- a/src/renderer/components/+workloads-overview/overview-statuses.tsx +++ b/src/renderer/components/+workloads-overview/overview-statuses.tsx @@ -31,7 +31,7 @@ const NonInjectedOverviewStatuses = observer(
- +
))}
diff --git a/src/renderer/components/+workloads-overview/overview-workload-status.tsx b/src/renderer/components/+workloads-overview/overview-workload-status.tsx index 52321d3af4..57422fe461 100644 --- a/src/renderer/components/+workloads-overview/overview-workload-status.tsx +++ b/src/renderer/components/+workloads-overview/overview-workload-status.tsx @@ -8,92 +8,101 @@ import "./overview-workload-status.scss"; import React from "react"; import capitalize from "lodash/capitalize"; import { observer } from "mobx-react"; -import type { DatasetTooltipLabel, PieChartData } from "../chart"; +import type { PieChartData } from "../chart"; import { PieChart } from "../chart"; -import { cssVar, object } from "../../utils"; -import type { ThemeStore } from "../../themes/store"; +import { object } from "../../utils"; +import type { LensTheme } from "../../themes/store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; +import type { PascalCase } from "type-fest"; +import type { IComputedValue } from "mobx"; +import activeThemeInjectable from "../../themes/active.injectable"; +import type { Workload } from "./workloads/workload-injection-token"; + +export type LowercaseOrPascalCase = Lowercase | PascalCase; + +export type WorkloadStatus = Partial, number>>; + +function toLowercase(src: T): Lowercase { + return src.toLowerCase() as Lowercase; +} export interface OverviewWorkloadStatusProps { - status: Partial>; + workload: Workload; } interface Dependencies { - themeStore: ThemeStore; + activeTheme: IComputedValue; } -@observer -class NonInjectedOverviewWorkloadStatus extends React.Component { - private elem: HTMLElement | null = null; +const statusBackgroundColorMapping = { + "running": "colorOk", + "scheduled": "colorOk", + "pending": "colorWarning", + "suspended": "colorWarning", + "evicted": "colorError", + "succeeded": "colorSuccess", + "failed": "colorError", + "terminated": "colorTerminated", + "terminating": "colorTerminated", + "unknown": "colorVague", + "complete": "colorSuccess", +} as const; - renderChart() { - if (!this.elem) { - return null; - } +const NonInjectedOverviewWorkloadStatus = observer((props: OverviewWorkloadStatusProps & Dependencies) => { + const { + workload, + activeTheme, + } = props; - const cssVars = cssVar(this.elem); - const chartData: Required = { - labels: [], - datasets: [], - }; + const statusesToBeShown = object.entries(workload.status.get()).filter(([, val]) => val > 0); + const theme = activeTheme.get(); - const statuses = object.entries(this.props.status).filter(([, val]) => val > 0); + const emptyDataSet = { + data: [1], + backgroundColor: [theme.colors.pieChartDefaultColor], + label: "Empty", + }; + const statusDataSet = { + label: "Status", + data: statusesToBeShown.map(([, value]) => value), + backgroundColor: statusesToBeShown.map(([status]) => ( + theme.colors[statusBackgroundColorMapping[toLowercase(status)]] + )), + tooltipLabels: statusesToBeShown.map(([status]) => ( + (percent: string) => `${capitalize(status)}: ${percent}` + )), + }; - if (statuses.length === 0) { - chartData.datasets.push({ - data: [1], - backgroundColor: [this.props.themeStore.activeTheme.colors.pieChartDefaultColor], - label: "Empty", - }); - } else { - const data: number[] = []; - const backgroundColor: string[] = []; - const tooltipLabels: DatasetTooltipLabel[] = []; + const chartData: Required = { + datasets: [statusesToBeShown.length > 0 ? statusDataSet : emptyDataSet], - for (const [status, value] of statuses) { - data.push(value); - backgroundColor.push(cssVars.get(`--workload-status-${status.toLowerCase()}`).toString()); - tooltipLabels.push(percent => `${capitalize(status)}: ${percent}`); - chartData.labels.push(`${capitalize(status)}: ${value}`); - } + labels: statusesToBeShown.map( + ([status, value]) => `${capitalize(status)}: ${value}`, + ), + }; - chartData.datasets.push({ - data, - backgroundColor, - label: "Status", - tooltipLabels, - }); - } - - return ( - +
+ - ); - } - - render() { - return ( -
this.elem = e}> -
- {this.renderChart()} -
+ }} + data-testid={`workload-overview-status-chart-${workload.title.toLowerCase().replace(/\s+/, "-")}`} + />
- ); - } -} +
+ ); +}); export const OverviewWorkloadStatus = withInjectables(NonInjectedOverviewWorkloadStatus, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/+workloads-overview/overview.tsx b/src/renderer/components/+workloads-overview/overview.tsx index 0510c96bc9..83a2bf9e84 100644 --- a/src/renderer/components/+workloads-overview/overview.tsx +++ b/src/renderer/components/+workloads-overview/overview.tsx @@ -104,7 +104,7 @@ class NonInjectedWorkloadsOverview extends React.Component { render() { return ( -
+
Overview
{this.renderLoadErrors()} diff --git a/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts b/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts index 6453efe59b..decb5a1f7c 100644 --- a/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts +++ b/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts @@ -4,12 +4,13 @@ */ import { getInjectionToken } from "@ogre-tools/injectable"; import type { IComputedValue } from "mobx"; +import type { WorkloadStatus } from "../overview-workload-status"; export interface Workload { resourceName: string; open: () => void; amountOfItems: IComputedValue; - status: IComputedValue>>; + status: IComputedValue; title: string; orderNumber: number; } diff --git a/src/renderer/components/+workloads-pods/container-charts.tsx b/src/renderer/components/+workloads-pods/container-charts.tsx index e9d39ebbdf..718f05420c 100644 --- a/src/renderer/components/+workloads-pods/container-charts.tsx +++ b/src/renderer/components/+workloads-pods/container-charts.tsx @@ -10,27 +10,28 @@ import { BarChart } from "../chart"; import { isMetricsEmpty, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api"; import { NoMetrics } from "../resource-metrics/no-metrics"; import { ResourceMetricsContext } from "../resource-metrics"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { mapValues } from "lodash"; import { type MetricsTab, metricTabOptions } from "../chart/options"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; +import activeThemeInjectable from "../../themes/active.injectable"; +import type { IComputedValue } from "mobx"; export interface ContainerChartsProps {} interface Dependencies { - themeStore: ThemeStore; + activeTheme: IComputedValue; } const NonInjectedContainerCharts = observer(({ - themeStore, + activeTheme, }: Dependencies & ContainerChartsProps) => { const { metrics, tab, object } = useContext(ResourceMetricsContext) ?? {}; if (!metrics || !object || !tab) return null; if (isMetricsEmpty(metrics)) return ; - const { chartCapacityColor } = themeStore.activeTheme.colors; + const { chartCapacityColor } = activeTheme.get().colors; const { cpuUsage, cpuRequests, @@ -127,6 +128,6 @@ const NonInjectedContainerCharts = observer(({ export const ContainerCharts = withInjectables(NonInjectedContainerCharts, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/chart/bar-chart.tsx b/src/renderer/components/chart/bar-chart.tsx index b80a539f6f..b159520309 100644 --- a/src/renderer/components/chart/bar-chart.tsx +++ b/src/renderer/components/chart/bar-chart.tsx @@ -13,11 +13,12 @@ import type { ChartProps } from "./chart"; import { Chart, ChartKind } from "./chart"; import { bytesToUnits, cssNames, isObject } from "../../utils"; import { ZebraStripesPlugin } from "./zebra-stripes.plugin"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { NoMetrics } from "../resource-metrics/no-metrics"; import assert from "assert"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; +import type { IComputedValue } from "mobx"; +import activeThemeInjectable from "../../themes/active.injectable"; export interface BarChartProps extends ChartProps { name?: string; @@ -27,11 +28,11 @@ export interface BarChartProps extends ChartProps { const getBarColor: Scriptable = ({ dataset }) => Color(dataset?.borderColor).alpha(0.2).string(); interface Dependencies { - themeStore: ThemeStore; + activeTheme: IComputedValue; } const NonInjectedBarChart = observer(({ - themeStore, + activeTheme, name, data, className, @@ -40,7 +41,7 @@ const NonInjectedBarChart = observer(({ options: customOptions, ...settings }: Dependencies & BarChartProps) => { - const { textColorPrimary, borderFaintColor, chartStripesColor } = themeStore.activeTheme.colors; + const { textColorPrimary, borderFaintColor, chartStripesColor } = activeTheme.get().colors; const { datasets: rawDatasets = [], ...rest } = data; const datasets = rawDatasets .filter(set => set.data?.length) @@ -168,7 +169,7 @@ const NonInjectedBarChart = observer(({ export const BarChart = withInjectables(NonInjectedBarChart, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/chart/chart.tsx b/src/renderer/components/chart/chart.tsx index 3d00c71aed..3d54b90302 100644 --- a/src/renderer/components/chart/chart.tsx +++ b/src/renderer/components/chart/chart.tsx @@ -36,6 +36,7 @@ export interface ChartProps { redraw?: boolean; // If true - recreate chart instance with no animation title?: string; className?: string; + "data-testid"?: string; } export enum ChartKind { @@ -212,25 +213,26 @@ export class Chart extends React.Component { } render() { - const { width, height, showChart, title, className } = this.props; + const { width, height, showChart, title, className, "data-testid": dataTestId } = this.props; return ( - <> -
- {title &&
{title}
} - {showChart && ( -
- -
-
- )} - {this.renderLegend()} -
- +
+ {title &&
{title}
} + {showChart && ( +
+ +
+
+ )} + {this.renderLegend()} +
); } } diff --git a/src/renderer/components/chart/pie-chart.tsx b/src/renderer/components/chart/pie-chart.tsx index 2df1fd05f4..2e4cd1bb0f 100644 --- a/src/renderer/components/chart/pie-chart.tsx +++ b/src/renderer/components/chart/pie-chart.tsx @@ -11,9 +11,10 @@ import ChartJS from "chart.js"; import type { ChartProps } from "./chart"; import { Chart } from "./chart"; import { cssNames } from "../../utils"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; +import type { IComputedValue } from "mobx"; +import activeThemeInjectable from "../../themes/active.injectable"; export interface PieChartProps extends ChartProps { } @@ -44,18 +45,18 @@ function getCutout(length: number | undefined): number { } interface Dependencies { - themeStore: ThemeStore; + activeTheme: IComputedValue; } const NonInjectedPieChart = observer(({ - themeStore, + activeTheme, data, className, options, showChart, ...chartProps }: Dependencies & PieChartProps) => { - const { contentColor } = themeStore.activeTheme.colors; + const { contentColor } = activeTheme.get().colors; const opts: ChartOptions = { maintainAspectRatio: false, tooltips: { @@ -68,18 +69,11 @@ const NonInjectedPieChart = observer(({ const total = datasetData.reduce((acc, cur) => acc + cur, 0); const percent = Math.round((datasetData[tooltipItem.index] as number / total) * 100); const percentLabel = isNaN(percent) ? "N/A" : `${percent}%`; - const tooltipLabel = dataset.tooltipLabels?.[tooltipItem.index]; - let tooltip = `${dataset.label}: ${percentLabel}`; + const tooltipLabelCustomizer = dataset.tooltipLabels?.[tooltipItem.index]; - if (tooltipLabel) { - if (typeof tooltipLabel === "function") { - tooltip = tooltipLabel(percentLabel); - } else { - tooltip = tooltipLabel; - } - } - - return tooltip; + return tooltipLabelCustomizer + ? tooltipLabelCustomizer(percentLabel) + : `${dataset.label}: ${percentLabel}`; }, }, filter: ({ datasetIndex, index }, { datasets = [] }) => { @@ -120,7 +114,7 @@ const NonInjectedPieChart = observer(({ export const PieChart = withInjectables(NonInjectedPieChart, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/dock/terminal/view.tsx b/src/renderer/components/dock/terminal/view.tsx index 01313a661a..6fa9e157c8 100644 --- a/src/renderer/components/dock/terminal/view.tsx +++ b/src/renderer/components/dock/terminal/view.tsx @@ -10,13 +10,14 @@ import { disposeOnUnmount, observer } from "mobx-react"; import { cssNames } from "../../../utils"; import type { Terminal } from "./terminal"; import type { TerminalStore } from "./store"; -import type { ThemeStore } from "../../../themes/store"; +import type { LensTheme } from "../../../themes/store"; import type { DockTab, DockStore } from "../dock/store"; import { withInjectables } from "@ogre-tools/injectable-react"; import dockStoreInjectable from "../dock/store.injectable"; import terminalStoreInjectable from "./store.injectable"; import assert from "assert"; -import themeStoreInjectable from "../../../themes/store.injectable"; +import activeThemeInjectable from "../../../themes/active.injectable"; +import type { IComputedValue } from "mobx"; export interface TerminalWindowProps { tab: DockTab; @@ -25,7 +26,7 @@ export interface TerminalWindowProps { interface Dependencies { dockStore: DockStore; terminalStore: TerminalStore; - themeStore: ThemeStore; + activeTheme: IComputedValue; } @observer @@ -68,7 +69,7 @@ class NonInjectedTerminalWindow extends React.Component this.elem = elem} /> ); @@ -80,7 +81,7 @@ export const TerminalWindow = withInjectables ...props, dockStore: di.inject(dockStoreInjectable), terminalStore: di.inject(terminalStoreInjectable), - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }); diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx index 8cff8f21bc..07756760a9 100644 --- a/src/renderer/components/item-object-list/content.tsx +++ b/src/renderer/components/item-object-list/content.tsx @@ -7,6 +7,7 @@ import "./item-list-layout.scss"; import type { ReactNode } from "react"; import React from "react"; +import type { IComputedValue } from "mobx"; import { computed, makeObservable } from "mobx"; import { Observer, observer } from "mobx-react"; import type { ConfirmDialogParams } from "../confirm-dialog"; @@ -20,18 +21,18 @@ import { NoItems } from "../no-items"; import { Spinner } from "../spinner"; import type { ItemObject } from "../../../common/item.store"; import type { Filter, PageFiltersStore } from "./page-filters/store"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { MenuActions } from "../menu/menu-actions"; import { MenuItem } from "../menu"; import { Checkbox } from "../checkbox"; import type { UserStore } from "../../../common/user-store"; import type { ItemListStore } from "./list-layout"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; import userStoreInjectable from "../../../common/user-store/user-store.injectable"; import pageFiltersStoreInjectable from "./page-filters/store.injectable"; import type { OpenConfirmDialog } from "../confirm-dialog/open.injectable"; import openConfirmDialogInjectable from "../confirm-dialog/open.injectable"; +import activeThemeInjectable from "../../themes/active.injectable"; export interface ItemListLayoutContentProps { getFilters: () => Filter[]; @@ -71,7 +72,7 @@ export interface ItemListLayoutContentProps; userStore: UserStore; pageFiltersStore: PageFiltersStore; openConfirmDialog: OpenConfirmDialog; @@ -291,10 +292,10 @@ class NonInjectedItemListLayoutContent< render() { const { store, hasDetailsView, addRemoveButtons = {}, virtual, sortingCallbacks, - detailsItem, className, tableProps = {}, tableId, getItems, themeStore, + detailsItem, className, tableProps = {}, tableId, getItems, activeTheme, } = this.props; const selectedItemId = detailsItem && detailsItem.getId(); - const classNames = cssNames(className, "box", "grow", themeStore.activeTheme.type); + const classNames = cssNames(className, "box", "grow", activeTheme.get().type); const items = getItems(); const selectedItems = store.pickOnlySelected(items); @@ -377,7 +378,7 @@ class NonInjectedItemListLayoutContent< export const ItemListLayoutContent = withInjectables>(NonInjectedItemListLayoutContent, { getProps: (di, props) => ({ ...props, - themeStore: di.inject(themeStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), userStore: di.inject(userStoreInjectable), pageFiltersStore: di.inject(pageFiltersStoreInjectable), openConfirmDialog: di.inject(openConfirmDialogInjectable), diff --git a/src/renderer/components/monaco-editor/monaco-editor.tsx b/src/renderer/components/monaco-editor/monaco-editor.tsx index 7418187dde..09032bbf7e 100644 --- a/src/renderer/components/monaco-editor/monaco-editor.tsx +++ b/src/renderer/components/monaco-editor/monaco-editor.tsx @@ -6,6 +6,7 @@ import styles from "./monaco-editor.module.scss"; import React from "react"; import { observer } from "mobx-react"; +import type { IComputedValue } from "mobx"; import { action, computed, makeObservable, observable, reaction } from "mobx"; import { editor, Uri } from "monaco-editor"; import type { MonacoTheme } from "./monaco-themes"; @@ -13,10 +14,10 @@ import { type MonacoValidator, monacoValidators } from "./monaco-validators"; import { debounce, merge } from "lodash"; import { autoBind, cssNames, disposer } from "../../utils"; import type { UserStore } from "../../../common/user-store"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; import userStoreInjectable from "../../../common/user-store/user-store.injectable"; +import activeThemeInjectable from "../../themes/active.injectable"; export type MonacoEditorId = string; @@ -39,8 +40,8 @@ export interface MonacoEditorProps { } interface Dependencies { - themeStore: ThemeStore; userStore: UserStore; + activeTheme: IComputedValue; } export function createMonacoUri(id: MonacoEditorId): Uri { @@ -83,7 +84,7 @@ class NonInjectedMonacoEditor extends React.Component ({ ...props, - themeStore: di.inject(themeStoreInjectable), userStore: di.inject(userStoreInjectable), + activeTheme: di.inject(activeThemeInjectable), }), }, ); diff --git a/src/renderer/components/select/select.tsx b/src/renderer/components/select/select.tsx index 61b6de1284..629c11cecf 100644 --- a/src/renderer/components/select/select.tsx +++ b/src/renderer/components/select/select.tsx @@ -8,15 +8,15 @@ import "./select.scss"; import React from "react"; -import type { ObservableSet } from "mobx"; +import type { IComputedValue, ObservableSet } from "mobx"; import { action, computed, makeObservable } from "mobx"; import { observer } from "mobx-react"; import ReactSelect, { components, createFilter } from "react-select"; import type { Props as ReactSelectProps, GroupBase, MultiValue, OptionsOrGroups, PropsValue, SingleValue } from "react-select"; -import type { ThemeStore } from "../../themes/store"; +import type { LensTheme } from "../../themes/store"; import { autoBind, cssNames } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; -import themeStoreInjectable from "../../themes/store.injectable"; +import activeThemeInjectable from "../../themes/active.injectable"; const { Menu } = components; @@ -80,7 +80,7 @@ const defaultFilter = createFilter({ }); interface Dependencies { - themeStore: ThemeStore; + activeTheme: IComputedValue; } export function onMultiSelectFor, Group extends GroupBase
+
+
+
+
+
+
+
+ +`; diff --git a/src/behaviours/pod-logs/download-logs.test.tsx b/src/behaviours/pod-logs/download-logs.test.tsx new file mode 100644 index 0000000000..c750186666 --- /dev/null +++ b/src/behaviours/pod-logs/download-logs.test.tsx @@ -0,0 +1,269 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { DiContainer } from "@ogre-tools/injectable"; +import type { RenderResult } from "@testing-library/react"; +import { act, waitFor } from "@testing-library/react"; +import getPodByIdInjectable from "../../renderer/components/+workloads-pods/get-pod-by-id.injectable"; +import getPodsByOwnerIdInjectable from "../../renderer/components/+workloads-pods/get-pods-by-owner-id.injectable"; +import { SearchStore } from "../../renderer/search-store/search-store"; +import searchStoreInjectable from "../../renderer/search-store/search-store.injectable"; +import openSaveFileDialogInjectable from "../../renderer/utils/save-file.injectable"; +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import dockStoreInjectable from "../../renderer/components/dock/dock/store.injectable"; +import areLogsPresentInjectable from "../../renderer/components/dock/logs/are-logs-present.injectable"; +import type { CallForLogs } from "../../renderer/components/dock/logs/call-for-logs.injectable"; +import callForLogsInjectable from "../../renderer/components/dock/logs/call-for-logs.injectable"; +import createPodLogsTabInjectable from "../../renderer/components/dock/logs/create-pod-logs-tab.injectable"; +import getLogTabDataInjectable from "../../renderer/components/dock/logs/get-log-tab-data.injectable"; +import getLogsWithoutTimestampsInjectable from "../../renderer/components/dock/logs/get-logs-without-timestamps.injectable"; +import getLogsInjectable from "../../renderer/components/dock/logs/get-logs.injectable"; +import getRandomIdForPodLogsTabInjectable from "../../renderer/components/dock/logs/get-random-id-for-pod-logs-tab.injectable"; +import getTimestampSplitLogsInjectable from "../../renderer/components/dock/logs/get-timestamp-split-logs.injectable"; +import loadLogsInjectable from "../../renderer/components/dock/logs/load-logs.injectable"; +import reloadLogsInjectable from "../../renderer/components/dock/logs/reload-logs.injectable"; +import setLogTabDataInjectable from "../../renderer/components/dock/logs/set-log-tab-data.injectable"; +import stopLoadingLogsInjectable from "../../renderer/components/dock/logs/stop-loading-logs.injectable"; +import { dockerPod } from "../../renderer/components/dock/logs/__test__/pod.mock"; + +describe("download logs options in pod logs dock tab", () => { + let rendered: RenderResult; + let rendererDi: DiContainer; + let builder: ApplicationBuilder; + let openSaveFileDialogMock: jest.MockedFunction<() => void>; + let callForLogsMock: jest.MockedFunction; + const logs = new Map([["timestamp", "some-logs"]]); + + beforeEach(() => { + const selectedPod = dockerPod; + + builder = getApplicationBuilder(); + + builder.setEnvironmentToClusterFrame(); + + callForLogsMock = jest.fn(); + + builder.beforeApplicationStart(({ rendererDi }) => { + rendererDi.override(callForLogsInjectable, () => callForLogsMock); + + // Overriding internals of logsViewModelInjectable + rendererDi.override(getLogsInjectable, () => () => ["some-logs"]); + rendererDi.override(getLogsWithoutTimestampsInjectable, () => () => ["some-logs"]); + rendererDi.override(getTimestampSplitLogsInjectable, () => () => [...logs]); + rendererDi.override(reloadLogsInjectable, () => jest.fn()); + rendererDi.override(getLogTabDataInjectable, () => () => ({ + selectedPodId: selectedPod.getId(), + selectedContainer: selectedPod.getContainers()[0].name, + namespace: "default", + showPrevious: true, + showTimestamps: false, + })); + rendererDi.override(setLogTabDataInjectable, () => jest.fn()); + rendererDi.override(loadLogsInjectable, () => jest.fn()); + rendererDi.override(stopLoadingLogsInjectable, () => jest.fn()); + rendererDi.override(areLogsPresentInjectable, () => jest.fn()); + rendererDi.override(getPodByIdInjectable, () => (id) => { + if (id === selectedPod.getId()) { + return selectedPod; + } + + return undefined; + }); + rendererDi.override(getPodsByOwnerIdInjectable, () => jest.fn()); + rendererDi.override(searchStoreInjectable, () => new SearchStore()); + + rendererDi.override(getRandomIdForPodLogsTabInjectable, () => jest.fn(() => "some-irrelevant-random-id")); + + openSaveFileDialogMock = jest.fn(); + rendererDi.override(openSaveFileDialogInjectable, () => openSaveFileDialogMock); + }); + + }); + + describe("when opening pod logs", () => { + beforeEach(async () => { + rendered = await builder.render(); + rendererDi = builder.dis.rendererDi; + + const pod = dockerPod; + const createLogsTab = rendererDi.inject(createPodLogsTabInjectable); + const container = { + name: "docker-exporter", + image: "docker.io/prom/node-exporter:v1.0.0-rc.0", + imagePullPolicy: "pull", + }; + + const dockStore = rendererDi.inject(dockStoreInjectable); + + dockStore.closeTab("terminal"); + + createLogsTab({ + selectedPod: pod, + selectedContainer: container, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("contains download dropdown button", () => { + expect(rendered.getByTestId("download-logs-dropdown")).toBeInTheDocument(); + }); + + describe("when clicking on button", () => { + beforeEach(() => { + const button = rendered.getByTestId("download-logs-dropdown"); + + act(() => button.click()); + }); + + it("shows download visible logs menu item", () => { + expect(rendered.getByTestId("download-visible-logs")).toBeInTheDocument(); + }); + + it("shows download all logs menu item", () => { + expect(rendered.getByTestId("download-all-logs")).toBeInTheDocument(); + }); + + describe("when call for logs resolves with logs", () => { + beforeEach(() => { + callForLogsMock.mockResolvedValue("all-logs"); + }); + + describe("when selected 'download visible logs'", () => { + beforeEach(() => { + const button = rendered.getByTestId("download-visible-logs"); + + button.click(); + }); + + it("shows save dialog with proper attributes", () => { + expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "some-logs", "text/plain"); + }); + }); + + describe("when selected 'download all logs'", () => { + beforeEach(async () => { + await act(async () => { + const button = rendered.getByTestId("download-all-logs"); + + button.click(); + }); + }); + + it("logs have been called with query", () => { + expect(callForLogsMock).toHaveBeenCalledWith( + { name: "dockerExporter", namespace: "default" }, + { "previous": true, "timestamps": false }, + ); + }); + + it("shows save dialog with proper attributes", async () => { + expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "all-logs", "text/plain"); + }); + + it("doesn't block download dropdown for interaction after click", async () => { + expect(rendered.getByTestId("download-logs-dropdown")).not.toHaveAttribute("disabled"); + }); + }); + + describe("blocking user interaction after menu item click", () => { + it("block download dropdown for interaction when selected 'download all logs'", async () => { + const downloadMenuItem = rendered.getByTestId("download-all-logs"); + + act(() => downloadMenuItem.click()); + + await waitFor(() => { + expect(rendered.getByTestId("download-logs-dropdown")).toHaveAttribute("disabled"); + }); + }); + + it("doesn't block dropdown for interaction when selected 'download visible logs'", () => { + const downloadMenuItem = rendered.getByTestId("download-visible-logs"); + + act(() => downloadMenuItem.click()); + + expect(rendered.getByTestId("download-logs-dropdown")).not.toHaveAttribute("disabled"); + }); + }); + }); + + describe("when call for logs resolves with no logs", () => { + beforeEach(() => { + callForLogsMock.mockResolvedValue(""); + }); + + describe("when selected 'download visible logs'", () => { + beforeEach(() => { + const button = rendered.getByTestId("download-visible-logs"); + + button.click(); + }); + + it("shows save dialog with proper attributes", () => { + expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "some-logs", "text/plain"); + }); + }); + + describe("when selected 'download all logs'", () => { + beforeEach(async () => { + await act(async () => { + const button = rendered.getByTestId("download-all-logs"); + + button.click(); + }); + }); + + it("doesn't show save dialog", async () => { + expect(openSaveFileDialogMock).not.toHaveBeenCalled(); + }); + }); + }); + + describe("when call for logs rejects", () => { + beforeEach(() => { + callForLogsMock.mockRejectedValue("error"); + }); + + describe("when selected 'download visible logs'", () => { + beforeEach(async () => { + await act(async () => { + const button = rendered.getByTestId("download-visible-logs"); + + button.click(); + }); + }); + + it("shows save dialog with proper attributes", () => { + expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "some-logs", "text/plain"); + }); + }); + + describe("when selected 'download all logs'", () => { + beforeEach(async () => { + await act(async () => { + const button = rendered.getByTestId("download-all-logs"); + + button.click(); + }); + }); + + it("logs have been called", () => { + expect(callForLogsMock).toHaveBeenCalledWith( + { name: "dockerExporter", namespace: "default" }, + { "previous": true, "timestamps": false }, + ); + }); + + it("doesn't show save dialog", async () => { + expect(openSaveFileDialogMock).not.toHaveBeenCalled(); + }); + }); + }); + }); + }); +}); diff --git a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx index 744be3fae9..66874bfd9f 100644 --- a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx @@ -57,6 +57,8 @@ function mockLogTabViewModel(tabId: TabId, deps: Partial void; -} - -const NonInjectedLogControls = observer(({ openSaveFileDialog, model }: Dependencies & LogControlsProps) => { +export const LogControls = observer(({ model }: LogControlsProps) => { const tabData = model.logTabData.get(); const pod = model.pod.get(); @@ -44,18 +37,9 @@ const NonInjectedLogControls = observer(({ openSaveFileDialog, model }: Dependen model.reloadLogs(); }; - const downloadLogs = () => { - const fileName = pod.getName(); - const logsToDownload: string[] = showTimestamps - ? model.logs.get() - : model.logsWithoutTimestamps.get(); - - openSaveFileDialog(`${fileName}.log`, logsToDownload.join("\n"), "text/plain"); - }; - return ( -
-
+
+
{since && ( Logs from @@ -77,20 +61,13 @@ const NonInjectedLogControls = observer(({ openSaveFileDialog, model }: Dependen onChange={togglePrevious} className="show-previous" /> -
); }); -export const LogControls = withInjectables(NonInjectedLogControls, { - getProps: (di, props) => ({ - openSaveFileDialog: di.inject(openSaveFileDialogInjectable), - ...props, - }), -}); diff --git a/src/renderer/components/dock/logs/create-logs-tab.injectable.ts b/src/renderer/components/dock/logs/create-logs-tab.injectable.ts index 47cef1dd95..44e3e8a0ec 100644 --- a/src/renderer/components/dock/logs/create-logs-tab.injectable.ts +++ b/src/renderer/components/dock/logs/create-logs-tab.injectable.ts @@ -6,20 +6,21 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { DockTabCreate, DockTab, TabId } from "../dock/store"; import { TabKind } from "../dock/store"; import type { LogTabData } from "./tab-store"; -import * as uuid from "uuid"; import { runInAction } from "mobx"; import createDockTabInjectable from "../dock/create-dock-tab.injectable"; import setLogTabDataInjectable from "./set-log-tab-data.injectable"; +import getRandomIdForPodLogsTabInjectable from "./get-random-id-for-pod-logs-tab.injectable"; export type CreateLogsTabData = Pick & Omit, "owner" | "selectedPodId" | "selectedContainer" | "namespace">; interface Dependencies { createDockTab: (rawTabDesc: DockTabCreate, addNumber?: boolean) => DockTab; setLogTabData: (tabId: string, data: LogTabData) => void; + getRandomId: () => string; } -const createLogsTab = ({ createDockTab, setLogTabData }: Dependencies) => (title: string, data: CreateLogsTabData): TabId => { - const id = `log-tab-${uuid.v4()}`; +const createLogsTab = ({ createDockTab, setLogTabData, getRandomId }: Dependencies) => (title: string, data: CreateLogsTabData): TabId => { + const id = `log-tab-${getRandomId()}`; runInAction(() => { createDockTab({ @@ -43,6 +44,7 @@ const createLogsTabInjectable = getInjectable({ instantiate: (di) => createLogsTab({ createDockTab: di.inject(createDockTabInjectable), setLogTabData: di.inject(setLogTabDataInjectable), + getRandomId: di.inject(getRandomIdForPodLogsTabInjectable), }), }); diff --git a/src/renderer/components/dock/logs/download-all-logs.injectable.ts b/src/renderer/components/dock/logs/download-all-logs.injectable.ts new file mode 100644 index 0000000000..abe87cc352 --- /dev/null +++ b/src/renderer/components/dock/logs/download-all-logs.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 { getInjectable } from "@ogre-tools/injectable"; +import type { PodLogsQuery } from "../../../../common/k8s-api/endpoints"; +import type { ResourceDescriptor } from "../../../../common/k8s-api/kube-api"; +import loggerInjectable from "../../../../common/logger.injectable"; +import openSaveFileDialogInjectable from "../../../utils/save-file.injectable"; +import callForLogsInjectable from "./call-for-logs.injectable"; + +const downloadAllLogsInjectable = getInjectable({ + id: "download-all-logs", + + instantiate: (di) => { + const callForLogs = di.inject(callForLogsInjectable); + const openSaveFileDialog = di.inject(openSaveFileDialogInjectable); + const logger = di.inject(loggerInjectable); + + return async (params: ResourceDescriptor, query: PodLogsQuery) => { + const logs = await callForLogs(params, query).catch(error => { + logger.error("Can't download logs: ", error); + }); + + if (logs) { + openSaveFileDialog(`${params.name}.log`, logs, "text/plain"); + } + }; + }, +}); + +export default downloadAllLogsInjectable; diff --git a/src/renderer/components/dock/logs/download-logs-dropdown.module.scss b/src/renderer/components/dock/logs/download-logs-dropdown.module.scss new file mode 100644 index 0000000000..8c93ff6559 --- /dev/null +++ b/src/renderer/components/dock/logs/download-logs-dropdown.module.scss @@ -0,0 +1,37 @@ +.dropdown { + --accent-color: var(--colorInfo); + + border: 1px solid var(--accent-color); + border-radius: 4px; + color: var(--accent-color); + display: flex; + align-items: center; + padding: calc(var(--padding) / 4) var(--padding); + gap: 6px; + position: relative; + + &:disabled { + cursor: progress; + opacity: .7; + } + + &:hover::before{ + opacity: 0.25; + } + + &:focus-visible { + box-shadow: 0 0 0 2px var(--accent-color); + border-color: transparent; + } + + &::before { + content: " "; + position: absolute; + background: var(--accent-color); + width: 100%; + height: 100%; + left: 0; + opacity: 0; + transition: opacity 0.1s; + } +} \ No newline at end of file diff --git a/src/renderer/components/dock/logs/download-logs-dropdown.tsx b/src/renderer/components/dock/logs/download-logs-dropdown.tsx new file mode 100644 index 0000000000..1da7b9f8a6 --- /dev/null +++ b/src/renderer/components/dock/logs/download-logs-dropdown.tsx @@ -0,0 +1,53 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import styles from "./download-logs-dropdown.module.scss"; + +import React, { useState } from "react"; +import { Icon } from "../../icon"; +import { MenuItem } from "../../menu"; +import { Dropdown } from "../../dropdown/dropdown"; + +interface DownloadLogsDropdownProps { + downloadVisibleLogs: () => void; + downloadAllLogs: () => Promise | undefined; +} + +export function DownloadLogsDropdown({ downloadAllLogs, downloadVisibleLogs }: DownloadLogsDropdownProps) { + const [waiting, setWaiting] = useState(false); + + const downloadAll = async () => { + setWaiting(true); + + try { + await downloadAllLogs(); + } finally { + setWaiting(false); + } + }; + + return ( + + Download + + + )} + > + + Visible logs + + + All logs + + + ); +} diff --git a/src/renderer/components/dock/logs/download-logs.injectable.ts b/src/renderer/components/dock/logs/download-logs.injectable.ts new file mode 100644 index 0000000000..c4792a9b36 --- /dev/null +++ b/src/renderer/components/dock/logs/download-logs.injectable.ts @@ -0,0 +1,20 @@ +/** + * 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 openSaveFileDialogInjectable from "../../../utils/save-file.injectable"; + +const downloadLogsInjectable = getInjectable({ + id: "download-logs", + + instantiate: (di) => { + const openSaveFileDialog = di.inject(openSaveFileDialogInjectable); + + return (filename: string, logs: string[]) => { + openSaveFileDialog(filename, logs.join("\n"), "text/plain"); + }; + }, +}); + +export default downloadLogsInjectable; diff --git a/src/renderer/components/dock/logs/get-random-id-for-pod-logs-tab.injectable.ts b/src/renderer/components/dock/logs/get-random-id-for-pod-logs-tab.injectable.ts new file mode 100644 index 0000000000..1dcadcf293 --- /dev/null +++ b/src/renderer/components/dock/logs/get-random-id-for-pod-logs-tab.injectable.ts @@ -0,0 +1,13 @@ +/** + * 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 getRandomIdInjectable from "../../../../common/utils/get-random-id.injectable"; + +const getRandomIdForPodLogsTabInjectable = getInjectable({ + id: "get-random-id-for-pod-logs-tab", + instantiate: (di) => di.inject(getRandomIdInjectable), +}); + +export default getRandomIdForPodLogsTabInjectable; diff --git a/src/renderer/components/dock/logs/logs-view-model.injectable.ts b/src/renderer/components/dock/logs/logs-view-model.injectable.ts index a9c027acf9..77e4ca983c 100644 --- a/src/renderer/components/dock/logs/logs-view-model.injectable.ts +++ b/src/renderer/components/dock/logs/logs-view-model.injectable.ts @@ -18,6 +18,8 @@ import areLogsPresentInjectable from "./are-logs-present.injectable"; import searchStoreInjectable from "../../../search-store/search-store.injectable"; import getPodsByOwnerIdInjectable from "../../+workloads-pods/get-pods-by-owner-id.injectable"; import getPodByIdInjectable from "../../+workloads-pods/get-pod-by-id.injectable"; +import downloadLogsInjectable from "./download-logs.injectable"; +import downloadAllLogsInjectable from "./download-all-logs.injectable"; export interface InstantiateArgs { tabId: TabId; @@ -39,6 +41,8 @@ const logsViewModelInjectable = getInjectable({ areLogsPresent: di.inject(areLogsPresentInjectable), getPodById: di.inject(getPodByIdInjectable), getPodsByOwnerId: di.inject(getPodsByOwnerIdInjectable), + downloadLogs: di.inject(downloadLogsInjectable), + downloadAllLogs: di.inject(downloadAllLogsInjectable), searchStore: di.inject(searchStoreInjectable), }), lifecycle: lifecycleEnum.transient, diff --git a/src/renderer/components/dock/logs/logs-view-model.ts b/src/renderer/components/dock/logs/logs-view-model.ts index 021eb43a7a..85b8502df3 100644 --- a/src/renderer/components/dock/logs/logs-view-model.ts +++ b/src/renderer/components/dock/logs/logs-view-model.ts @@ -7,12 +7,13 @@ import type { IComputedValue } from "mobx"; import { computed } from "mobx"; import type { TabId } from "../dock/store"; import type { SearchStore } from "../../../search-store/search-store"; -import type { Pod } from "../../../../common/k8s-api/endpoints"; +import type { Pod, PodLogsQuery } from "../../../../common/k8s-api/endpoints"; import { isDefined } from "../../../utils"; import assert from "assert"; import type { GetPodById } from "../../+workloads-pods/get-pod-by-id.injectable"; import type { GetPodsByOwnerId } from "../../+workloads-pods/get-pods-by-owner-id.injectable"; import type { LoadLogs } from "./load-logs.injectable"; +import type { ResourceDescriptor } from "../../../../common/k8s-api/kube-api"; export interface LogTabViewModelDependencies { getLogs: (tabId: TabId) => string[]; @@ -27,6 +28,8 @@ export interface LogTabViewModelDependencies { getPodById: GetPodById; getPodsByOwnerId: GetPodsByOwnerId; areLogsPresent: (tabId: TabId) => boolean; + downloadLogs: (filename: string, logs: string[]) => void; + downloadAllLogs: (params: ResourceDescriptor, query: PodLogsQuery) => Promise; searchStore: SearchStore; } @@ -77,4 +80,32 @@ export class LogTabViewModel { reloadLogs = () => this.dependencies.reloadLogs(this.tabId, this.pod, this.logTabData); renameTab = (title: string) => this.dependencies.renameTab(this.tabId, title); stopLoadingLogs = () => this.dependencies.stopLoadingLogs(this.tabId); + + downloadLogs = () => { + const pod = this.pod.get(); + const tabData = this.logTabData.get(); + + if (pod && tabData) { + const fileName = pod.getName(); + const logsToDownload: string[] = tabData.showTimestamps + ? this.logs.get() + : this.logsWithoutTimestamps.get(); + + this.dependencies.downloadLogs(`${fileName}.log`, logsToDownload); + } + }; + + downloadAllLogs = () => { + const pod = this.pod.get(); + const tabData = this.logTabData.get(); + + if (pod && tabData) { + const params = { name: pod.getName(), namespace: pod.getNs() }; + const query = { timestamps: tabData.showTimestamps, previous: tabData.showPrevious }; + + return this.dependencies.downloadAllLogs(params, query); + } + + return; + }; } diff --git a/src/renderer/components/dropdown/dropdown.tsx b/src/renderer/components/dropdown/dropdown.tsx new file mode 100644 index 0000000000..40efd877c6 --- /dev/null +++ b/src/renderer/components/dropdown/dropdown.tsx @@ -0,0 +1,38 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { HTMLAttributes } from "react"; +import React, { useState } from "react"; +import { Menu } from "../menu"; + +interface DropdownProps extends HTMLAttributes { + contentForToggle: React.ReactNode; +} + +export function Dropdown(props: DropdownProps) { + const { id, contentForToggle, children, ...rest } = props; + const [opened, setOpened] = useState(false); + + const toggle = () => { + setOpened(!opened); + }; + + return ( +
+
+ {contentForToggle} +
+ + {React.Children.toArray(children)} + +
+ ); +} From da6b7a5b4b8d6bf1aff9e4699a7513fadc39ba59 Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Tue, 30 Aug 2022 16:18:38 +0300 Subject: [PATCH 11/21] Update metric queries used for Helm installed Prometheus (#6139) --- src/main/prometheus/helm.ts | 118 ++++++++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 4 deletions(-) diff --git a/src/main/prometheus/helm.ts b/src/main/prometheus/helm.ts index d797ca014c..a2e80cf12e 100644 --- a/src/main/prometheus/helm.ts +++ b/src/main/prometheus/helm.ts @@ -3,11 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { PrometheusLens } from "./lens"; import type { CoreV1Api } from "@kubernetes/client-node"; -import type { PrometheusService } from "./provider-registry"; - -export class PrometheusHelm extends PrometheusLens { +import { inspect } from "util"; +import { PrometheusProvider, type PrometheusService } from "./provider-registry"; +export class PrometheusHelm extends PrometheusProvider { readonly id: string = "helm"; readonly name: string = "Helm"; readonly rateAccuracy: string = "5m"; @@ -16,4 +15,115 @@ export class PrometheusHelm extends PrometheusLens { public async getPrometheusService(client: CoreV1Api): Promise { return this.getFirstNamespacedService(client, "app=prometheus,component=server,heritage=Helm"); } + + public getQuery(opts: Record, queryName: string): string { + switch(opts.category) { + case "cluster": + switch (queryName) { + case "memoryUsage": + return `sum(node_memory_MemTotal_bytes - (node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes)) by (component)`.replace(/_bytes/g, `_bytes{node=~"${opts.nodes}"}`); + case "workloadMemoryUsage": + return `sum(container_memory_working_set_bytes{container!="POD",container!="",instance=~"${opts.nodes}"}) by (component)`; + case "memoryRequests": + return `sum(kube_pod_container_resource_requests{node=~"${opts.nodes}", resource="memory"}) by (component)`; + case "memoryLimits": + return `sum(kube_pod_container_resource_limits{node=~"${opts.nodes}", resource="memory"}) by (component)`; + case "memoryCapacity": + return `sum(kube_node_status_capacity{node=~"${opts.nodes}", resource="memory"}) by (component)`; + case "memoryAllocatableCapacity": + return `sum(kube_node_status_allocatable{node=~"${opts.nodes}", resource="memory"}) by (component)`; + case "cpuUsage": + return `sum(rate(node_cpu_seconds_total{node=~"${opts.nodes}", mode=~"user|system"}[${this.rateAccuracy}]))`; + case "cpuRequests": + return `sum(kube_pod_container_resource_requests{node=~"${opts.nodes}", resource="cpu"}) by (component)`; + case "cpuLimits": + return `sum(kube_pod_container_resource_limits{node=~"${opts.nodes}", resource="cpu"}) by (component)`; + case "cpuCapacity": + return `sum(kube_node_status_capacity{node=~"${opts.nodes}", resource="cpu"}) by (component)`; + case "cpuAllocatableCapacity": + return `sum(kube_node_status_allocatable{node=~"${opts.nodes}", resource="cpu"}) by (component)`; + case "podUsage": + return `sum({__name__=~"kubelet_running_pod_count|kubelet_running_pods", instance=~"${opts.nodes}"})`; + case "podCapacity": + return `sum(kube_node_status_capacity{node=~"${opts.nodes}", resource="pods"}) by (component)`; + case "podAllocatableCapacity": + return `sum(kube_node_status_allocatable{node=~"${opts.nodes}", resource="pods"}) by (component)`; + case "fsSize": + return `sum(node_filesystem_size_bytes{node=~"${opts.nodes}", mountpoint="/"}) by (node)`; + case "fsUsage": + return `sum(node_filesystem_size_bytes{node=~"${opts.nodes}", mountpoint="/"} - node_filesystem_avail_bytes{node=~"${opts.nodes}", mountpoint="/"}) by (node)`; + } + break; + case "nodes": + switch (queryName) { + case "memoryUsage": + return `sum(node_memory_MemTotal_bytes - (node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes)) by (node)`; + case "workloadMemoryUsage": + return `sum(container_memory_working_set_bytes{container!="POD",container!=""}) by (instance)`; + case "memoryCapacity": + return `sum(kube_node_status_capacity{resource="memory"}) by (node)`; + case "memoryAllocatableCapacity": + return `sum(kube_node_status_allocatable{resource="memory"}) by (node)`; + case "cpuUsage": + return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${this.rateAccuracy}])) by(node)`; + case "cpuCapacity": + return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`; + case "cpuAllocatableCapacity": + return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`; + case "fsSize": + return `sum(node_filesystem_size_bytes{mountpoint="/"}) by (node)`; + case "fsUsage": + return `sum(node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_avail_bytes{mountpoint="/"}) by (node)`; + } + break; + case "pods": + switch (queryName) { + case "cpuUsage": + return `sum(rate(container_cpu_usage_seconds_total{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`; + case "cpuRequests": + return `sum(kube_pod_container_resource_requests{pod=~"${opts.pods}",resource="cpu",namespace="${opts.namespace}"}) by (${opts.selector})`; + case "cpuLimits": + return `sum(kube_pod_container_resource_limits{pod=~"${opts.pods}",resource="cpu",namespace="${opts.namespace}"}) by (${opts.selector})`; + case "memoryUsage": + return `sum(container_memory_working_set_bytes{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}) by (${opts.selector})`; + case "memoryRequests": + return `sum(kube_pod_container_resource_requests{pod=~"${opts.pods}",resource="memory",namespace="${opts.namespace}"}) by (${opts.selector})`; + case "memoryLimits": + return `sum(kube_pod_container_resource_limits{pod=~"${opts.pods}",resource="memory",namespace="${opts.namespace}"}) by (${opts.selector})`; + case "fsUsage": + return `sum(container_fs_usage_bytes{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}) by (${opts.selector})`; + case "fsWrites": + return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`; + case "fsReads": + return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`; + case "networkReceive": + return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`; + case "networkTransmit": + return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`; + } + break; + case "pvc": + switch (queryName) { + case "diskUsage": + return `sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`; + case "diskCapacity": + return `sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`; + } + break; + case "ingress": + switch (queryName) { + case "bytesSentSuccess": + return this.bytesSent(opts.ingress, opts.namespace, "^2\\\\d*"); + case "bytesSentFailure": + return this.bytesSent(opts.ingress, opts.namespace, "^5\\\\d*"); + case "requestDurationSeconds": + return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`; + case "responseDurationSeconds": + return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`; + } + break; + } + + throw new Error(`Unknown query name ${inspect(queryName, false, undefined, false)} for category: ${inspect(opts.category, false, undefined, false)}`); + } } From c8fe4539486faa8221c86fa3304f386f59f6f347 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 30 Aug 2022 08:19:14 -0700 Subject: [PATCH 12/21] Update failing tests after merge (#6140) --- .../__snapshots__/download-logs.test.tsx.snap | 1 + .../pod-logs/download-logs.test.tsx | 46 ++++++++----------- ...lling-helm-chart-from-new-tab.test.ts.snap | 1 + 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap b/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap index 91daf9e587..0dadfade96 100644 --- a/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap +++ b/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap @@ -290,6 +290,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
{ let rendered: RenderResult; - let rendererDi: DiContainer; let builder: ApplicationBuilder; let openSaveFileDialogMock: jest.MockedFunction<() => void>; let callForLogsMock: jest.MockedFunction; @@ -46,57 +42,55 @@ describe("download logs options in pod logs dock tab", () => { callForLogsMock = jest.fn(); - builder.beforeApplicationStart(({ rendererDi }) => { - rendererDi.override(callForLogsInjectable, () => callForLogsMock); + builder.beforeWindowStart((windowDi) => { + windowDi.override(callForLogsInjectable, () => callForLogsMock); // Overriding internals of logsViewModelInjectable - rendererDi.override(getLogsInjectable, () => () => ["some-logs"]); - rendererDi.override(getLogsWithoutTimestampsInjectable, () => () => ["some-logs"]); - rendererDi.override(getTimestampSplitLogsInjectable, () => () => [...logs]); - rendererDi.override(reloadLogsInjectable, () => jest.fn()); - rendererDi.override(getLogTabDataInjectable, () => () => ({ + windowDi.override(getLogsInjectable, () => () => ["some-logs"]); + windowDi.override(getLogsWithoutTimestampsInjectable, () => () => ["some-logs"]); + windowDi.override(getTimestampSplitLogsInjectable, () => () => [...logs]); + windowDi.override(reloadLogsInjectable, () => jest.fn()); + windowDi.override(getLogTabDataInjectable, () => () => ({ selectedPodId: selectedPod.getId(), selectedContainer: selectedPod.getContainers()[0].name, namespace: "default", showPrevious: true, showTimestamps: false, })); - rendererDi.override(setLogTabDataInjectable, () => jest.fn()); - rendererDi.override(loadLogsInjectable, () => jest.fn()); - rendererDi.override(stopLoadingLogsInjectable, () => jest.fn()); - rendererDi.override(areLogsPresentInjectable, () => jest.fn()); - rendererDi.override(getPodByIdInjectable, () => (id) => { + windowDi.override(setLogTabDataInjectable, () => jest.fn()); + windowDi.override(loadLogsInjectable, () => jest.fn()); + windowDi.override(stopLoadingLogsInjectable, () => jest.fn()); + windowDi.override(areLogsPresentInjectable, () => jest.fn()); + windowDi.override(getPodByIdInjectable, () => (id) => { if (id === selectedPod.getId()) { return selectedPod; } - + return undefined; }); - rendererDi.override(getPodsByOwnerIdInjectable, () => jest.fn()); - rendererDi.override(searchStoreInjectable, () => new SearchStore()); - - rendererDi.override(getRandomIdForPodLogsTabInjectable, () => jest.fn(() => "some-irrelevant-random-id")); + windowDi.override(getPodsByOwnerIdInjectable, () => jest.fn()); + + windowDi.override(getRandomIdForPodLogsTabInjectable, () => jest.fn(() => "some-irrelevant-random-id")); openSaveFileDialogMock = jest.fn(); - rendererDi.override(openSaveFileDialogInjectable, () => openSaveFileDialogMock); + windowDi.override(openSaveFileDialogInjectable, () => openSaveFileDialogMock); }); - }); describe("when opening pod logs", () => { beforeEach(async () => { rendered = await builder.render(); - rendererDi = builder.dis.rendererDi; + const windowDi = builder.applicationWindow.only.di; const pod = dockerPod; - const createLogsTab = rendererDi.inject(createPodLogsTabInjectable); + const createLogsTab = windowDi.inject(createPodLogsTabInjectable); const container = { name: "docker-exporter", image: "docker.io/prom/node-exporter:v1.0.0-rc.0", imagePullPolicy: "pull", }; - const dockStore = rendererDi.inject(dockStoreInjectable); + const dockStore = windowDi.inject(dockStoreInjectable); dockStore.closeTab("terminal"); diff --git a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap index 600c86f0a9..b03f975260 100644 --- a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap +++ b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap @@ -290,6 +290,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
Date: Tue, 30 Aug 2022 14:35:30 -0400 Subject: [PATCH 13/21] Bump webpack-dev-server from 4.10.0 to 4.10.1 (#6135) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3f53e2aabe..d36ff71ef4 100644 --- a/package.json +++ b/package.json @@ -432,7 +432,7 @@ "typescript-plugin-css-modules": "^3.4.0", "webpack": "^5.74.0", "webpack-cli": "^4.9.2", - "webpack-dev-server": "^4.10.0", + "webpack-dev-server": "^4.10.1", "webpack-node-externals": "^3.0.0", "xterm": "^4.19.0", "xterm-addon-fit": "^0.5.0" diff --git a/yarn.lock b/yarn.lock index 514e0dde3a..f31981e0ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13919,10 +13919,10 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@*, webpack-dev-server@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz#de270d0009eba050546912be90116e7fd740a9ca" - integrity sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ== +webpack-dev-server@*, webpack-dev-server@^4.10.1: + version "4.10.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz#124ac9ac261e75303d74d95ab6712b4aec3e12ed" + integrity sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" From 03dc97fefd96e5c6595c63ad87f3a0df1fe4bf0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 14:35:47 -0400 Subject: [PATCH 14/21] Bump esbuild from 0.15.5 to 0.15.6 (#6134) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 218 +++++++++++++++++++++++++-------------------------- 2 files changed, 110 insertions(+), 110 deletions(-) diff --git a/package.json b/package.json index d36ff71ef4..8ce8f00521 100644 --- a/package.json +++ b/package.json @@ -378,7 +378,7 @@ "electron": "^19.0.13", "electron-builder": "^23.3.3", "electron-notarize": "^0.3.0", - "esbuild": "^0.15.5", + "esbuild": "^0.15.6", "esbuild-loader": "^2.19.0", "eslint": "^8.23.0", "eslint-plugin-header": "^3.1.1", diff --git a/yarn.lock b/yarn.lock index f31981e0ef..deaeafd802 100644 --- a/yarn.lock +++ b/yarn.lock @@ -603,10 +603,10 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.53.tgz#251b4cd6760fadb4d68a05815e6dc5e432d69cd6" integrity sha512-W2dAL6Bnyn4xa/QRSU3ilIK4EzD5wgYXKXJiS1HDF5vU3675qc2bvFyLwbUcdmssDveyndy7FbitrCoiV/eMLg== -"@esbuild/linux-loong64@0.15.5": - version "0.15.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.5.tgz#91aef76d332cdc7c8942b600fa2307f3387e6f82" - integrity sha512-UHkDFCfSGTuXq08oQltXxSZmH1TXyWsL+4QhZDWvvLl6mEJQqk3u7/wq1LjhrrAXYIllaTtRSzUXl4Olkf2J8A== +"@esbuild/linux-loong64@0.15.6": + version "0.15.6" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.6.tgz#45be4184f00e505411bc265a05e709764114acd8" + integrity sha512-hqmVU2mUjH6J2ZivHphJ/Pdse2ZD+uGCHK0uvsiLDk/JnSedEVj77CiVUnbMKuU4tih1TZZL8tG9DExQg/GZsw== "@eslint/eslintrc@^1.3.1": version "1.3.1" @@ -5497,140 +5497,140 @@ esbuild-android-64@0.14.53: resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.53.tgz#259bc3ef1399a3cad8f4f67c40ee20779c4de675" integrity sha512-fIL93sOTnEU+NrTAVMIKiAw0YH22HWCAgg4N4Z6zov2t0kY9RAJ50zY9ZMCQ+RT6bnOfDt8gCTnt/RaSNA2yRA== -esbuild-android-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.5.tgz#3c7b2f2a59017dab3f2c0356188a8dd9cbdc91c8" - integrity sha512-dYPPkiGNskvZqmIK29OPxolyY3tp+c47+Fsc2WYSOVjEPWNCHNyqhtFqQadcXMJDQt8eN0NMDukbyQgFcHquXg== +esbuild-android-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.6.tgz#baaed943ca510c2ad546e116728132e76d1d2044" + integrity sha512-Z1CHSgB1crVQi2LKSBwSkpaGtaloVz0ZIYcRMsvHc3uSXcR/x5/bv9wcZspvH/25lIGTaViosciS/NS09ERmVA== esbuild-android-arm64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.53.tgz#2158253d4e8f9fdd2a081bbb4f73b8806178841e" integrity sha512-PC7KaF1v0h/nWpvlU1UMN7dzB54cBH8qSsm7S9mkwFA1BXpaEOufCg8hdoEI1jep0KeO/rjZVWrsH8+q28T77A== -esbuild-android-arm64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.5.tgz#e301db818c5a67b786bf3bb7320e414ac0fcf193" - integrity sha512-YyEkaQl08ze3cBzI/4Cm1S+rVh8HMOpCdq8B78JLbNFHhzi4NixVN93xDrHZLztlocEYqi45rHHCgA8kZFidFg== +esbuild-android-arm64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.6.tgz#1c33c73d4c074969e014e31958116460c8e75a7a" + integrity sha512-mvM+gqNxqKm2pCa3dnjdRzl7gIowuc4ga7P7c3yHzs58Im8v/Lfk1ixSgQ2USgIywT48QWaACRa3F4MG7djpSw== esbuild-darwin-64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.53.tgz#b4681831fd8f8d06feb5048acbe90d742074cc2a" integrity sha512-gE7P5wlnkX4d4PKvLBUgmhZXvL7lzGRLri17/+CmmCzfncIgq8lOBvxGMiQ4xazplhxq+72TEohyFMZLFxuWvg== -esbuild-darwin-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.5.tgz#11726de5d0bf5960b92421ef433e35871c091f8d" - integrity sha512-Cr0iIqnWKx3ZTvDUAzG0H/u9dWjLE4c2gTtRLz4pqOBGjfjqdcZSfAObFzKTInLLSmD0ZV1I/mshhPoYSBMMCQ== +esbuild-darwin-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.6.tgz#388592ba61bf31993d79f6311f7452aa1ef255b9" + integrity sha512-BsfVt3usScAfGlXJiGtGamwVEOTM8AiYiw1zqDWhGv6BncLXCnTg1As+90mxWewdTZKq3iIy8s9g8CKkrrAXVw== esbuild-darwin-arm64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.53.tgz#d267d957852d121b261b3f76ead86e5b5463acc9" integrity sha512-otJwDU3hnI15Q98PX4MJbknSZ/WSR1I45il7gcxcECXzfN4Mrpft5hBDHXNRnCh+5858uPXBXA1Vaz2jVWLaIA== -esbuild-darwin-arm64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.5.tgz#ad89dafebb3613fd374f5a245bb0ce4132413997" - integrity sha512-WIfQkocGtFrz7vCu44ypY5YmiFXpsxvz2xqwe688jFfSVCnUsCn2qkEVDo7gT8EpsLOz1J/OmqjExePL1dr1Kg== +esbuild-darwin-arm64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.6.tgz#194e987849dc4688654008a1792f26e948f52e74" + integrity sha512-CnrAeJaEpPakUobhqO4wVSA4Zm6TPaI5UY4EsI62j9mTrjIyQPXA1n4Ju6Iu5TVZRnEqV6q8blodgYJ6CJuwCA== esbuild-freebsd-64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.53.tgz#aca2af6d72b537fe66a38eb8f374fb66d4c98ca0" integrity sha512-WkdJa8iyrGHyKiPF4lk0MiOF87Q2SkE+i+8D4Cazq3/iqmGPJ6u49je300MFi5I2eUsQCkaOWhpCVQMTKGww2w== -esbuild-freebsd-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.5.tgz#6bfb52b4a0d29c965aa833e04126e95173289c8a" - integrity sha512-M5/EfzV2RsMd/wqwR18CELcenZ8+fFxQAAEO7TJKDmP3knhWSbD72ILzrXFMMwshlPAS1ShCZ90jsxkm+8FlaA== +esbuild-freebsd-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.6.tgz#daa72faee585ec2ec27cc65e86a6ce0786373e66" + integrity sha512-+qFdmqi+jkAsxsNJkaWVrnxEUUI50nu6c3MBVarv3RCDCbz7ZS1a4ZrdkwEYFnKcVWu6UUE0Kkb1SQ1yGEG6sg== esbuild-freebsd-arm64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.53.tgz#76282e19312d914c34343c8a7da6cc5f051580b9" integrity sha512-9T7WwCuV30NAx0SyQpw8edbKvbKELnnm1FHg7gbSYaatH+c8WJW10g/OdM7JYnv7qkimw2ZTtSA+NokOLd2ydQ== -esbuild-freebsd-arm64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.5.tgz#38a3fed8c6398072f9914856c7c3e3444f9ef4dd" - integrity sha512-2JQQ5Qs9J0440F/n/aUBNvY6lTo4XP/4lt1TwDfHuo0DY3w5++anw+jTjfouLzbJmFFiwmX7SmUhMnysocx96w== +esbuild-freebsd-arm64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.6.tgz#70c8a2a30bf6bb9d547a0d8dc93aa015ec4f77f9" + integrity sha512-KtQkQOhnNciXm2yrTYZMD3MOm2zBiiwFSU+dkwNbcfDumzzUprr1x70ClTdGuZwieBS1BM/k0KajRQX7r504Xw== esbuild-linux-32@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.53.tgz#1045d34cf7c5faaf2af3b29cc1573b06580c37e5" integrity sha512-VGanLBg5en2LfGDgLEUxQko2lqsOS7MTEWUi8x91YmsHNyzJVT/WApbFFx3MQGhkf+XdimVhpyo5/G0PBY91zg== -esbuild-linux-32@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.5.tgz#942dc70127f0c0a7ea91111baf2806e61fc81b32" - integrity sha512-gO9vNnIN0FTUGjvTFucIXtBSr1Woymmx/aHQtuU+2OllGU6YFLs99960UD4Dib1kFovVgs59MTXwpFdVoSMZoQ== +esbuild-linux-32@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.6.tgz#d69ed2335b2d68c00b3248254b432172077b7ced" + integrity sha512-IAkDNz3TpxwISTGVdQijwyHBZrbFgLlRi5YXcvaEHtgbmayLSDcJmH5nV1MFgo/x2QdKcHBkOYHdjhKxUAcPwg== esbuild-linux-64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.53.tgz#ab3f2ee2ebb5a6930c72d9539cb34b428808cbe4" integrity sha512-pP/FA55j/fzAV7N9DF31meAyjOH6Bjuo3aSKPh26+RW85ZEtbJv9nhoxmGTd9FOqjx59Tc1ZbrJabuiXlMwuZQ== -esbuild-linux-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.5.tgz#6d748564492d5daaa7e62420862c31ac3a44aed9" - integrity sha512-ne0GFdNLsm4veXbTnYAWjbx3shpNKZJUd6XpNbKNUZaNllDZfYQt0/zRqOg0sc7O8GQ+PjSMv9IpIEULXVTVmg== +esbuild-linux-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.6.tgz#dca821e8f129cccde23ac947fd0d4bea3b333808" + integrity sha512-gQPksyrEYfA4LJwyfTQWAZaVZCx4wpaLrSzo2+Xc9QLC+i/sMWmX31jBjrn4nLJCd79KvwCinto36QC7BEIU/A== esbuild-linux-arm64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.53.tgz#1f5530412f6690949e78297122350488d3266cfe" integrity sha512-GDmWITT+PMsjCA6/lByYk7NyFssW4Q6in32iPkpjZ/ytSyH+xeEx8q7HG3AhWH6heemEYEWpTll/eui3jwlSnw== -esbuild-linux-arm64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.5.tgz#28cd899beb2d2b0a3870fd44f4526835089a318d" - integrity sha512-7EgFyP2zjO065XTfdCxiXVEk+f83RQ1JsryN1X/VSX2li9rnHAt2swRbpoz5Vlrl6qjHrCmq5b6yxD13z6RheA== +esbuild-linux-arm64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.6.tgz#c9e8bc86f3c58a7c8ff1ded5880c6a39ade7621b" + integrity sha512-aovDkclFa6C9EdZVBuOXxqZx83fuoq8097xZKhEPSygwuy4Lxs8J4anHG7kojAsR+31lfUuxzOo2tHxv7EiNHA== esbuild-linux-arm@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.53.tgz#a44ec9b5b42007ab6c0d65a224ccc6bbd97c54cf" integrity sha512-/u81NGAVZMopbmzd21Nu/wvnKQK3pT4CrvQ8BTje1STXcQAGnfyKgQlj3m0j2BzYbvQxSy+TMck4TNV2onvoPA== -esbuild-linux-arm@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.5.tgz#6441c256225564d8794fdef5b0a69bc1a43051b5" - integrity sha512-wvAoHEN+gJ/22gnvhZnS/+2H14HyAxM07m59RSLn3iXrQsdS518jnEWRBnJz3fR6BJa+VUTo0NxYjGaNt7RA7Q== +esbuild-linux-arm@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.6.tgz#354ecad0223f5b176995cf4462560eec2633de24" + integrity sha512-xZ0Bq2aivsthDjA/ytQZzxrxIZbG0ATJYMJxNeOIBc1zUjpbVpzBKgllOZMsTSXMHFHGrow6TnCcgwqY0+oEoQ== esbuild-linux-mips64le@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.53.tgz#a4d0b6b17cfdeea4e41b0b085a5f73d99311be9f" integrity sha512-d6/XHIQW714gSSp6tOOX2UscedVobELvQlPMkInhx1NPz4ThZI9uNLQ4qQJHGBGKGfu+rtJsxM4NVHLhnNRdWQ== -esbuild-linux-mips64le@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.5.tgz#d4927f817290eaffc062446896b2a553f0e11981" - integrity sha512-KdnSkHxWrJ6Y40ABu+ipTZeRhFtc8dowGyFsZY5prsmMSr1ZTG9zQawguN4/tunJ0wy3+kD54GaGwdcpwWAvZQ== +esbuild-linux-mips64le@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.6.tgz#f4fb941a4ff0af437deed69a2e0712983c8fff3e" + integrity sha512-wVpW8wkWOGizsCqCwOR/G3SHwhaecpGy3fic9BF1r7vq4djLjUcA8KunDaBCjJ6TgLQFhJ98RjDuyEf8AGjAvw== esbuild-linux-ppc64le@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.53.tgz#8c331822c85465434e086e3e6065863770c38139" integrity sha512-ndnJmniKPCB52m+r6BtHHLAOXw+xBCWIxNnedbIpuREOcbSU/AlyM/2dA3BmUQhsHdb4w3amD5U2s91TJ3MzzA== -esbuild-linux-ppc64le@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.5.tgz#b6d660dc6d5295f89ac51c675f1a2f639e2fb474" - integrity sha512-QdRHGeZ2ykl5P0KRmfGBZIHmqcwIsUKWmmpZTOq573jRWwmpfRmS7xOhmDHBj9pxv+6qRMH8tLr2fe+ZKQvCYw== +esbuild-linux-ppc64le@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.6.tgz#19774a8b52c77173f2d4f171b8a8cf839b12e686" + integrity sha512-z6w6gsPH/Y77uchocluDC8tkCg9rfkcPTePzZKNr879bF4tu7j9t255wuNOCE396IYEGxY7y8u2HJ9i7kjCLVw== esbuild-linux-riscv64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.53.tgz#36fd75543401304bea8a2d63bf8ea18aaa508e00" integrity sha512-yG2sVH+QSix6ct4lIzJj329iJF3MhloLE6/vKMQAAd26UVPVkhMFqFopY+9kCgYsdeWvXdPgmyOuKa48Y7+/EQ== -esbuild-linux-riscv64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.5.tgz#2801bf18414dc3d3ad58d1ea83084f00d9d84896" - integrity sha512-p+WE6RX+jNILsf+exR29DwgV6B73khEQV0qWUbzxaycxawZ8NE0wA6HnnTxbiw5f4Gx9sJDUBemh9v49lKOORA== +esbuild-linux-riscv64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.6.tgz#66bd83b065c4a1e623df02c122bc7e4e15fd8486" + integrity sha512-pfK/3MJcmbfU399TnXW5RTPS1S+ID6ra+CVj9TFZ2s0q9Ja1F5A1VirUUvViPkjiw+Kq3zveyn6U09Wg1zJXrw== esbuild-linux-s390x@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.53.tgz#1622677ab6824123f48f75d3afc031cd41936129" integrity sha512-OCJlgdkB+XPYndHmw6uZT7jcYgzmx9K+28PVdOa/eLjdoYkeAFvH5hTwX4AXGLZLH09tpl4bVsEtvuyUldaNCg== -esbuild-linux-s390x@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.5.tgz#12a634ae6d3384cacc2b8f4201047deafe596eae" - integrity sha512-J2ngOB4cNzmqLHh6TYMM/ips8aoZIuzxJnDdWutBw5482jGXiOzsPoEF4j2WJ2mGnm7FBCO4StGcwzOgic70JQ== +esbuild-linux-s390x@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.6.tgz#1e024bddc75afe8dc70ed48fc9627af770d7f34b" + integrity sha512-OZeeDu32liefcwAE63FhVqM4heWTC8E3MglOC7SK0KYocDdY/6jyApw0UDkDHlcEK9mW6alX/SH9r3PDjcCo/Q== esbuild-loader@^2.19.0: version "2.19.0" @@ -5649,60 +5649,60 @@ esbuild-netbsd-64@0.14.53: resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.53.tgz#e86d0efd0116658be335492ed12e66b26b4baf52" integrity sha512-gp2SB+Efc7MhMdWV2+pmIs/Ja/Mi5rjw+wlDmmbIn68VGXBleNgiEZG+eV2SRS0kJEUyHNedDtwRIMzaohWedQ== -esbuild-netbsd-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.5.tgz#951bbf87600512dfcfbe3b8d9d117d684d26c1b8" - integrity sha512-MmKUYGDizYjFia0Rwt8oOgmiFH7zaYlsoQ3tIOfPxOqLssAsEgG0MUdRDm5lliqjiuoog8LyDu9srQk5YwWF3w== +esbuild-netbsd-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.6.tgz#c11477d197f059c8794ee1691e3399201f7c4b9a" + integrity sha512-kaxw61wcHMyiEsSsi5ut1YYs/hvTC2QkxJwyRvC2Cnsz3lfMLEu8zAjpBKWh9aU/N0O/gsRap4wTur5GRuSvBA== esbuild-openbsd-64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.53.tgz#9bcbbe6f86304872c6e91f64c8eb73fc29c3588b" integrity sha512-eKQ30ZWe+WTZmteDYg8S+YjHV5s4iTxeSGhJKJajFfQx9TLZJvsJX0/paqwP51GicOUruFpSUAs2NCc0a4ivQQ== -esbuild-openbsd-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.5.tgz#26705b61961d525d79a772232e8b8f211fdbb035" - integrity sha512-2mMFfkLk3oPWfopA9Plj4hyhqHNuGyp5KQyTT9Rc8hFd8wAn5ZrbJg+gNcLMo2yzf8Uiu0RT6G9B15YN9WQyMA== +esbuild-openbsd-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.6.tgz#b29e7faed5b8d2aeaf3884c47c1a96b1cba8e263" + integrity sha512-CuoY60alzYfIZapUHqFXqXbj88bbRJu8Fp9okCSHRX2zWIcGz4BXAHXiG7dlCye5nFVrY72psesLuWdusyf2qw== esbuild-sunos-64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.53.tgz#f7a872f7460bfb7b131f7188a95fbce3d1c577e8" integrity sha512-OWLpS7a2FrIRukQqcgQqR1XKn0jSJoOdT+RlhAxUoEQM/IpytS3FXzCJM6xjUYtpO5GMY0EdZJp+ur2pYdm39g== -esbuild-sunos-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.5.tgz#d794da1ae60e6e2f6194c44d7b3c66bf66c7a141" - integrity sha512-2sIzhMUfLNoD+rdmV6AacilCHSxZIoGAU2oT7XmJ0lXcZWnCvCtObvO6D4puxX9YRE97GodciRGDLBaiC6x1SA== +esbuild-sunos-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.6.tgz#9668f39e47179f50c0435040904b9c6e10e84a70" + integrity sha512-1ceefLdPWcd1nW/ZLruPEYxeUEAVX0YHbG7w+BB4aYgfknaLGotI/ZvPWUZpzhC8l1EybrVlz++lm3E6ODIJOg== esbuild-windows-32@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.53.tgz#c5e3ca50e2d1439cc2c9fe4defa63bcd474ce709" integrity sha512-m14XyWQP5rwGW0tbEfp95U6A0wY0DYPInWBB7D69FAXUpBpBObRoGTKRv36lf2RWOdE4YO3TNvj37zhXjVL5xg== -esbuild-windows-32@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.5.tgz#0670326903f421424be86bc03b7f7b3ff86a9db7" - integrity sha512-e+duNED9UBop7Vnlap6XKedA/53lIi12xv2ebeNS4gFmu7aKyTrok7DPIZyU5w/ftHD4MUDs5PJUkQPP9xJRzg== +esbuild-windows-32@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.6.tgz#9ddcd56e3c4fb9729a218c713c4e76bdbc1678b4" + integrity sha512-pBqdOsKqCD5LRYiwF29PJRDJZi7/Wgkz46u3d17MRFmrLFcAZDke3nbdDa1c8YgY78RiemudfCeAemN8EBlIpA== esbuild-windows-64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.53.tgz#ec2ab4a60c5215f092ffe1eab6d01319e88238af" integrity sha512-s9skQFF0I7zqnQ2K8S1xdLSfZFsPLuOGmSx57h2btSEswv0N0YodYvqLcJMrNMXh6EynOmWD7rz+0rWWbFpIHQ== -esbuild-windows-64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.5.tgz#64f32acb7341f3f0a4d10e8ff1998c2d1ebfc0a9" - integrity sha512-v+PjvNtSASHOjPDMIai9Yi+aP+Vwox+3WVdg2JB8N9aivJ7lyhp4NVU+J0MV2OkWFPnVO8AE/7xH+72ibUUEnw== +esbuild-windows-64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.6.tgz#1eaadeadfd995e9d065d35cb3e9f02607202f339" + integrity sha512-KpPOh4aTOo//g9Pk2oVAzXMpc9Sz9n5A9sZTmWqDSXCiiachfFhbuFlsKBGATYCVitXfmBIJ4nNYYWSOdz4hQg== esbuild-windows-arm64@0.14.53: version "0.14.53" resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.53.tgz#f71d403806bdf9f4a1f9d097db9aec949bd675c8" integrity sha512-E+5Gvb+ZWts+00T9II6wp2L3KG2r3iGxByqd/a1RmLmYWVsSVUjkvIxZuJ3hYTIbhLkH5PRwpldGTKYqVz0nzQ== -esbuild-windows-arm64@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.5.tgz#4fe7f333ce22a922906b10233c62171673a3854b" - integrity sha512-Yz8w/D8CUPYstvVQujByu6mlf48lKmXkq6bkeSZZxTA626efQOJb26aDGLzmFWx6eg/FwrXgt6SZs9V8Pwy/aA== +esbuild-windows-arm64@0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.6.tgz#e18a778d354fc2ca2306688f3fedad8a3e57819e" + integrity sha512-DB3G2x9OvFEa00jV+OkDBYpufq5x/K7a6VW6E2iM896DG4ZnAvJKQksOsCPiM1DUaa+DrijXAQ/ZOcKAqf/3Hg== esbuild@^0.14.39: version "0.14.53" @@ -5731,32 +5731,32 @@ esbuild@^0.14.39: esbuild-windows-64 "0.14.53" esbuild-windows-arm64 "0.14.53" -esbuild@^0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.5.tgz#5effd05666f621d4ff2fe2c76a67c198292193ff" - integrity sha512-VSf6S1QVqvxfIsSKb3UKr3VhUCis7wgDbtF4Vd9z84UJr05/Sp2fRKmzC+CSPG/dNAPPJZ0BTBLTT1Fhd6N9Gg== +esbuild@^0.15.6: + version "0.15.6" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.6.tgz#626e5941b98de506b862047be3c4b33f89278923" + integrity sha512-sgLOv3l4xklvXzzczhRwKRotyrfyZ2i1fCS6PTOLPd9wevDPArGU8HFtHrHCOcsMwTjLjzGm15gvC8uxVzQf+w== optionalDependencies: - "@esbuild/linux-loong64" "0.15.5" - esbuild-android-64 "0.15.5" - esbuild-android-arm64 "0.15.5" - esbuild-darwin-64 "0.15.5" - esbuild-darwin-arm64 "0.15.5" - esbuild-freebsd-64 "0.15.5" - esbuild-freebsd-arm64 "0.15.5" - esbuild-linux-32 "0.15.5" - esbuild-linux-64 "0.15.5" - esbuild-linux-arm "0.15.5" - esbuild-linux-arm64 "0.15.5" - esbuild-linux-mips64le "0.15.5" - esbuild-linux-ppc64le "0.15.5" - esbuild-linux-riscv64 "0.15.5" - esbuild-linux-s390x "0.15.5" - esbuild-netbsd-64 "0.15.5" - esbuild-openbsd-64 "0.15.5" - esbuild-sunos-64 "0.15.5" - esbuild-windows-32 "0.15.5" - esbuild-windows-64 "0.15.5" - esbuild-windows-arm64 "0.15.5" + "@esbuild/linux-loong64" "0.15.6" + esbuild-android-64 "0.15.6" + esbuild-android-arm64 "0.15.6" + esbuild-darwin-64 "0.15.6" + esbuild-darwin-arm64 "0.15.6" + esbuild-freebsd-64 "0.15.6" + esbuild-freebsd-arm64 "0.15.6" + esbuild-linux-32 "0.15.6" + esbuild-linux-64 "0.15.6" + esbuild-linux-arm "0.15.6" + esbuild-linux-arm64 "0.15.6" + esbuild-linux-mips64le "0.15.6" + esbuild-linux-ppc64le "0.15.6" + esbuild-linux-riscv64 "0.15.6" + esbuild-linux-s390x "0.15.6" + esbuild-netbsd-64 "0.15.6" + esbuild-openbsd-64 "0.15.6" + esbuild-sunos-64 "0.15.6" + esbuild-windows-32 "0.15.6" + esbuild-windows-64 "0.15.6" + esbuild-windows-arm64 "0.15.6" escalade@^3.1.1: version "3.1.1" From e89841c51ec7c0f691ba53ff88cccfc62f32a126 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 14:36:04 -0400 Subject: [PATCH 15/21] Bump sass from 1.54.5 to 1.54.6 (#6136) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8ce8f00521..f9c34db678 100644 --- a/package.json +++ b/package.json @@ -416,7 +416,7 @@ "react-select-event": "^5.5.1", "react-table": "^7.8.0", "react-window": "^1.8.7", - "sass": "^1.54.5", + "sass": "^1.54.6", "sass-loader": "^12.6.0", "sharp": "^0.30.7", "style-loader": "^3.3.1", diff --git a/yarn.lock b/yarn.lock index deaeafd802..d173d0bc00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12058,10 +12058,10 @@ sass-loader@^12.6.0: klona "^2.0.4" neo-async "^2.6.2" -sass@^1.32.13, sass@^1.54.5: - version "1.54.5" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.5.tgz#93708f5560784f6ff2eab8542ade021a4a947b3a" - integrity sha512-p7DTOzxkUPa/63FU0R3KApkRHwcVZYC0PLnLm5iyZACyp15qSi32x7zVUhRdABAATmkALqgGrjCJAcWvobmhHw== +sass@^1.32.13, sass@^1.54.6: + version "1.54.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.6.tgz#5a12c268db26555c335028e355d6b7b1a5b9b4c8" + integrity sha512-DUqJjR2WxXBcZjRSZX5gCVyU+9fuC2qDfFzoKX9rV4rCOcec5mPtEafTcfsyL3YJuLONjWylBne+uXVh5rrmFw== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 7ad7c890610a8f19c8780110254a254f9708f77a Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 30 Aug 2022 11:45:31 -0700 Subject: [PATCH 16/21] Remove release building pipelines (#6117) --- .azure-pipelines-k8s-matrix.yml | 57 ----------- .azure-pipelines.yml | 168 -------------------------------- 2 files changed, 225 deletions(-) delete mode 100644 .azure-pipelines-k8s-matrix.yml delete mode 100644 .azure-pipelines.yml diff --git a/.azure-pipelines-k8s-matrix.yml b/.azure-pipelines-k8s-matrix.yml deleted file mode 100644 index cdcc18b740..0000000000 --- a/.azure-pipelines-k8s-matrix.yml +++ /dev/null @@ -1,57 +0,0 @@ -variables: - YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn - node_version: 12.x -pr: - branches: - include: - - master - - releases/* - paths: - exclude: - - .github/* - - docs/* - - mkdocs/* -trigger: none -jobs: - - job: Linux - pool: - vmImage: ubuntu-18.04 - strategy: - matrix: - kube_1.16: - kubernetes_version: v1.16.15 - kube_1.17: - kubernetes_version: v1.17.15 - kube_1.18: - kubernetes_version: v1.18.13 - kube_1.19: - kubernetes_version: v1.19.5 - kube_1.20: - kubernetes_version: v1.20.0 - steps: - - task: NodeTool@0 - inputs: - versionSpec: $(node_version) - displayName: Install Node.js - - task: Cache@2 - inputs: - key: 'yarn | "$(Agent.OS)" | yarn.lock' - restoreKeys: | - yarn | "$(Agent.OS)" - path: $(YARN_CACHE_FOLDER) - displayName: Cache Yarn packages - - bash: | - sudo apt-get update - sudo apt-get install libgconf-2-4 conntrack -y - curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 - sudo install minikube-linux-amd64 /usr/local/bin/minikube - sudo minikube start --driver=none --kubernetes-version $(kubernetes_version) - sudo mv /root/.kube /root/.minikube $HOME - sudo chown -R $USER $HOME/.kube $HOME/.minikube - displayName: Install integration test dependencies - - script: make node_modules - displayName: Install dependencies - - script: make -j2 build - displayName: Run build - - script: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' yarn integration - displayName: Run integration tests for Kubernetes $(kubernetes_version) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml deleted file mode 100644 index 523dc17033..0000000000 --- a/.azure-pipelines.yml +++ /dev/null @@ -1,168 +0,0 @@ -variables: - YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn -pr: none -trigger: - tags: - include: - - "*" - paths: - exclude: - - .github/* - - docs/* - - mkdocs/* -jobs: - - job: Windows - pool: - vmImage: windows-2019 - strategy: - matrix: - node: - node_version: 16.x - steps: - - powershell: | - $CI_BUILD_TAG = git describe --tags - Write-Output ("##vso[task.setvariable variable=CI_BUILD_TAG;]$CI_BUILD_TAG") - condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" - displayName: Set the tag name as an environment variable - - - task: NodeTool@0 - inputs: - versionSpec: $(node_version) - displayName: Install Node.js - - - task: Cache@2 - inputs: - key: 'yarn | "$(Agent.OS)"" | yarn.lock' - restoreKeys: | - yarn | "$(Agent.OS)" - path: $(YARN_CACHE_FOLDER) - displayName: Cache Yarn packages - - - bash: | - set -e - git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay - rm -rf .lens-ide-overlay/.git - cp -r .lens-ide-overlay/* ./ - jq -s '.[0] * .[1]' package.json package.ide.json > package.custom.json && mv package.custom.json package.json - env: - GH_TOKEN: $(LENS_IDE_GH_TOKEN) - displayName: Customize config - - - script: make build - condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" - env: - WIN_CSC_LINK: $(WIN_CSC_LINK) - WIN_CSC_KEY_PASSWORD: $(WIN_CSC_KEY_PASSWORD) - AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) - AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) - BUILD_NUMBER: $(Build.BuildNumber) - ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --ia32" - displayName: Build - - - job: macOS - timeoutInMinutes: 90 - pool: - vmImage: macOS-11 - strategy: - matrix: - node: - node_version: 16.x - steps: - - script: CI_BUILD_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=CI_BUILD_TAG]$CI_BUILD_TAG" - condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" - displayName: Set the tag name as an environment variable - - - task: NodeTool@0 - inputs: - versionSpec: $(node_version) - displayName: Install Node.js - - - task: Cache@2 - inputs: - key: 'yarn | "$(Agent.OS)" | yarn.lock' - restoreKeys: | - yarn | "$(Agent.OS)" - path: $(YARN_CACHE_FOLDER) - displayName: Cache Yarn packages - - - bash: | - set -e - git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay - rm -rf .lens-ide-overlay/.git - cp -r .lens-ide-overlay/* ./ - jq -s '.[0] * .[1]' package.json package.ide.json > package.custom.json && mv package.custom.json package.json - env: - GH_TOKEN: $(LENS_IDE_GH_TOKEN) - displayName: Customize config - - - bash: | - set -e - - echo "Importing codesign certificate ..." - echo $CSC_LINK | base64 -D > certificate.p12 - security create-keychain -p $KEYCHAIN_PASSWORD build.keychain - security set-keychain-settings -lut 21600 build.keychain - security default-keychain -s build.keychain - security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain - security import certificate.p12 -k build.keychain -P $CSC_KEY_PASSWORD -T /usr/bin/codesign -T /usr/bin/security -A - security set-key-partition-list -S apple-tool:,apple: -k $KEYCHAIN_PASSWORD build.keychain - - rm certificate.p12 - echo "Codesign certificate imported!" - - make build - condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" - env: - KEYCHAIN_PASSWORD: secretz - APPLEID: $(APPLEID) - APPLEIDPASS: $(APPLEIDPASS) - CSC_LINK: $(CSC_LINK) - CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD) - AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) - AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) - BUILD_NUMBER: $(Build.BuildNumber) - ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --arm64" - displayName: Build - - - job: Linux - pool: - vmImage: ubuntu-18.04 - strategy: - matrix: - node: - node_version: 16.x - steps: - - script: CI_BUILD_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=CI_BUILD_TAG]$CI_BUILD_TAG" - condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" - displayName: Set the tag name as an environment variable - - - task: NodeTool@0 - inputs: - versionSpec: $(node_version) - displayName: Install Node.js - - - task: Cache@2 - inputs: - key: 'yarn | "$(Agent.OS)" | yarn.lock' - restoreKeys: | - yarn | "$(Agent.OS)" - path: $(YARN_CACHE_FOLDER) - displayName: Cache Yarn packages - - - bash: | - set -e - git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay - rm -rf .lens-ide-overlay/.git - cp -r .lens-ide-overlay/* ./ - jq -s '.[0] * .[1]' package.json package.ide.json > package.custom.json && mv package.custom.json package.json - env: - GH_TOKEN: $(LENS_IDE_GH_TOKEN) - displayName: Customize config - - - script: make build - condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" - env: - AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) - AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) - BUILD_NUMBER: $(Build.BuildNumber) - displayName: Build From 0f515239c846957d3065e8cfca8e36dea3ea0c5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 08:12:19 -0400 Subject: [PATCH 17/21] Bump marked from 4.0.19 to 4.1.0 (#6144) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f9c34db678..06025f948d 100644 --- a/package.json +++ b/package.json @@ -251,7 +251,7 @@ "jsdom": "^16.7.0", "lodash": "^4.17.15", "mac-ca": "^1.0.6", - "marked": "^4.0.19", + "marked": "^4.1.0", "md5-file": "^5.0.0", "mobx": "^6.6.1", "mobx-observable-history": "^2.0.3", diff --git a/yarn.lock b/yarn.lock index d173d0bc00..3a5a9e0077 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9392,10 +9392,10 @@ markdown@^0.5.0: dependencies: nopt "~2.1.1" -marked@^4.0.19: - version "4.0.19" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.19.tgz#d36198d1ac1255525153c351c68c75bc1d7aee46" - integrity sha512-rgQF/OxOiLcvgUAj1Q1tAf4Bgxn5h5JZTp04Fx4XUkVhs7B+7YA9JEWJhJpoO8eJt8MkZMwqLCNeNqj1bCREZQ== +marked@^4.0.19, marked@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.0.tgz#3fc6e7485f21c1ca5d6ec4a39de820e146954796" + integrity sha512-+Z6KDjSPa6/723PQYyc1axYZpYYpDnECDaU6hkaf5gqBieBkMKYReL5hteF2QizhlMbgbo8umXl/clZ67+GlsA== matcher-collection@^2.0.0: version "2.0.1" From 0c142cf33998246f8f96dc93d1997c7d0794dc48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 08:12:41 -0400 Subject: [PATCH 18/21] Bump react-beautiful-dnd from 13.1.0 to 13.1.1 (#6145) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 06025f948d..9b87884c1b 100644 --- a/package.json +++ b/package.json @@ -408,7 +408,7 @@ "postcss": "^8.4.16", "postcss-loader": "^6.2.1", "randomcolor": "^0.6.2", - "react-beautiful-dnd": "^13.1.0", + "react-beautiful-dnd": "^13.1.1", "react-refresh": "^0.14.0", "react-refresh-typescript": "^2.0.7", "react-router-dom": "^5.3.3", diff --git a/yarn.lock b/yarn.lock index 3a5a9e0077..d7862b64b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11379,10 +11379,10 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-beautiful-dnd@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d" - integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA== +react-beautiful-dnd@^13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2" + integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ== dependencies: "@babel/runtime" "^7.9.2" css-box-model "^1.2.0" From 0a14151e03e3fe27b4d35a2b5edd1e7e7d48329f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 08:13:00 -0400 Subject: [PATCH 19/21] Bump sass from 1.54.6 to 1.54.7 (#6147) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9b87884c1b..e3302ba8f8 100644 --- a/package.json +++ b/package.json @@ -416,7 +416,7 @@ "react-select-event": "^5.5.1", "react-table": "^7.8.0", "react-window": "^1.8.7", - "sass": "^1.54.6", + "sass": "^1.54.7", "sass-loader": "^12.6.0", "sharp": "^0.30.7", "style-loader": "^3.3.1", diff --git a/yarn.lock b/yarn.lock index d7862b64b0..644a0420e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12058,10 +12058,10 @@ sass-loader@^12.6.0: klona "^2.0.4" neo-async "^2.6.2" -sass@^1.32.13, sass@^1.54.6: - version "1.54.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.6.tgz#5a12c268db26555c335028e355d6b7b1a5b9b4c8" - integrity sha512-DUqJjR2WxXBcZjRSZX5gCVyU+9fuC2qDfFzoKX9rV4rCOcec5mPtEafTcfsyL3YJuLONjWylBne+uXVh5rrmFw== +sass@^1.32.13, sass@^1.54.7: + version "1.54.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.7.tgz#a93fb1690472b161fab8f4ab34a66a0f3000c478" + integrity sha512-3q7MQz7sCpVG6TLhUfZwGOcd2/sm2ghYN2JEdRjNiW04ILdvahdo9GuAs+bxsxZ3hDCKv+wUT5w0iFWGU0CxlA== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From cacc92d37a0851888bd379ae0163548ec6d652d1 Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Wed, 31 Aug 2022 18:22:17 +0300 Subject: [PATCH 20/21] Fix Promethes operator metrics provider detection (#6150) --- src/main/prometheus/operator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/prometheus/operator.ts b/src/main/prometheus/operator.ts index 4673cad815..504bb93136 100644 --- a/src/main/prometheus/operator.ts +++ b/src/main/prometheus/operator.ts @@ -15,7 +15,7 @@ export class PrometheusOperator extends PrometheusProvider { readonly isConfigurable: boolean = true; public async getPrometheusService(client: CoreV1Api): Promise { - return this.getFirstNamespacedService(client, "operated-prometheus=true", "self-monitor=true"); + return this.getFirstNamespacedService(client, "operated-prometheus=true"); } public getQuery(opts: Record, queryName: string): string { From 2fe7668edc62f776c49980c1a5cbce1b533c9591 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 31 Aug 2022 21:20:35 +0300 Subject: [PATCH 21/21] Remove requests/limits text data for workload metrics (#6128) --- .../components/resource-metrics/resource-metrics-text.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/renderer/components/resource-metrics/resource-metrics-text.tsx b/src/renderer/components/resource-metrics/resource-metrics-text.tsx index 364bc6d0f4..cedf0d136f 100644 --- a/src/renderer/components/resource-metrics/resource-metrics-text.tsx +++ b/src/renderer/components/resource-metrics/resource-metrics-text.tsx @@ -19,19 +19,15 @@ export function ResourceMetricsText({ metrics }: ResourceMetricsTextProps) { return null; } - const { cpuUsage, cpuRequests, cpuLimits, memoryUsage, memoryRequests, memoryLimits } = getMetricLastPoints(metrics); + const { cpuUsage, memoryUsage } = getMetricLastPoints(metrics); return ( <> {cpuUsage > 0 && } - {cpuRequests > 0 && } - {cpuLimits > 0 && } {memoryUsage > 0 && } - {memoryRequests > 0 && } - {memoryLimits > 0 && } );