From 7ed50f83fc547c8a0f421a3db7ba1d5616e0981a Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 6 Dec 2021 20:05:05 +0200 Subject: [PATCH] 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"