From 8055ba261b5a341189336c654462e53384240b2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 08:59:18 -0500 Subject: [PATCH 01/17] Bump @types/url-parse from 1.4.4 to 1.4.5 (#4494) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sebastian Malton --- package.json | 2 +- src/common/protocol-handler/error.ts | 4 ++-- src/common/protocol-handler/router.ts | 10 +++++----- src/main/protocol-handler/router.ts | 8 ++++---- yarn.lock | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 2d24504590..c7778e8d37 100644 --- a/package.json +++ b/package.json @@ -312,7 +312,7 @@ "@types/tcp-port-used": "^1.0.0", "@types/tempy": "^0.3.0", "@types/triple-beam": "^1.3.2", - "@types/url-parse": "^1.4.4", + "@types/url-parse": "^1.4.5", "@types/uuid": "^8.3.3", "@types/webpack": "^4.41.31", "@types/webpack-dev-server": "^3.11.6", diff --git a/src/common/protocol-handler/error.ts b/src/common/protocol-handler/error.ts index c08d867766..263d5bfe2f 100644 --- a/src/common/protocol-handler/error.ts +++ b/src/common/protocol-handler/error.ts @@ -30,13 +30,13 @@ export enum RoutingErrorType { MISSING_EXTENSION = "missing-ext", } -export class RoutingError extends Error { +export class RoutingError extends Error { /** * Will be set if the routing error originated in an extension route table */ public extensionName?: string; - constructor(public type: RoutingErrorType, public url: Url) { + constructor(public type: RoutingErrorType, public url: Url) { super("routing error"); } diff --git a/src/common/protocol-handler/router.ts b/src/common/protocol-handler/router.ts index c387b18a55..6aea2037d1 100644 --- a/src/common/protocol-handler/router.ts +++ b/src/common/protocol-handler/router.ts @@ -91,7 +91,7 @@ export abstract class LensProtocolRouter extends Singleton { * @param url the parsed URL that initiated the `lens://` protocol * @returns true if a route has been found */ - protected _routeToInternal(url: Url): RouteAttempt { + protected _routeToInternal(url: Url>): RouteAttempt { return this._route(this.internalRoutes.entries(), url); } @@ -101,7 +101,7 @@ export abstract class LensProtocolRouter extends Singleton { * @param routes the array of path schemas, handler pairs to match against * @param url the url (in its current state) */ - protected _findMatchingRoute(routes: Iterable<[string, RouteHandler]>, url: Url): null | [match>, RouteHandler] { + protected _findMatchingRoute(routes: Iterable<[string, RouteHandler]>, url: Url>): null | [match>, RouteHandler] { const matches: [match>, RouteHandler][] = []; for (const [schema, handler] of routes) { @@ -128,7 +128,7 @@ export abstract class LensProtocolRouter extends Singleton { * @param routes the array of (path schemas, handler) pairs to match against * @param url the url (in its current state) */ - protected _route(routes: Iterable<[string, RouteHandler]>, url: Url, extensionName?: string): RouteAttempt { + protected _route(routes: Iterable<[string, RouteHandler]>, url: Url>, extensionName?: string): RouteAttempt { const route = this._findMatchingRoute(routes, url); if (!route) { @@ -166,7 +166,7 @@ export abstract class LensProtocolRouter extends Singleton { * @param url the protocol request URI that was "open"-ed * @returns either the found name or the instance of `LensExtension` */ - protected async _findMatchingExtensionByName(url: Url): Promise { + protected async _findMatchingExtensionByName(url: Url>): Promise { interface ExtensionUrlMatch { [EXTENSION_PUBLISHER_MATCH]: string; [EXTENSION_NAME_MATCH]: string; @@ -222,7 +222,7 @@ export abstract class LensProtocolRouter extends Singleton { * Note: this function modifies its argument, do not reuse * @param url the protocol request URI that was "open"-ed */ - protected async _routeToExtension(url: Url): Promise { + protected async _routeToExtension(url: Url>): Promise { const extension = await this._findMatchingExtensionByName(url); if (typeof extension === "string") { diff --git a/src/main/protocol-handler/router.ts b/src/main/protocol-handler/router.ts index fe178705e7..ffcfd49d3e 100644 --- a/src/main/protocol-handler/router.ts +++ b/src/main/protocol-handler/router.ts @@ -39,7 +39,7 @@ export interface FallbackHandler { * @returns `true` if it should be routed internally to Lens, `false` if to an extension * @throws if `host` is not valid */ -function checkHost(url: URLParse): boolean { +function checkHost(url: URLParse): boolean { switch (url.host) { case "app": return true; @@ -112,7 +112,7 @@ export class LensProtocolRouterMain extends proto.LensProtocolRouter { return false; } - protected async _findMatchingExtensionByName(url: URLParse): Promise { + protected async _findMatchingExtensionByName(url: URLParse>): Promise { const firstAttempt = await super._findMatchingExtensionByName(url); if (typeof firstAttempt !== "string") { @@ -126,7 +126,7 @@ export class LensProtocolRouterMain extends proto.LensProtocolRouter { return ""; } - protected _routeToInternal(url: URLParse): RouteAttempt { + protected _routeToInternal(url: URLParse>): RouteAttempt { const rawUrl = url.toString(); // for sending to renderer const attempt = super._routeToInternal(url); @@ -135,7 +135,7 @@ export class LensProtocolRouterMain extends proto.LensProtocolRouter { return attempt; } - protected async _routeToExtension(url: URLParse): Promise { + protected async _routeToExtension(url: URLParse>): Promise { const rawUrl = url.toString(); // for sending to renderer /** diff --git a/yarn.lock b/yarn.lock index d59b4b2f37..97bda7e5cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1951,10 +1951,10 @@ resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.10.0.tgz#5cb0dff2a5f616fc8e0c61b482bf01fa20a03cec" integrity sha512-ZAbqul7QAKpM2h1PFGa5ETN27ulmqtj0QviYHasw9LffvXZvVHuraOx/FOsIPPDNGZN0Qo1nASxxSfMYOtSoCw== -"@types/url-parse@^1.4.4": - version "1.4.4" - resolved "https://registry.yarnpkg.com/@types/url-parse/-/url-parse-1.4.4.tgz#ebeb0ec8b581318739cf73e9f9b186f610764255" - integrity sha512-KtQLad12+4T/NfSxpoDhmr22+fig3T7/08QCgmutYA6QSznSRmEtuL95GrhVV40/0otTEdFc+etRcCTqhh1q5Q== +"@types/url-parse@^1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@types/url-parse/-/url-parse-1.4.5.tgz#bda0b813cc8f79d767dc8ca645fdabc238c6ae77" + integrity sha512-8Wje3itJpk/FX+QItca9vjNLjGx5jlEYBw/CpMi03Fphk2DSVeZDUqWTE81BeCI5Bl6Z+zmA1O9L/8e3ZUSeLg== "@types/uuid@^8.3.3": version "8.3.3" From 39955b623f7a9d38de68e1e7c2153b4a24769e5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 08:59:25 -0500 Subject: [PATCH 02/17] Bump sharp from 0.29.2 to 0.29.3 (#4495) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 56 +++++++++++++++++++++------------------------------- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index c7778e8d37..a968cd0292 100644 --- a/package.json +++ b/package.json @@ -369,7 +369,7 @@ "react-window": "^1.8.6", "sass": "^1.43.4", "sass-loader": "^8.0.2", - "sharp": "^0.29.2", + "sharp": "^0.29.3", "style-loader": "^2.0.0", "tailwindcss": "^2.2.19", "ts-jest": "26.5.6", diff --git a/yarn.lock b/yarn.lock index 97bda7e5cf..cda69963a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4462,13 +4462,6 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -9383,11 +9376,6 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - mimic-response@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" @@ -9701,12 +9689,12 @@ no-case@^3.0.3: lower-case "^2.0.1" tslib "^1.10.0" -node-abi@^2.21.0: - version "2.30.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b" - integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg== +node-abi@^3.3.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" + integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== dependencies: - semver "^5.4.1" + semver "^7.3.5" node-addon-api@^1.6.3: version "1.7.2" @@ -11057,10 +11045,10 @@ postinstall-postinstall@^2.1.0: resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3" integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ== -prebuild-install@^6.1.4: - version "6.1.4" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" - integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== +prebuild-install@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" + integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -11068,11 +11056,11 @@ prebuild-install@^6.1.4: minimist "^1.2.3" mkdirp-classic "^0.5.3" napi-build-utils "^1.0.1" - node-abi "^2.21.0" + node-abi "^3.3.0" npmlog "^4.0.1" pump "^3.0.0" rc "^1.2.7" - simple-get "^3.0.3" + simple-get "^4.0.0" tar-fs "^2.0.0" tunnel-agent "^0.6.0" @@ -12407,17 +12395,17 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" -sharp@^0.29.2: - version "0.29.2" - resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.29.2.tgz#e8c003cd9cb321585b32dbda6eed3baa7d6f2308" - integrity sha512-XWRdiYLIJ3tDUejRyG24KERnJzMfIoyiJBntd2S6/uj3NEeNgRFRLgiBlvPxMa8aml14dKKD98yHinSNKp1xzQ== +sharp@^0.29.3: + version "0.29.3" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.29.3.tgz#0da183d626094c974516a48fab9b3e4ba92eb5c2" + integrity sha512-fKWUuOw77E4nhpyzCCJR1ayrttHoFHBT2U/kR/qEMRhvPEcluG4BKj324+SCO1e84+knXHwhJ1HHJGnUt4ElGA== dependencies: color "^4.0.1" detect-libc "^1.0.3" node-addon-api "^4.2.0" - prebuild-install "^6.1.4" + prebuild-install "^7.0.0" semver "^7.3.5" - simple-get "^3.1.0" + simple-get "^4.0.0" tar-fs "^2.1.1" tunnel-agent "^0.6.0" @@ -12496,12 +12484,12 @@ simple-concat@^1.0.0: resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== -simple-get@^3.0.3, simple-get@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== +simple-get@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" + integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ== dependencies: - decompress-response "^4.2.0" + decompress-response "^6.0.0" once "^1.3.1" simple-concat "^1.0.0" From d73df7fe0d2c12454e9870dea6cea0ec630ec05d Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Fri, 3 Dec 2021 17:41:08 +0300 Subject: [PATCH 03/17] Show active hotbar on bottom (#4476) - Extends extension API to support choosing sides for bottom bar entries --- .../registries/status-bar-registry.ts | 6 + src/renderer/bootstrap.tsx | 7 +- .../cluster-manager/active-hotbar-name.tsx | 40 ++++++ ...{bottom-bar.scss => bottom-bar.module.css} | 30 +++-- .../cluster-manager/bottom-bar.test.tsx | 114 +++++++++++++++++- .../components/cluster-manager/bottom-bar.tsx | 21 +++- .../cluster-manager/cluster-manager.scss | 2 +- .../components/hotbar/hotbar-selector.scss | 3 +- src/renderer/initializers/index.ts | 1 + .../initializers/status-bar-registry.tsx | 35 ++++++ 10 files changed, 231 insertions(+), 28 deletions(-) create mode 100644 src/renderer/components/cluster-manager/active-hotbar-name.tsx rename src/renderer/components/cluster-manager/{bottom-bar.scss => bottom-bar.module.css} (80%) create mode 100644 src/renderer/initializers/status-bar-registry.tsx diff --git a/src/extensions/registries/status-bar-registry.ts b/src/extensions/registries/status-bar-registry.ts index 2afdee76a6..e4864b5173 100644 --- a/src/extensions/registries/status-bar-registry.ts +++ b/src/extensions/registries/status-bar-registry.ts @@ -26,6 +26,12 @@ import { BaseRegistry } from "./base-registry"; interface StatusBarComponents { Item?: React.ComponentType; + /** + * The side of the bottom bar to place this component. + * + * @default "right" + */ + position?: "left" | "right"; } interface StatusBarRegistrationV2 { diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx index edc4ff90f7..f42a671de6 100644 --- a/src/renderer/bootstrap.tsx +++ b/src/renderer/bootstrap.tsx @@ -104,13 +104,13 @@ export async function bootstrap(comp: () => Promise, di: Dependenc logger.info(`${logPrefix} initializing WelcomeMenuRegistry`); initializers.initWelcomeMenuRegistry(); - logger.info(`${logPrefix} initializing WorkloadsOverviewDetailRegist`); + logger.info(`${logPrefix} initializing WorkloadsOverviewDetailRegistry`); initializers.initWorkloadsOverviewDetailRegistry(); logger.info(`${logPrefix} initializing CatalogEntityDetailRegistry`); initializers.initCatalogEntityDetailRegistry(); - logger.info(`${logPrefix} initializing CatalogCategoryRegistryEntrie`); + logger.info(`${logPrefix} initializing CatalogCategoryRegistryEntries`); initializers.initCatalogCategoryRegistryEntries(); logger.info(`${logPrefix} initializing Catalog`); @@ -119,6 +119,9 @@ export async function bootstrap(comp: () => Promise, di: Dependenc logger.info(`${logPrefix} initializing IpcRendererListeners`); initializers.initIpcRendererListeners(); + logger.info(`${logPrefix} initializing StatusBarRegistry`); + initializers.initStatusBarRegistry(); + ExtensionLoader.createInstance().init(); ExtensionDiscovery.createInstance().init(); diff --git a/src/renderer/components/cluster-manager/active-hotbar-name.tsx b/src/renderer/components/cluster-manager/active-hotbar-name.tsx new file mode 100644 index 0000000000..63f8b583b9 --- /dev/null +++ b/src/renderer/components/cluster-manager/active-hotbar-name.tsx @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import React from "react"; +import { observer } from "mobx-react"; +import { Icon } from "../icon"; +import { HotbarStore } from "../../../common/hotbar-store"; +import { CommandOverlay } from "../command-palette"; +import { HotbarSwitchCommand } from "../hotbar/hotbar-switch-command"; + +export const ActiveHotbarName = observer(() => { + return ( +
CommandOverlay.open()} + > + + {HotbarStore.getInstance().getActive()?.name} +
+ ); +}); diff --git a/src/renderer/components/cluster-manager/bottom-bar.scss b/src/renderer/components/cluster-manager/bottom-bar.module.css similarity index 80% rename from src/renderer/components/cluster-manager/bottom-bar.scss rename to src/renderer/components/cluster-manager/bottom-bar.module.css index aca8272489..7eeb1c5ef4 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.scss +++ b/src/renderer/components/cluster-manager/bottom-bar.module.css @@ -20,22 +20,26 @@ */ .BottomBar { - $spacing: $padding * 0.5; - --flex-gap: #{$spacing}; + @apply flex px-2 text-white; + grid-area: bottom-bar; background-color: var(--blue); - padding: 0 2px; height: var(--bottom-bar-height); + font-size: var(--font-size-small); +} - .extensions { - font-size: var(--font-size-small); - color: white; - .item { - padding: $padding * 0.25 $padding * 0.5; - &:hover { - background-color: #ffffff33; - cursor: pointer; - } - } +.item { + @apply flex items-center mr-2 h-full px-2 last:mr-0; + + &:hover { + @apply cursor-pointer; + + background-color: #ffffff33; } } + +.onLeft + .onRight { + @apply ml-auto; +} + +.onRight {} \ No newline at end of file diff --git a/src/renderer/components/cluster-manager/bottom-bar.test.tsx b/src/renderer/components/cluster-manager/bottom-bar.test.tsx index d9f683fe66..4390175889 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.test.tsx +++ b/src/renderer/components/cluster-manager/bottom-bar.test.tsx @@ -20,25 +20,58 @@ */ import React from "react"; -import { render } from "@testing-library/react"; +import mockFs from "mock-fs"; +import { render, fireEvent } from "@testing-library/react"; import "@testing-library/jest-dom/extend-expect"; +import { BottomBar } from "./bottom-bar"; +import { StatusBarRegistry } from "../../../extensions/registries"; +import { HotbarStore } from "../../../common/hotbar-store"; +import { AppPaths } from "../../../common/app-paths"; +import { CommandOverlay } from "../command-palette"; +import { HotbarSwitchCommand } from "../hotbar/hotbar-switch-command"; +import { ActiveHotbarName } from "./active-hotbar-name"; -jest.mock("electron", () => ({ - app: { - getPath: () => "/foo", +jest.mock("../command-palette", () => ({ + CommandOverlay: { + open: jest.fn(), }, })); -import { BottomBar } from "./bottom-bar"; -import { StatusBarRegistry } from "../../../extensions/registries"; +AppPaths.init(); + +jest.mock("electron", () => ({ + app: { + getName: () => "lens", + setName: jest.fn(), + setPath: jest.fn(), + getPath: () => "tmp", + }, + ipcMain: { + handle: jest.fn(), + on: jest.fn(), + removeAllListeners: jest.fn(), + off: jest.fn(), + send: jest.fn(), + }, +})); describe("", () => { beforeEach(() => { + const mockOpts = { + "tmp": { + "test-store.json": JSON.stringify({}), + }, + }; + + mockFs(mockOpts); StatusBarRegistry.createInstance(); + HotbarStore.createInstance(); }); afterEach(() => { StatusBarRegistry.resetInstance(); + HotbarStore.resetInstance(); + mockFs.restore(); }); it("renders w/o errors", () => { @@ -87,4 +120,73 @@ describe("", () => { expect(await getByTestId(testId)).toHaveTextContent(text); }); + + it("show default hotbar name", () => { + StatusBarRegistry.getInstance().getItems = jest.fn().mockImplementationOnce(() => [ + { item: () => }, + ]); + const { getByTestId } = render(); + + expect(getByTestId("current-hotbar-name")).toHaveTextContent("default"); + }); + + it("show active hotbar name", () => { + StatusBarRegistry.getInstance().getItems = jest.fn().mockImplementationOnce(() => [ + { item: () => }, + ]); + const { getByTestId } = render(); + + HotbarStore.getInstance().add({ + id: "new", + name: "new", + }, { setActive: true }); + + expect(getByTestId("current-hotbar-name")).toHaveTextContent("new"); + }); + + it("opens command palette on click", () => { + StatusBarRegistry.getInstance().getItems = jest.fn().mockImplementationOnce(() => [ + { item: () => }, + ]); + const { getByTestId } = render(); + const activeHotbar = getByTestId("current-hotbar-name"); + + fireEvent.click(activeHotbar); + + expect(CommandOverlay.open).toHaveBeenCalledWith(); + }); + + it("sort positioned items properly", () => { + StatusBarRegistry.getInstance().getItems = jest.fn().mockImplementationOnce(() => [ + { + components: { + Item: () =>
right
, + }, + }, + { + components: { + Item: () =>
right
, + position: "right", + }, + }, + { + components: { + Item: () =>
left
, + position: "left", + }, + }, + { + components: { + Item: () =>
left
, + position: "left", + }, + }, + ]); + + const { getAllByTestId } = render(); + const elems = getAllByTestId("sortedElem"); + const positions = elems.map(elem => elem.textContent); + + expect(positions).toEqual(["left", "left", "right", "right"]); + }); }); diff --git a/src/renderer/components/cluster-manager/bottom-bar.tsx b/src/renderer/components/cluster-manager/bottom-bar.tsx index 0f61a03833..27b5a10f3f 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.tsx +++ b/src/renderer/components/cluster-manager/bottom-bar.tsx @@ -19,11 +19,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import "./bottom-bar.scss"; +import styles from "./bottom-bar.module.css"; import React from "react"; import { observer } from "mobx-react"; import { StatusBarRegistration, StatusBarRegistry } from "../../../extensions/registries"; +import { cssNames } from "../../utils"; @observer export class BottomBar extends React.Component { @@ -44,26 +45,36 @@ export class BottomBar extends React.Component { return null; } + items.sort(function sortLeftPositionFirst(a, b) { + return a.components?.position?.localeCompare(b.components?.position); + }); + return ( -
+ <> {items.map((registration, index) => { if (!registration?.item && !registration?.components?.Item) { return null; } return ( -
+
{this.renderRegisteredItem(registration)}
); })} -
+ ); } render() { return ( -
+
{this.renderRegisteredItems()}
); diff --git a/src/renderer/components/cluster-manager/cluster-manager.scss b/src/renderer/components/cluster-manager/cluster-manager.scss index 3b9e74c1ac..8cdce19d82 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.scss +++ b/src/renderer/components/cluster-manager/cluster-manager.scss @@ -20,7 +20,7 @@ */ .ClusterManager { - --bottom-bar-height: 22px; + --bottom-bar-height: 21px; --hotbar-width: 75px; display: grid; diff --git a/src/renderer/components/hotbar/hotbar-selector.scss b/src/renderer/components/hotbar/hotbar-selector.scss index d0fe3fa57c..5eaeb33692 100644 --- a/src/renderer/components/hotbar/hotbar-selector.scss +++ b/src/renderer/components/hotbar/hotbar-selector.scss @@ -43,7 +43,8 @@ .Icon { --size: 16px; - padding: 0 4px; + padding: 0 4px 0 0px; + margin: 0px 4px; &:hover { box-shadow: none; diff --git a/src/renderer/initializers/index.ts b/src/renderer/initializers/index.ts index 27e6ffef9c..55d1bbbb1b 100644 --- a/src/renderer/initializers/index.ts +++ b/src/renderer/initializers/index.ts @@ -30,3 +30,4 @@ export * from "./registries"; export * from "./welcome-menu-registry"; export * from "./workloads-overview-detail-registry"; export * from "./catalog-category-registry"; +export * from "./status-bar-registry"; diff --git a/src/renderer/initializers/status-bar-registry.tsx b/src/renderer/initializers/status-bar-registry.tsx new file mode 100644 index 0000000000..e2c7bc561e --- /dev/null +++ b/src/renderer/initializers/status-bar-registry.tsx @@ -0,0 +1,35 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import React from "react"; +import { StatusBarRegistry } from "../../extensions/registries"; +import { ActiveHotbarName } from "../components/cluster-manager/active-hotbar-name"; + +export function initStatusBarRegistry() { + StatusBarRegistry.getInstance().add([ + { + components: { + Item: () => , + position: "left", + }, + }, + ]); +} From 122f14f32b6cbc4628eb9a52bcfcfd6292bb3c71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 11:49:57 -0500 Subject: [PATCH 04/17] Bump react-material-ui-carousel from 2.3.5 to 2.3.8 (#4491) 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 a968cd0292..649ffb06ad 100644 --- a/package.json +++ b/package.json @@ -238,7 +238,7 @@ "proper-lockfile": "^4.1.2", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-material-ui-carousel": "^2.3.5", + "react-material-ui-carousel": "^2.3.8", "react-router": "^5.2.0", "react-virtualized-auto-sizer": "^1.0.6", "readable-stream": "^3.6.0", diff --git a/yarn.lock b/yarn.lock index cda69963a0..98ebbff043 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11462,10 +11462,10 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-material-ui-carousel@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/react-material-ui-carousel/-/react-material-ui-carousel-2.3.5.tgz#c6b4514333564ff4d49d2447f6d67f6c7651e813" - integrity sha512-laiysIaA47rX0/lIVjprX5MHrDyjLxgzAsyBnG8OKgO2ad5o3Pg88PAmu6RlMy/L/H6PKFYQ8H5bAqpeZETeYw== +react-material-ui-carousel@^2.3.8: + version "2.3.8" + resolved "https://registry.yarnpkg.com/react-material-ui-carousel/-/react-material-ui-carousel-2.3.8.tgz#6d6c088be22301fa91863383f35795d4e917a2a5" + integrity sha512-0qAWiKBQI4GCjuCWZANdDuHPW8k8N3qZo3tCn9OxpVNO+M9lq7Xzak63AyPwmRDRw93l97LYhbwQIMohvpaMeg== dependencies: auto-bind "^2.1.1" react-swipeable "^6.1.0" From 4f291ad077d8e000007cb6f29894da8e55d2c4ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 11:50:05 -0500 Subject: [PATCH 05/17] Bump moment-timezone from 0.5.33 to 0.5.34 (#4489) 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 649ffb06ad..2abe2b7d29 100644 --- a/package.json +++ b/package.json @@ -227,7 +227,7 @@ "mobx-react": "^7.2.1", "mock-fs": "^4.14.0", "moment": "^2.29.1", - "moment-timezone": "^0.5.33", + "moment-timezone": "^0.5.34", "monaco-editor": "^0.29.1", "monaco-editor-webpack-plugin": "^5.0.0", "node-fetch": "lensapp/node-fetch#2.x", diff --git a/yarn.lock b/yarn.lock index 98ebbff043..434c6a2ac1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9537,10 +9537,10 @@ modern-normalize@^1.1.0: resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7" integrity sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA== -moment-timezone@^0.5.33: - version "0.5.33" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" - integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== +moment-timezone@^0.5.34: + version "0.5.34" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c" + integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg== dependencies: moment ">= 2.9.0" From 7dfd4d586cb87c11642adee1438bb8534fed96d7 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 3 Dec 2021 12:49:42 -0500 Subject: [PATCH 06/17] Fix error notifications not being displayed for CreateResource tab (#4502) --- src/renderer/components/dock/create-resource.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/components/dock/create-resource.tsx b/src/renderer/components/dock/create-resource.tsx index b7a94c868a..513b7134bd 100644 --- a/src/renderer/components/dock/create-resource.tsx +++ b/src/renderer/components/dock/create-resource.tsx @@ -35,7 +35,7 @@ import { InfoPanel } from "./info-panel"; import * as resourceApplierApi from "../../../common/k8s-api/endpoints/resource-applier.api"; import { Notifications } from "../notifications"; import logger from "../../../common/logger"; -import type { KubeJsonApiData, KubeJsonApiError } from "../../../common/k8s-api/kube-json-api"; +import type { KubeJsonApiData } from "../../../common/k8s-api/kube-json-api"; import { getDetailsUrl } from "../kube-detail-params"; import { apiManager } from "../../../common/k8s-api/api-manager"; import { prevDefault } from "../../utils"; @@ -130,9 +130,7 @@ export class CreateResource extends React.Component {

, ); } catch (error) { - const failureReason = (error as KubeJsonApiError).reason.toString(); - - Notifications.error(failureReason); + Notifications.error(error?.toString() ?? "Unknown error occured"); } }); From 9aadb721c93a3ff35260c104e57c25e360f23231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 12:49:52 -0500 Subject: [PATCH 07/17] Bump webpack-dev-server from 3.11.2 to 3.11.3 (#4498) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 2abe2b7d29..401c5f7c35 100644 --- a/package.json +++ b/package.json @@ -385,7 +385,7 @@ "url-loader": "^4.1.1", "webpack": "^4.46.0", "webpack-cli": "^3.3.12", - "webpack-dev-server": "^3.11.2", + "webpack-dev-server": "^3.11.3", "webpack-node-externals": "^1.7.2", "xterm": "^4.14.1", "xterm-addon-fit": "^0.5.0" diff --git a/yarn.lock b/yarn.lock index 434c6a2ac1..dd8a009b30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2447,7 +2447,12 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.11.0" -ansi-html@0.0.7, ansi-html@^0.0.7: +ansi-html-community@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== + +ansi-html@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= @@ -14219,12 +14224,12 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@^3.11.2: - version "3.11.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" - integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== +webpack-dev-server@^3.11.3: + version "3.11.3" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz#8c86b9d2812bf135d3c9bce6f07b718e30f7c3d3" + integrity sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA== dependencies: - ansi-html "0.0.7" + ansi-html-community "0.0.8" bonjour "^3.5.0" chokidar "^2.1.8" compression "^1.7.4" From 7973f4bce2189c7d121802ab597cf6e97d5f3c24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 14:33:05 -0500 Subject: [PATCH 08/17] Bump @types/webpack from 4.41.31 to 4.41.32 (#4499) 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 401c5f7c35..96d99fa47c 100644 --- a/package.json +++ b/package.json @@ -314,7 +314,7 @@ "@types/triple-beam": "^1.3.2", "@types/url-parse": "^1.4.5", "@types/uuid": "^8.3.3", - "@types/webpack": "^4.41.31", + "@types/webpack": "^4.41.32", "@types/webpack-dev-server": "^3.11.6", "@types/webpack-env": "^1.16.3", "@types/webpack-node-externals": "^1.7.1", diff --git a/yarn.lock b/yarn.lock index dd8a009b30..0a0084cea4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1998,10 +1998,10 @@ "@types/source-list-map" "*" source-map "^0.7.3" -"@types/webpack@*", "@types/webpack@^4", "@types/webpack@^4.41.31", "@types/webpack@^4.41.8": - version "4.41.31" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa" - integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ== +"@types/webpack@*", "@types/webpack@^4", "@types/webpack@^4.41.32", "@types/webpack@^4.41.8": + version "4.41.32" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212" + integrity sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg== dependencies: "@types/node" "*" "@types/tapable" "^1" From 304941d397b27cd3c78dbf8fc64949d908829354 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 3 Dec 2021 15:19:01 -0500 Subject: [PATCH 09/17] Fix IngressApi being registered with a wrong new apiBase (#4485) --- src/common/k8s-api/__tests__/kube-api.test.ts | 100 +++++++++++++++++- src/common/k8s-api/kube-api-parse.ts | 19 ++-- src/common/k8s-api/kube-api.ts | 85 +++++++++------ .../+custom-resources/crd-resources.tsx | 4 +- .../components/+custom-resources/crd.store.ts | 17 ++- 5 files changed, 174 insertions(+), 51 deletions(-) diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts index 10fd82b696..322423d683 100644 --- a/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/src/common/k8s-api/__tests__/kube-api.test.ts @@ -26,6 +26,12 @@ import { KubeObject } from "../kube-object"; import AbortController from "abort-controller"; import { delay } from "../../utils/delay"; import { PassThrough } from "stream"; +import { ApiManager, apiManager } from "../api-manager"; +import { Ingress, Pod } from "../endpoints"; + +jest.mock("../api-manager"); + +const mockApiManager = apiManager as jest.Mocked; class TestKubeObject extends KubeObject { static kind = "Pod"; @@ -33,7 +39,11 @@ class TestKubeObject extends KubeObject { static apiBase = "/api/v1/pods"; } -class TestKubeApi extends KubeApi { } +class TestKubeApi extends KubeApi { + public async checkPreferredVersion() { + return super.checkPreferredVersion(); + } +} describe("forRemoteCluster", () => { it("builds api client for KubeObject", async () => { @@ -184,6 +194,94 @@ describe("KubeApi", () => { expect(kubeApi.apiGroup).toEqual("extensions"); }); + describe("checkPreferredVersion", () => { + it("registers with apiManager if checkPreferredVersion changes apiVersionPreferred", async () => { + expect.hasAssertions(); + + const api = new TestKubeApi({ + objectConstructor: Ingress, + checkPreferredVersion: true, + fallbackApiBases: ["/apis/extensions/v1beta1/ingresses"], + request: { + get: jest.fn() + .mockImplementationOnce((path: string) => { + expect(path).toBe("/apis/networking.k8s.io/v1"); + + throw new Error("no"); + }) + .mockImplementationOnce((path: string) => { + expect(path).toBe("/apis/extensions/v1beta1"); + + return { + resources: [ + { + name: "ingresses", + }, + ], + }; + }) + .mockImplementationOnce((path: string) => { + expect(path).toBe("/apis/extensions"); + + return { + preferredVersion: { + version: "v1beta1", + }, + }; + }), + } as any, + }); + + await api.checkPreferredVersion(); + + expect(api.apiVersionPreferred).toBe("v1beta1"); + expect(mockApiManager.registerApi).toBeCalledWith("/apis/extensions/v1beta1/ingresses", expect.anything()); + }); + + it("registers with apiManager if checkPreferredVersion changes apiVersionPreferred with non-grouped apis", async () => { + expect.hasAssertions(); + + const api = new TestKubeApi({ + objectConstructor: Pod, + checkPreferredVersion: true, + fallbackApiBases: ["/api/v1beta1/pods"], + request: { + get: jest.fn() + .mockImplementationOnce((path: string) => { + expect(path).toBe("/api/v1"); + + throw new Error("no"); + }) + .mockImplementationOnce((path: string) => { + expect(path).toBe("/api/v1beta1"); + + return { + resources: [ + { + name: "pods", + }, + ], + }; + }) + .mockImplementationOnce((path: string) => { + expect(path).toBe("/api"); + + return { + preferredVersion: { + version: "v1beta1", + }, + }; + }), + } as any, + }); + + await api.checkPreferredVersion(); + + expect(api.apiVersionPreferred).toBe("v1beta1"); + expect(mockApiManager.registerApi).toBeCalledWith("/api/v1beta1/pods", expect.anything()); + }); + }); + describe("patch", () => { let api: TestKubeApi; diff --git a/src/common/k8s-api/kube-api-parse.ts b/src/common/k8s-api/kube-api-parse.ts index 57c835ed6b..a5d137be02 100644 --- a/src/common/k8s-api/kube-api-parse.ts +++ b/src/common/k8s-api/kube-api-parse.ts @@ -37,7 +37,7 @@ export interface IKubeApiLinkRef { apiPrefix?: string; apiVersion: string; resource: string; - name: string; + name?: string; namespace?: string; } @@ -145,15 +145,18 @@ function _parseKubeApi(path: string): IKubeApiParsed { }; } -export function createKubeApiURL(ref: IKubeApiLinkRef): string { - const { apiPrefix = "/apis", resource, apiVersion, name } = ref; - let { namespace } = ref; +export function createKubeApiURL({ apiPrefix = "/apis", resource, apiVersion, name, namespace }: IKubeApiLinkRef): string { + const parts = [apiPrefix, apiVersion]; if (namespace) { - namespace = `namespaces/${namespace}`; + parts.push("namespaces", namespace); } - return [apiPrefix, apiVersion, namespace, resource, name] - .filter(v => v) - .join("/"); + parts.push(resource); + + if (name) { + parts.push(name); + } + + return parts.join("/"); } diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts index a8b19d81b5..0f31758ab2 100644 --- a/src/common/k8s-api/kube-api.ts +++ b/src/common/k8s-api/kube-api.ts @@ -38,9 +38,14 @@ import AbortController from "abort-controller"; import { Agent, AgentOptions } from "https"; import type { Patch } from "rfc6902"; +/** + * The options used for creating a `KubeApi` + */ export interface IKubeApiOptions { /** * base api-path for listing all resources, e.g. "/api/v1/pods" + * + * If not specified then will be the one on the `objectConstructor` */ apiBase?: string; @@ -52,11 +57,33 @@ export interface IKubeApiOptions { */ fallbackApiBases?: string[]; - objectConstructor: KubeObjectConstructor; - request?: KubeJsonApi; - isNamespaced?: boolean; - kind?: string; + /** + * If `true` then will check all declared apiBases against the kube api server + * for the first accepted one. + */ checkPreferredVersion?: boolean; + + /** + * The constructor for the kube objects returned from the API + */ + objectConstructor: KubeObjectConstructor; + + /** + * The api instance to use for making requests + * + * @default apiKube + */ + request?: KubeJsonApi; + + /** + * @deprecated should be specified by `objectConstructor` + */ + isNamespaced?: boolean; + + /** + * @deprecated should be specified by `objectConstructor` + */ + kind?: string; } export interface IKubeApiQueryParams { @@ -249,11 +276,11 @@ export interface DeleteResourceDescriptor extends ResourceDescriptor { export class KubeApi { readonly kind: string; - readonly apiBase: string; - readonly apiPrefix: string; - readonly apiGroup: string; readonly apiVersion: string; - readonly apiVersionPreferred?: string; + apiBase: string; + apiPrefix: string; + apiGroup: string; + apiVersionPreferred?: string; readonly apiResource: string; readonly isNamespaced: boolean; @@ -264,23 +291,18 @@ export class KubeApi { private watchId = 1; constructor(protected options: IKubeApiOptions) { - const { - objectConstructor, - request = apiKube, - kind = options.objectConstructor?.kind, - isNamespaced = options.objectConstructor?.namespaced, - } = options || {}; - + const { objectConstructor, request, kind, isNamespaced } = options; const { apiBase, apiPrefix, apiGroup, apiVersion, resource } = parseKubeApi(options.apiBase || objectConstructor.apiBase); - this.kind = kind; - this.isNamespaced = isNamespaced; + this.options = options; + this.kind = kind ?? objectConstructor.kind; + this.isNamespaced = isNamespaced ?? objectConstructor.namespaced ?? false; this.apiBase = apiBase; this.apiPrefix = apiPrefix; this.apiGroup = apiGroup; this.apiVersion = apiVersion; this.apiResource = resource; - this.request = request; + this.request = request ?? apiKube; this.objectConstructor = objectConstructor; this.parseResponse = this.parseResponse.bind(this); @@ -353,21 +375,16 @@ export class KubeApi { const { apiPrefix, apiGroup } = await this.getPreferredVersionPrefixGroup(); // The apiPrefix and apiGroup might change due to fallbackApiBases, so we must override them - Object.defineProperty(this, "apiPrefix", { - value: apiPrefix, - }); - Object.defineProperty(this, "apiGroup", { - value: apiGroup, - }); + this.apiPrefix = apiPrefix; + this.apiGroup = apiGroup; - const res = await this.request.get(`${this.apiPrefix}/${this.apiGroup}`); + const url = [apiPrefix, apiGroup].filter(Boolean).join("/"); + const res = await this.request.get(url); - Object.defineProperty(this, "apiVersionPreferred", { - value: res?.preferredVersion?.version ?? null, - }); + this.apiVersionPreferred = res?.preferredVersion?.version ?? null; if (this.apiVersionPreferred) { - Object.defineProperty(this, "apiBase", { value: this.getUrl() }); + this.apiBase = this.computeApiBase(); apiManager.registerApi(this.apiBase, this); } } @@ -385,7 +402,15 @@ export class KubeApi { return this.list(params, { limit: 1 }); } - getUrl({ name, namespace = "default" }: Partial = {}, query?: Partial) { + private computeApiBase(): string { + return createKubeApiURL({ + apiPrefix: this.apiPrefix, + apiVersion: this.apiVersionWithGroup, + resource: this.apiResource, + }); + } + + getUrl({ name, namespace }: Partial = {}, query?: Partial) { const resourcePath = createKubeApiURL({ apiPrefix: this.apiPrefix, apiVersion: this.apiVersionWithGroup, diff --git a/src/renderer/components/+custom-resources/crd-resources.tsx b/src/renderer/components/+custom-resources/crd-resources.tsx index d0eb4779c7..1c8f55aaab 100644 --- a/src/renderer/components/+custom-resources/crd-resources.tsx +++ b/src/renderer/components/+custom-resources/crd-resources.tsx @@ -57,9 +57,7 @@ export class CrdResources extends React.Component { } @computed get store() { - if (!this.crd) return null; - - return apiManager.getStore(this.crd.getResourceApiBase()); + return apiManager.getStore(this.crd?.getResourceApiBase()); } render() { diff --git a/src/renderer/components/+custom-resources/crd.store.ts b/src/renderer/components/+custom-resources/crd.store.ts index 83c8b5cdb6..2cdcbee55b 100644 --- a/src/renderer/components/+custom-resources/crd.store.ts +++ b/src/renderer/components/+custom-resources/crd.store.ts @@ -29,15 +29,14 @@ import { CRDResourceStore } from "./crd-resource.store"; import { KubeObject } from "../../../common/k8s-api/kube-object"; function initStore(crd: CustomResourceDefinition) { - const apiBase = crd.getResourceApiBase(); - const kind = crd.getResourceKind(); - const isNamespaced = crd.isNamespaced(); - const api = apiManager.getApi(apiBase) ?? new KubeApi({ - objectConstructor: KubeObject, - apiBase, - kind, - isNamespaced, - }); + const objectConstructor = class extends KubeObject { + static readonly kind = crd.getResourceKind(); + static readonly namespaced = crd.isNamespaced(); + static readonly apiBase = crd.getResourceApiBase(); + }; + + const api = apiManager.getApi(objectConstructor.apiBase) + ?? new KubeApi({ objectConstructor }); if (!apiManager.getStore(api)) { apiManager.registerStore(new CRDResourceStore(api)); From 7ed50f83fc547c8a0f421a3db7ba1d5616e0981a Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 6 Dec 2021 20:05:05 +0200 Subject: [PATCH 10/17] Add breadcrumbs to removal of kube objects, but also discuss about general improvements (#4282) Co-authored-by: Mikko Aspiala Co-authored-by: Janne Savolainen Co-authored-by: Janne Savolainen Co-authored-by: Mikko Aspiala --- .idea/jsLibraryMappings.xml | 6 + .idea/lens.iml | 1 + .idea/libraries/ogre_tools.xml | 16 + package.json | 12 +- .../confirm-dialog/confirm-dialog.tsx | 2 + src/renderer/components/dialog/dialog.tsx | 4 +- .../kube-object-menu.test.tsx.snap | 371 ++++++++++++++++++ .../dependencies/api-manager.injectable.ts | 32 ++ .../dependencies/cluster-name.injectable.ts | 41 ++ .../dependencies/cluster.injectable.ts | 33 ++ .../edit-resource-tab.injectable.ts | 31 ++ .../dependencies/hide-details.injectable.ts | 31 ++ .../get-kube-object-menu-items.ts | 43 ++ .../kube-object-menu-items.injectable.ts | 44 +++ .../kube-object-menu-registry.injectable.ts | 31 ++ .../components/kube-object-menu/index.ts | 3 +- .../kube-object-menu-container.tsx | 24 ++ .../kube-object-menu.injectable.tsx | 60 +++ .../kube-object-menu.test.tsx | 284 ++++++++++++++ .../kube-object-menu/kube-object-menu.tsx | 65 +-- src/renderer/components/menu/menu-actions.tsx | 52 ++- .../components/test-utils/renderFor.tsx | 42 ++ yarn.lock | 59 ++- 23 files changed, 1214 insertions(+), 73 deletions(-) create mode 100644 .idea/jsLibraryMappings.xml create mode 100644 .idea/libraries/ogre_tools.xml create mode 100644 src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap create mode 100644 src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/dependencies/cluster-name.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/dependencies/edit-resource-tab.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts create mode 100644 src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-registry.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-container.tsx create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu.test.tsx create mode 100644 src/renderer/components/test-utils/renderFor.tsx diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000000..0034429ff9 --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/lens.iml b/.idea/lens.iml index 079203f10b..fe491887dd 100644 --- a/.idea/lens.iml +++ b/.idea/lens.iml @@ -15,5 +15,6 @@ + \ No newline at end of file diff --git a/.idea/libraries/ogre_tools.xml b/.idea/libraries/ogre_tools.xml new file mode 100644 index 0000000000..6deeb167ce --- /dev/null +++ b/.idea/libraries/ogre_tools.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 96d99fa47c..5653d9c5b8 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,12 @@ "setupFiles": [ "/src/jest.setup.ts", "jest-canvas-mock" - ] + ], + "globals": { + "ts-jest": { + "isolatedModules": true + } + } }, "build": { "generateUpdatesFilesForAllChannels": true, @@ -193,8 +198,8 @@ "@kubernetes/client-node": "^0.16.1", "@sentry/electron": "^2.5.4", "@sentry/integrations": "^6.15.0", - "@ogre-tools/injectable": "^1.2.1", - "@ogre-tools/injectable-react": "^1.2.1", + "@ogre-tools/injectable": "^1.3.0", + "@ogre-tools/injectable-react": "^1.3.1", "abort-controller": "^3.0.0", "auto-bind": "^4.0.0", "autobind-decorator": "^2.4.0", @@ -260,6 +265,7 @@ "ws": "^7.5.5" }, "devDependencies": { + "@async-fn/jest": "^1.5.0", "@material-ui/core": "^4.12.3", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.60", diff --git a/src/renderer/components/confirm-dialog/confirm-dialog.tsx b/src/renderer/components/confirm-dialog/confirm-dialog.tsx index 3704dd96dc..e8450cc232 100644 --- a/src/renderer/components/confirm-dialog/confirm-dialog.tsx +++ b/src/renderer/components/confirm-dialog/confirm-dialog.tsx @@ -140,6 +140,7 @@ export class ConfirmDialog extends React.Component { isOpen={dialogState.isOpen} onClose={this.onClose} close={this.close} + {...(dialogState.isOpen ? { "data-testid":"confirmation-dialog" } : {})} >
{icon} {message} @@ -158,6 +159,7 @@ export class ConfirmDialog extends React.Component { label={labelOk} onClick={prevDefault(this.ok)} waiting={this.isSaving} + data-testid="confirm" {...okButtonProps} />
diff --git a/src/renderer/components/dialog/dialog.tsx b/src/renderer/components/dialog/dialog.tsx index be28789eff..83a49608cb 100644 --- a/src/renderer/components/dialog/dialog.tsx +++ b/src/renderer/components/dialog/dialog.tsx @@ -41,6 +41,7 @@ export interface DialogProps { modal?: boolean; pinned?: boolean; animated?: boolean; + "data-testid"?: string; } interface DialogState { @@ -149,7 +150,7 @@ export class Dialog extends React.PureComponent { }; render() { - const { modal, animated, pinned } = this.props; + const { modal, animated, pinned, "data-testid": testId } = this.props; let { className } = this.props; className = cssNames("Dialog flex center", className, { modal, pinned }); @@ -158,6 +159,7 @@ export class Dialog extends React.PureComponent { className={className} onClick={stopPropagation} ref={this.ref} + data-testid={testId} >
this.contentElem = e}> {this.props.children} diff --git a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap new file mode 100644 index 0000000000..c7b3a53142 --- /dev/null +++ b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap @@ -0,0 +1,371 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`kube-object-menu given kube object renders 1`] = ` + +
+
+
    +
  • + Some menu item +
    • +
  • + + + delete + +
    + + + Delete + +
    • +
+
+
+
+ + +`; + +exports[`kube-object-menu given kube object when removing kube object renders 1`] = ` + +
+
+
    +
  • + Some menu item +
    • +
  • + + + delete + +
    + + + Delete + +
    • +
+
+
+
+
+
+ + + warning + + + +
+

+ Remove + some-kind + + + some-namespace/some-name + + from + + Some name + + ? +

+
+
+
+ + +
+
+
+ + +`; + +exports[`kube-object-menu given kube object with namespace when removing kube object, renders confirmation dialog with namespace 1`] = ` + +
+
+
    +
  • + Some menu item +
    • +
  • + + + delete + +
    + + + Delete + +
    • +
+
+
+
+
+
+ + + warning + + + +
+

+ Remove + some-kind + + + some-namespace/some-name + + from + + Some name + + ? +

+
+
+
+ + +
+
+
+ + +`; + +exports[`kube-object-menu given kube object without namespace when removing kube object, renders confirmation dialog without namespace 1`] = ` + +
+
+
    +
  • + Some menu item +
    • +
  • + + + delete + +
    + + + Delete + +
    • +
+
+
+
+
+
+ + + warning + + + +
+

+ Remove + some-kind + + + some-name + + from + + Some name + + ? +

+
+
+
+ + +
+
+
+ + +`; + +exports[`kube-object-menu given no kube object, renders 1`] = ` + +
+
    +
+ +`; diff --git a/src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts new file mode 100644 index 0000000000..ecc4614788 --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import type { ApiManager } from "../../../../common/k8s-api/api-manager"; +import { apiManager } from "../../../../common/k8s-api/api-manager"; +import type { Injectable } from "@ogre-tools/injectable"; +import { lifecycleEnum } from "@ogre-tools/injectable"; + +const apiManagerInjectable: Injectable = { + getDependencies: () => ({}), + instantiate: () => apiManager, + lifecycle: lifecycleEnum.singleton, +}; + +export default apiManagerInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/cluster-name.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/cluster-name.injectable.ts new file mode 100644 index 0000000000..992ceb27be --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/cluster-name.injectable.ts @@ -0,0 +1,41 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import type { Injectable } from "@ogre-tools/injectable"; +import { lifecycleEnum } from "@ogre-tools/injectable"; +import type { Cluster } from "../../../../main/cluster"; +import clusterInjectable from "./cluster.injectable"; + +interface Dependencies { + cluster: Cluster; +} + +const clusterNameInjectable: Injectable = { + getDependencies: di => ({ + cluster: di.inject(clusterInjectable), + }), + + instantiate: ({ cluster }) => cluster?.name, + + lifecycle: lifecycleEnum.transient, +}; + +export default clusterNameInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts new file mode 100644 index 0000000000..17c4bab8d3 --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import { getActiveClusterEntity } from "../../../api/catalog-entity-registry"; + +import type { Injectable } from "@ogre-tools/injectable"; +import { lifecycleEnum } from "@ogre-tools/injectable"; +import type { Cluster } from "../../../../main/cluster"; + +const clusterInjectable: Injectable = { + getDependencies: () => ({}), + instantiate: () => getActiveClusterEntity(), + lifecycle: lifecycleEnum.transient, +}; + +export default clusterInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/edit-resource-tab.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/edit-resource-tab.injectable.ts new file mode 100644 index 0000000000..d11a4b95a6 --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/edit-resource-tab.injectable.ts @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import { editResourceTab } from "../../dock/edit-resource.store"; +import type { Injectable } from "@ogre-tools/injectable"; +import { lifecycleEnum } from "@ogre-tools/injectable"; + +const editResourceTabInjectable: Injectable = { + getDependencies: () => ({}), + instantiate: () => editResourceTab, + lifecycle: lifecycleEnum.singleton, +}; + +export default editResourceTabInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts new file mode 100644 index 0000000000..1f86eafc23 --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import { hideDetails } from "../../kube-detail-params"; +import type { Injectable } from "@ogre-tools/injectable"; +import { lifecycleEnum } from "@ogre-tools/injectable"; + +export const hideDetailsInjectable: Injectable = { + getDependencies: () => ({}), + instantiate: () => hideDetails, + lifecycle: lifecycleEnum.singleton, +}; + +export default hideDetailsInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts new file mode 100644 index 0000000000..f027b8667c --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import type { KubeObjectMenuRegistry } from "../../../../../extensions/registries"; +import type { KubeObject } from "../../../../../common/k8s-api/kube-object"; + +export interface Dependencies { + kubeObjectMenuRegistry: KubeObjectMenuRegistry; +} + +export interface InstantiationParameter { + kubeObject: KubeObject; +} + +export const getKubeObjectMenuItems = ( + { kubeObjectMenuRegistry }: Dependencies, + { kubeObject }: InstantiationParameter, +) => { + if (!kubeObject) { + return []; + } + + return kubeObjectMenuRegistry + .getItemsForKind(kubeObject.kind, kubeObject.apiVersion) + .map(item => item.components.MenuItem); +}; diff --git a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts new file mode 100644 index 0000000000..fd4b28c93d --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import { Injectable, lifecycleEnum } from "@ogre-tools/injectable"; +import kubeObjectMenuRegistryInjectable from "./kube-object-menu-registry.injectable"; + +import { + InstantiationParameter, + Dependencies, + getKubeObjectMenuItems, +} from "./get-kube-object-menu-items"; + +const kubeObjectMenuItemsInjectable: Injectable< + ReturnType, + Dependencies, + InstantiationParameter +> = { + getDependencies: di => ({ + kubeObjectMenuRegistry: di.inject(kubeObjectMenuRegistryInjectable), + }), + + instantiate: getKubeObjectMenuItems, + + lifecycle: lifecycleEnum.transient, +}; + +export default kubeObjectMenuItemsInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-registry.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-registry.injectable.ts new file mode 100644 index 0000000000..cb52cd7322 --- /dev/null +++ b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-registry.injectable.ts @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import { KubeObjectMenuRegistry } from "../../../../../extensions/registries"; +import type { Injectable } from "@ogre-tools/injectable"; +import { lifecycleEnum } from "@ogre-tools/injectable"; + +const kubeObjectMenuRegistryInjectable: Injectable = { + getDependencies: () => ({}), + instantiate: () => KubeObjectMenuRegistry.getInstance(), + lifecycle: lifecycleEnum.singleton, +}; + +export default kubeObjectMenuRegistryInjectable; diff --git a/src/renderer/components/kube-object-menu/index.ts b/src/renderer/components/kube-object-menu/index.ts index 43cd5ea4a0..2a9f7fb5c6 100644 --- a/src/renderer/components/kube-object-menu/index.ts +++ b/src/renderer/components/kube-object-menu/index.ts @@ -19,4 +19,5 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -export * from "./kube-object-menu"; +export type { KubeObjectMenuProps } from "./kube-object-menu"; +export { KubeObjectMenu } from "./kube-object-menu-container"; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-container.tsx b/src/renderer/components/kube-object-menu/kube-object-menu-container.tsx new file mode 100644 index 0000000000..9ac49a131e --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-container.tsx @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import { getInjectedComponent } from "@ogre-tools/injectable-react"; +import KubeObjectMenuInjectable from "./kube-object-menu.injectable"; + +export const KubeObjectMenu = getInjectedComponent(KubeObjectMenuInjectable); diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx new file mode 100644 index 0000000000..fdc7851854 --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import React from "react"; + +import { + KubeObjectMenu, + KubeObjectMenuDependencies, + KubeObjectMenuProps, +} from "./kube-object-menu"; + +import type { KubeObject } from "../../../common/k8s-api/kube-object"; +import { lifecycleEnum, Injectable } from "@ogre-tools/injectable"; +import apiManagerInjectable from "./dependencies/api-manager.injectable"; +import clusterNameInjectable from "./dependencies/cluster-name.injectable"; +import editResourceTabInjectable from "./dependencies/edit-resource-tab.injectable"; +import hideDetailsInjectable from "./dependencies/hide-details.injectable"; +import kubeObjectMenuItemsInjectable from "./dependencies/kube-object-menu-items/kube-object-menu-items.injectable"; + +const KubeObjectMenuInjectable: Injectable< + JSX.Element, + KubeObjectMenuDependencies, + KubeObjectMenuProps +> = { + getDependencies: (di, props) => ({ + clusterName: di.inject(clusterNameInjectable), + apiManager: di.inject(apiManagerInjectable), + editResourceTab: di.inject(editResourceTabInjectable), + hideDetails: di.inject(hideDetailsInjectable), + + kubeObjectMenuItems: di.inject(kubeObjectMenuItemsInjectable, { + kubeObject: props.object, + }), + }), + + instantiate: (dependencies, props) => ( + + ), + + lifecycle: lifecycleEnum.transient, +}; + +export default KubeObjectMenuInjectable; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx new file mode 100644 index 0000000000..d626065004 --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx @@ -0,0 +1,284 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +import React from "react"; +import { screen } from "@testing-library/react"; +import "@testing-library/jest-dom/extend-expect"; +import { KubeObject } from "../../../common/k8s-api/kube-object"; +import userEvent from "@testing-library/user-event"; +import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable"; +import type { KubeObjectMenuRegistration } from "../../../extensions/registries"; +import { KubeObjectMenuRegistry } from "../../../extensions/registries"; +import { ConfirmDialog } from "../confirm-dialog"; +import asyncFn, { AsyncFnMock } from "@async-fn/jest"; +import { getDiForUnitTesting } from "../getDiForUnitTesting"; + +import clusterInjectable from "./dependencies/cluster.injectable"; +import hideDetailsInjectable from "./dependencies/hide-details.injectable"; +import editResourceTabInjectable from "./dependencies/edit-resource-tab.injectable"; +import { TabKind } from "../dock/dock.store"; +import kubeObjectMenuRegistryInjectable from "./dependencies/kube-object-menu-items/kube-object-menu-registry.injectable"; +import { DiRender, renderFor } from "../test-utils/renderFor"; +import type { Cluster } from "../../../main/cluster"; +import type { ApiManager } from "../../../common/k8s-api/api-manager"; +import apiManagerInjectable from "./dependencies/api-manager.injectable"; +import { KubeObjectMenu } from "./index"; + +describe("kube-object-menu", () => { + let di: ConfigurableDependencyInjectionContainer; + let render: DiRender; + + beforeEach(() => { + di = getDiForUnitTesting(); + + // TODO: Remove global shared state + KubeObjectMenuRegistry.resetInstance(); + KubeObjectMenuRegistry.createInstance(); + + render = renderFor(di); + + di.override(clusterInjectable, { + name: "Some name", + } as Cluster); + + di.override(apiManagerInjectable, { + // eslint-disable-next-line unused-imports/no-unused-vars-ts + getStore: api => undefined, + } as ApiManager); + + di.override(hideDetailsInjectable, () => {}); + + di.override(editResourceTabInjectable, () => ({ + id: "irrelevant", + kind: TabKind.TERMINAL, + pinned: false, + title: "irrelevant", + })); + + addDynamicMenuItem({ + di, + apiVersions: ["some-api-version"], + kind: "some-kind", + }); + + addDynamicMenuItem({ + di, + apiVersions: ["some-unrelated-api-version"], + kind: "some-kind", + }); + + addDynamicMenuItem({ + di, + apiVersions: ["some-api-version"], + kind: "some-unrelated-kind", + }); + }); + + it("given no cluster, does not crash", () => { + di.override(clusterInjectable, null); + + expect(() => { + render(); + }).not.toThrow(); + }); + + it("given no kube object, renders", () => { + const { baseElement } = render( + , + ); + + expect(baseElement).toMatchSnapshot(); + }); + + describe("given kube object", () => { + let baseElement: Element; + let removeActionMock: AsyncFnMock; + + beforeEach(async () => { + const objectStub = KubeObject.create({ + apiVersion: "some-api-version", + kind: "some-kind", + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + namespace: "some-namespace", + }, + }); + + removeActionMock = asyncFn(); + + ({ baseElement } = render( +
+ + + +
, + )); + }); + + it("renders", () => { + expect(baseElement).toMatchSnapshot(); + }); + + it("does not open a confirmation dialog yet", () => { + expect(screen.queryByTestId("confirmation-dialog")).toBeNull(); + }); + + describe("when removing kube object", () => { + beforeEach(() => { + const menuItem = screen.getByTestId("menu-action-remove"); + + userEvent.click(menuItem); + }); + + it("renders", () => { + expect(baseElement).toMatchSnapshot(); + }); + + it("opens a confirmation dialog", () => { + screen.getByTestId("confirmation-dialog"); + }); + + describe("when remove is confirmed", () => { + beforeEach(() => { + const confirmRemovalButton = screen.getByTestId("confirm"); + + userEvent.click(confirmRemovalButton); + }); + + it("calls for removal of the kube object", () => { + expect(removeActionMock).toHaveBeenCalledWith(); + }); + + it("does not close the confirmation dialog yet", () => { + screen.getByTestId("confirmation-dialog"); + }); + + it("when removal resolves, closes the confirmation dialog", async () => { + await removeActionMock.resolve(); + + expect(screen.queryByTestId("confirmation-dialog")).toBeNull(); + }); + }); + }); + }); + + describe("given kube object with namespace", () => { + let baseElement: Element; + + beforeEach(async () => { + const objectStub = KubeObject.create({ + apiVersion: "some-api-version", + kind: "some-kind", + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + namespace: "some-namespace", + }, + }); + + ({ baseElement } = render( +
+ + + {}} + /> +
, + )); + }); + + it("when removing kube object, renders confirmation dialog with namespace", () => { + const menuItem = screen.getByTestId("menu-action-remove"); + + userEvent.click(menuItem); + + expect(baseElement).toMatchSnapshot(); + }); + }); + + describe("given kube object without namespace", () => { + let baseElement: Element; + + beforeEach(async () => { + const objectStub = KubeObject.create({ + apiVersion: "some-api-version", + kind: "some-kind", + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + namespace: undefined, + }, + }); + + ({ baseElement } = render( +
+ + + {}} + /> +
, + )); + }); + + it("when removing kube object, renders confirmation dialog without namespace", () => { + const menuItem = screen.getByTestId("menu-action-remove"); + + userEvent.click(menuItem); + + expect(baseElement).toMatchSnapshot(); + }); + }); +}); + +const addDynamicMenuItem = ({ + di, + apiVersions, + kind, +}: { + di: ConfigurableDependencyInjectionContainer; + apiVersions: string[]; + kind: string; +}) => { + const MenuItemComponent: React.FC = () =>
  • Some menu item
    • ; + + const dynamicMenuItemStub: KubeObjectMenuRegistration = { + apiVersions, + kind, + components: { MenuItem: MenuItemComponent }, + }; + + const kubeObjectMenuRegistry = di.inject(kubeObjectMenuRegistryInjectable); + + kubeObjectMenuRegistry.add(dynamicMenuItemStub); +}; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.tsx index 300ce67775..ed382956c2 100644 --- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx +++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx @@ -22,25 +22,37 @@ import React from "react"; import { boundMethod, cssNames } from "../../utils"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; -import { editResourceTab } from "../dock/edit-resource.store"; -import { MenuActions, MenuActionsProps } from "../menu/menu-actions"; -import { hideDetails } from "../kube-detail-params"; -import { apiManager } from "../../../common/k8s-api/api-manager"; -import { KubeObjectMenuRegistry } from "../../../extensions/registries/kube-object-menu-registry"; +import { MenuActions, MenuActionsProps } from "../menu"; +import identity from "lodash/identity"; +import type { ApiManager } from "../../../common/k8s-api/api-manager"; -export interface KubeObjectMenuProps extends MenuActionsProps { - object: T | null | undefined; +export interface KubeObjectMenuDependencies { + apiManager: ApiManager; + kubeObjectMenuItems: React.ElementType[]; + clusterName: string; + hideDetails: () => void; + editResourceTab: (kubeObject: TKubeObject) => void; +} + +export interface KubeObjectMenuProps extends MenuActionsProps { + object: TKubeObject | null | undefined; editable?: boolean; removable?: boolean; } -export class KubeObjectMenu extends React.Component> { +export interface KubeObjectMenuPropsAndDependencies + extends KubeObjectMenuProps, + KubeObjectMenuDependencies {} + +export class KubeObjectMenu< + TKubeObject extends KubeObject, +> extends React.Component> { get store() { const { object } = this.props; if (!object) return null; - return apiManager.getStore(object.selfLink); + return this.props.apiManager.getStore(object.selfLink); } get isEditable() { @@ -53,13 +65,13 @@ export class KubeObjectMenu extends React.Component extends React.ComponentRemove {object.kind} {object.getName()}?

    +

    + Remove {object.kind} {breadcrumb} from {this.props.clusterName}? +

    ); } getMenuItems(): React.ReactChild[] { const { object, toolbar } = this.props; - if (!object) { - return []; - } - - return KubeObjectMenuRegistry - .getInstance() - .getItemsForKind(object.kind, object.apiVersion) - .map(({ components: { MenuItem }}, index) => ( - - )); + return this.props.kubeObjectMenuItems.map((MenuItem, index) => ( + + )); } render() { diff --git a/src/renderer/components/menu/menu-actions.tsx b/src/renderer/components/menu/menu-actions.tsx index f02ce2f1e1..7c2ed5b7be 100644 --- a/src/renderer/components/menu/menu-actions.tsx +++ b/src/renderer/components/menu/menu-actions.tsx @@ -30,7 +30,6 @@ import { Icon, IconProps } from "../icon"; import { Menu, MenuItem, MenuProps } from "../menu"; import uniqueId from "lodash/uniqueId"; import isString from "lodash/isString"; -import { RenderDelay } from "../render-delay/render-delay"; export interface MenuActionsProps extends Partial { className?: string; @@ -125,32 +124,31 @@ export class MenuActions extends React.Component { return ( <> {this.renderTriggerIcon()} - - - {children} - {updateAction && ( - - - Edit - - )} - {removeAction && ( - - - Delete - - )} - - + + + {children} + {updateAction && ( + + + Edit + + )} + {removeAction && ( + + + Delete + + )} + ); } diff --git a/src/renderer/components/test-utils/renderFor.tsx b/src/renderer/components/test-utils/renderFor.tsx new file mode 100644 index 0000000000..d60032384d --- /dev/null +++ b/src/renderer/components/test-utils/renderFor.tsx @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2021 OpenLens Authors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +import React from "react"; + +import { + render as testingLibraryRender, + RenderResult, +} from "@testing-library/react"; + +import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable"; + +import { DiContextProvider } from "@ogre-tools/injectable-react"; + +export type DiRender = (ui: React.ReactElement) => RenderResult; + +type DiRenderFor = ( + di: ConfigurableDependencyInjectionContainer, +) => DiRender; + +export const renderFor: DiRenderFor = di => ui => + testingLibraryRender( + {ui}, + ); + diff --git a/yarn.lock b/yarn.lock index 0a0084cea4..ab16e72e6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,11 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== +"@async-fn/jest@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@async-fn/jest/-/jest-1.5.0.tgz#dda820de3e48eca6d5b17b00a01bdb060dfcc233" + integrity sha512-IeuTZj1TdoBS64fpNfHG9efw6dW3UQuIXfEv0qhxyNro3368kKz9E/eO46zvPmQBxbBCox3RCbKexAJH1WAY+Q== + "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" @@ -14,13 +19,20 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1", "@babel/code-frame@^7.10.4": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== dependencies: "@babel/highlight" "^7.14.5" +"@babel/code-frame@^7.8.3": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== + dependencies: + "@babel/highlight" "^7.16.0" + "@babel/core@^7.1.0", "@babel/core@^7.7.5": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a" @@ -148,6 +160,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== +"@babel/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== + "@babel/helpers@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973" @@ -175,6 +192,15 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== + dependencies: + "@babel/helper-validator-identifier" "^7.15.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@babel/parser@^7.1.0", "@babel/parser@^7.10.1", "@babel/parser@^7.10.2": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0" @@ -953,19 +979,19 @@ dependencies: lodash "^4.17.21" -"@ogre-tools/injectable-react@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-1.2.1.tgz#886fbb9f9816d68daf41b6fd7ff5def6eae833b4" - integrity sha512-kr9Q2T/VyhtUG8EbfzpFPk2ndwKQl9WHzqEfp8fasAXMNmUfUnyWs6iPNoJiuy2gh4/CNBvlFB8c647ls6/jUA== +"@ogre-tools/injectable-react@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-1.3.1.tgz#dec3829ac8cf295c32cfe636ca2cd39a495d56ce" + integrity sha512-5jHL9Zcb3QkrttdzqJpN6iCXaV2+fEuDNigwH6NJ3uyV1iQWuRIctnlXxfa9qtZESwaAz7o0hAwkyqEl7YSA4g== dependencies: "@ogre-tools/fp" "^1.0.2" - "@ogre-tools/injectable" "^1.2.1" + "@ogre-tools/injectable" "^1.3.0" lodash "^4.17.21" -"@ogre-tools/injectable@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-1.2.1.tgz#f3eb481806dd6e53af8d9d37f8b20f3c0d875a60" - integrity sha512-bfTlnT08uDydE0i5GxJ9SIoRKfNYVabQRrZfBraZi2rs3zx+DOpcZrJjhjDoSCzIr6C2azySuyxn1h8x8CMUPw== +"@ogre-tools/injectable@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-1.3.0.tgz#87d329a81575c9345b3af5c1afb0b45537f8f70e" + integrity sha512-rBy8HSExUy1r53ATvk823GXevwultKuSn3mmyRlIj7opJDVRp7Usx0bvOPs+X169jmAZNzsT6HBXbDLXt4Jl4A== dependencies: "@ogre-tools/fp" "^1.0.2" lodash "^4.17.21" @@ -1532,7 +1558,12 @@ "@types/parse5" "*" "@types/tough-cookie" "*" -"@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": +"@types/json-schema@^7.0.4": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": version "7.0.7" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== @@ -9244,9 +9275,9 @@ mem@^1.1.0: mimic-fn "^1.0.0" memfs@^3.1.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e" - integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q== + version "3.3.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.3.0.tgz#4da2d1fc40a04b170a56622c7164c6be2c4cbef2" + integrity sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg== dependencies: fs-monkey "1.0.3" From 0fb820994c6b20048e2fa96869a8d64c118d277d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 14:04:12 -0500 Subject: [PATCH 11/17] Bump xterm from 4.14.1 to 4.15.0 (#4510) 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 5653d9c5b8..b7326d5ca7 100644 --- a/package.json +++ b/package.json @@ -393,7 +393,7 @@ "webpack-cli": "^3.3.12", "webpack-dev-server": "^3.11.3", "webpack-node-externals": "^1.7.2", - "xterm": "^4.14.1", + "xterm": "^4.15.0", "xterm-addon-fit": "^0.5.0" } } diff --git a/yarn.lock b/yarn.lock index ab16e72e6b..0ce30c7201 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14629,10 +14629,10 @@ xterm-addon-fit@^0.5.0: resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== -xterm@^4.14.1: - version "4.14.1" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.1.tgz#6884cb8fb3b83353b1a98139ea23daedf8e35796" - integrity sha512-jgzNg5BuGPwq5/M4dGnmbghZvHx2jaj+9crSEt15bV34Za49VziBmCu7zIy88zUKKiGTxeo7aVzirFSJArIMFw== +xterm@^4.15.0: + version "4.15.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.15.0.tgz#e52038507eba7e0d36d47f81e29fe548c82b9561" + integrity sha512-Ik1GoSq1yqKZQ2LF37RPS01kX9t4TP8gpamUYblD09yvWX5mEYuMK4CcqH6+plgiNEZduhTz/UrcaWs97gOlOw== y18n@^3.2.1: version "3.2.2" From 2622692a26167c11a74453b21d65f25d42da26c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 14:05:09 -0500 Subject: [PATCH 12/17] Bump sass from 1.43.4 to 1.44.0 (#4507) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b7326d5ca7..461a2785c0 100644 --- a/package.json +++ b/package.json @@ -373,7 +373,7 @@ "react-select-event": "^5.1.0", "react-table": "^7.7.0", "react-window": "^1.8.6", - "sass": "^1.43.4", + "sass": "^1.44.0", "sass-loader": "^8.0.2", "sharp": "^0.29.3", "style-loader": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 0ce30c7201..85e656ac0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7189,6 +7189,11 @@ immer@^9.0.6: resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73" integrity sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ== +immutable@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" + integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== + import-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" @@ -12207,12 +12212,13 @@ sass-loader@^8.0.2: schema-utils "^2.6.1" semver "^6.3.0" -sass@^1.32.13, sass@^1.43.4: - version "1.43.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.43.4.tgz#68c7d6a1b004bef49af0d9caf750e9b252105d1f" - integrity sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg== +sass@^1.32.13, sass@^1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.44.0.tgz#619aa0a2275c097f9af5e6b8fe8a95e3056430fb" + integrity sha512-0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw== dependencies: chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" sax@^1.2.4, sax@~1.2.4: version "1.2.4" From 09a459587780f0ab9a1fc43e6f8362af7b216685 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 18:24:54 -0500 Subject: [PATCH 13/17] Bump playwright from 1.15.2 to 1.17.1 (#4508) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 45 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 461a2785c0..f81e2788f0 100644 --- a/package.json +++ b/package.json @@ -359,7 +359,7 @@ "node-gyp": "7.1.2", "node-loader": "^1.0.3", "nodemon": "^2.0.14", - "playwright": "^1.15.2", + "playwright": "^1.17.1", "postcss": "^8.3.11", "postcss-loader": "4.3.0", "postinstall-postinstall": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index 85e656ac0e..db365fd6df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2393,7 +2393,7 @@ agent-base@4, agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" -agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -3915,11 +3915,16 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^6.0.0, commander@^6.1.0: +commander@^6.0.0: version "6.2.1" resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== +commander@^8.2.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -10902,12 +10907,12 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -playwright@^1.15.2: - version "1.15.2" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.15.2.tgz#b350056d1fffbe5de5b1bdaca6ab73e35758baad" - integrity sha512-+Z+7ckihyxR6rK5q8DWC6eUbKARfXpyxpjNcoJfgwSr64lAOzjhyFQiPC/JkdIqhsLgZjxpWfl1S7fLb+wPkgA== +playwright-core@=1.17.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.17.1.tgz#a16e0f89284a0ed8ae6d77e1c905c84b8a2ba022" + integrity sha512-C3c8RpPiC3qr15fRDN6dx6WnUkPLFmST37gms2aoHPDRvp7EaGDPMMZPpqIm/QWB5J40xDrQCD4YYHz2nBTojQ== dependencies: - commander "^6.1.0" + commander "^8.2.0" debug "^4.1.1" extract-zip "^2.0.1" https-proxy-agent "^5.0.0" @@ -10918,10 +10923,19 @@ playwright@^1.15.2: proper-lockfile "^4.1.1" proxy-from-env "^1.1.0" rimraf "^3.0.2" + socks-proxy-agent "^6.1.0" stack-utils "^2.0.3" ws "^7.4.6" + yauzl "^2.10.0" yazl "^2.5.1" +playwright@^1.17.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.17.1.tgz#a6d63302ee40f41283c4bf869de261c4743a787c" + integrity sha512-DisCkW9MblDJNS3rG61p8LiLA2WA7IY/4A4W7DX4BphWe/HuWjKmGQptuk4NVIh5UuSwXpW/jaH2+ZgjHs3GMA== + dependencies: + playwright-core "=1.17.1" + plist@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" @@ -12637,6 +12651,23 @@ socks-proxy-agent@^4.0.0: agent-base "~4.2.1" socks "~2.3.2" +socks-proxy-agent@^6.1.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87" + integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew== + dependencies: + agent-base "^6.0.2" + debug "^4.3.1" + socks "^2.6.1" + +socks@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" + integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + socks@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" From 7965649521609336cb66f80491d388b72e27f312 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 18:25:15 -0500 Subject: [PATCH 14/17] Bump @types/js-yaml from 4.0.4 to 4.0.5 (#4509) 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 f81e2788f0..a5db133e96 100644 --- a/package.json +++ b/package.json @@ -286,7 +286,7 @@ "@types/html-webpack-plugin": "^3.2.6", "@types/http-proxy": "^1.17.7", "@types/jest": "^26.0.24", - "@types/js-yaml": "^4.0.4", + "@types/js-yaml": "^4.0.5", "@types/jsdom": "^16.2.13", "@types/jsonpath": "^0.2.0", "@types/lodash": "^4.14.177", diff --git a/yarn.lock b/yarn.lock index db365fd6df..fe53a30161 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1544,10 +1544,10 @@ jest-diff "^26.0.0" pretty-format "^26.0.0" -"@types/js-yaml@^4.0.1", "@types/js-yaml@^4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.4.tgz#cc38781257612581a1a0eb25f1709d2b06812fce" - integrity sha512-AuHubXUmg0AzkXH0Mx6sIxeY/1C110mm/EkE/gB1sTRz3h2dao2W/63q42SlVST+lICxz5Oki2hzYA6+KnnieQ== +"@types/js-yaml@^4.0.1", "@types/js-yaml@^4.0.5": + version "4.0.5" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138" + integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA== "@types/jsdom@^16.2.13": version "16.2.13" From 16a26724d94c05bb9062cf06d69e62213263abdd Mon Sep 17 00:00:00 2001 From: Mario Sarcher Date: Wed, 8 Dec 2021 08:12:29 +0100 Subject: [PATCH 15/17] Fixes a typo in kubeconfig sync "add"-button label (#4522) Signed-off-by: Mario Sarcher --- src/renderer/initializers/catalog-category-registry.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/initializers/catalog-category-registry.tsx b/src/renderer/initializers/catalog-category-registry.tsx index 0c1fd6b9b3..294c5883fa 100644 --- a/src/renderer/initializers/catalog-category-registry.tsx +++ b/src/renderer/initializers/catalog-category-registry.tsx @@ -61,11 +61,11 @@ export function initCatalogCategoryRegistryEntries() { ctx.menuItems.push( { icon: "create_new_folder", - title: "Sync kubeconfig folders(s)", + title: "Sync kubeconfig folder(s)", defaultAction: true, onClick: async () => { await PathPicker.pick({ - label: "Sync folders(s)", + label: "Sync folder(s)", buttonLabel: "Sync", properties: ["showHiddenFiles", "multiSelections", "openDirectory"], onPick: addSyncEntries, From 889a4d5080d874cad5daf342f75a36d01075cd2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:55:14 +0300 Subject: [PATCH 16/17] Bump @testing-library/jest-dom from 5.15.0 to 5.16.1 (#4516) Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.15.0 to 5.16.1. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.0...v5.16.1) --- updated-dependencies: - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a5db133e96..6583d849b1 100644 --- a/package.json +++ b/package.json @@ -271,7 +271,7 @@ "@material-ui/lab": "^4.0.0-alpha.60", "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3", "@sentry/types": "^6.14.1", - "@testing-library/jest-dom": "^5.15.0", + "@testing-library/jest-dom": "^5.16.1", "@testing-library/react": "^11.2.7", "@testing-library/user-event": "^13.5.0", "@types/byline": "^4.2.33", diff --git a/yarn.lock b/yarn.lock index fe53a30161..410f77fe9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1210,14 +1210,14 @@ lz-string "^1.4.4" pretty-format "^26.6.2" -"@testing-library/jest-dom@^5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.15.0.tgz#4f5295dbc476a14aec3b07176434b3d51aae5da7" - integrity sha512-lOMuQidnL1tWHLEWIhL6UvSZC1Qt3OkNe1khvi2h6xFiqpe5O8arYs46OU0qyUGq0cSTbroQyMktYNXu3a7sAA== +"@testing-library/jest-dom@^5.16.1": + version "5.16.1" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.1.tgz#3db7df5ae97596264a7da9696fe14695ba02e51f" + integrity sha512-ajUJdfDIuTCadB79ukO+0l8O+QwN0LiSxDaYUTI4LndbbUsGi6rWU1SCexXzBA2NSjlVB9/vbkasQIL3tmPBjw== dependencies: "@babel/runtime" "^7.9.2" "@types/testing-library__jest-dom" "^5.9.1" - aria-query "^4.2.2" + aria-query "^5.0.0" chalk "^3.0.0" css "^3.0.0" css.escape "^1.5.1" @@ -2653,6 +2653,11 @@ aria-query@^4.2.2: "@babel/runtime" "^7.10.2" "@babel/runtime-corejs3" "^7.10.2" +aria-query@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c" + integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg== + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" From 25f4a1f3ba6da9bd845cdb05516e9159ced89b98 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 9 Dec 2021 06:35:49 -0500 Subject: [PATCH 17/17] Upgrade mock-fs to v5 (#4537) Signed-off-by: Sebastian Malton --- package.json | 6 +++--- yarn.lock | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 6583d849b1..f062889b35 100644 --- a/package.json +++ b/package.json @@ -196,10 +196,10 @@ "@hapi/call": "^8.0.1", "@hapi/subtext": "^7.0.3", "@kubernetes/client-node": "^0.16.1", - "@sentry/electron": "^2.5.4", - "@sentry/integrations": "^6.15.0", "@ogre-tools/injectable": "^1.3.0", "@ogre-tools/injectable-react": "^1.3.1", + "@sentry/electron": "^2.5.4", + "@sentry/integrations": "^6.15.0", "abort-controller": "^3.0.0", "auto-bind": "^4.0.0", "autobind-decorator": "^2.4.0", @@ -230,7 +230,7 @@ "mobx": "^6.3.7", "mobx-observable-history": "^2.0.3", "mobx-react": "^7.2.1", - "mock-fs": "^4.14.0", + "mock-fs": "^5.1.2", "moment": "^2.29.1", "moment-timezone": "^0.5.34", "monaco-editor": "^0.29.1", diff --git a/yarn.lock b/yarn.lock index 410f77fe9d..bab3877a8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9578,10 +9578,10 @@ mobx@^6.3.7: resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.3.7.tgz#9ed85561e86da45141134c8fa20cf5f9c7246c3d" integrity sha512-X7yU7eOEyxIBk4gjIi2UIilwdw48gXh0kcZ5ex3Rc+COJsJmJ4SNpf42uYea3aUqb1hedTv5xzJrq5Q55p0P5g== -mock-fs@^4.14.0: - version "4.14.0" - resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18" - integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw== +mock-fs@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.1.2.tgz#6fa486e06d00f8793a8d2228de980eff93ce6db7" + integrity sha512-YkjQkdLulFrz0vD4BfNQdQRVmgycXTV7ykuHMlyv+C8WCHazpkiQRDthwa02kSyo8wKnY9wRptHfQLgmf0eR+A== modern-normalize@^1.1.0: version "1.1.0"