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 01/85] 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 02/85] 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 03/85] 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 04/85] 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 05/85] 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 && } ); From 37318cab4e14e4c52c9d0c1f8ac536bed4e3aae6 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Thu, 1 Sep 2022 12:52:55 +0300 Subject: [PATCH 06/85] Fix: align sidebar menu items (#6138) * Introduce sitebar-items.module.scss Signed-off-by: Alex Andreev * Adjust sidebar item styles Signed-off-by: Alex Andreev * Use classnames from a scss module Signed-off-by: Alex Andreev * Set sidebar min width to 150px to keep readability Signed-off-by: Alex Andreev * Break words in long links Signed-off-by: Alex Andreev * Adjust navigation paddings Signed-off-by: Alex Andreev * Remove unused scss file Signed-off-by: Alex Andreev * Updating bunch of snapshots Signed-off-by: Alex Andreev Signed-off-by: Alex Andreev --- .../order-of-sidebar-items.test.tsx.snap | 160 +-- ...-and-tab-navigation-for-core.test.tsx.snap | 430 +++---- ...ab-navigation-for-extensions.test.tsx.snap | 520 +++----- .../visibility-of-sidebar-items.test.tsx.snap | 112 +- ...when-cluster-is-not-relevant.test.tsx.snap | 150 +-- ...when-cluster-is-not-relevant.test.tsx.snap | 156 +-- ...when-cluster-is-not-relevant.test.tsx.snap | 150 +-- ...when-cluster-is-not-relevant.test.tsx.snap | 150 +-- ...how-status-for-a-kube-object.test.tsx.snap | 300 ++--- ...when-cluster-is-not-relevant.test.tsx.snap | 150 +-- .../edit-namespace-from-new-tab.test.tsx.snap | 896 +++++--------- ...e-from-previously-opened-tab.test.tsx.snap | 112 +- ...when-cluster-is-not-relevant.test.tsx.snap | 150 +-- ...lling-helm-chart-from-new-tab.test.ts.snap | 1050 ++++++----------- ...rt-from-previously-opened-tab.test.ts.snap | 100 +- ...tab-for-installing-helm-chart.test.ts.snap | 400 +++---- ...wing-details-for-helm-release.test.ts.snap | 800 +++++-------- .../components/layout/main-layout.tsx | 2 +- .../components/layout/sidebar-item.scss | 97 -- .../components/layout/sidebar-item.tsx | 16 +- .../layout/sidebar-items.module.scss | 63 + .../components/layout/sidebar.module.scss | 1 - .../__snapshots__/cluster-frame.test.tsx.snap | 192 ++- 23 files changed, 2219 insertions(+), 3938 deletions(-) delete mode 100644 src/renderer/components/layout/sidebar-item.scss create mode 100644 src/renderer/components/layout/sidebar-items.module.scss 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 b9d854220c..7f76811494 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 @@ -39,7 +39,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` > @@ -87,9 +85,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` list - + Config @@ -100,17 +96,15 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` data-testid="sidebar-item-some-parent-id" > @@ -178,9 +170,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` storage - + Storage @@ -191,13 +181,11 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` data-testid="sidebar-item-some-another-parent-id" > - + Some another parent @@ -208,7 +196,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` data-testid="sidebar-item-helm" > @@ -256,9 +242,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` security - + Access Control @@ -269,7 +253,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` data-testid="sidebar-item-custom-resources" > - + Some other parent @@ -619,7 +599,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded > @@ -667,9 +645,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded list - + Config @@ -680,17 +656,15 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded data-testid="sidebar-item-some-parent-id" >