diff --git a/package.json b/package.json index da92586376..4400cf8d72 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ } }, "dependencies": { - "@hapi/call": "^8.0.0", + "@hapi/call": "^8.0.1", "@hapi/subtext": "^7.0.3", "@kubernetes/client-node": "^0.12.0", "abort-controller": "^3.0.0", @@ -356,7 +356,7 @@ "sass-loader": "^8.0.2", "sharp": "^0.26.1", "spectron": "11.0.0", - "style-loader": "^1.2.1", + "style-loader": "^2.0.0", "tailwindcss": "^2.1.2", "ts-jest": "26.3.0", "ts-loader": "^7.0.5", diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts index ff7d720b02..6a4af088e8 100644 --- a/src/extensions/extension-loader.ts +++ b/src/extensions/extension-loader.ts @@ -280,6 +280,7 @@ export class ExtensionLoader extends Singleton { registries.kubeObjectMenuRegistry.add(extension.kubeObjectMenuItems), registries.kubeObjectDetailRegistry.add(extension.kubeObjectDetailItems), registries.kubeObjectStatusRegistry.add(extension.kubeObjectStatusTexts), + registries.workloadsOverviewDetailRegistry.add(extension.kubeWorkloadsOverviewItems), registries.commandRegistry.add(extension.commands), ]; diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts index 0dcbad88cd..fb26d383b0 100644 --- a/src/extensions/lens-renderer-extension.ts +++ b/src/extensions/lens-renderer-extension.ts @@ -21,7 +21,7 @@ import type { AppPreferenceRegistration, CatalogEntityDetailRegistration, ClusterPageMenuRegistration, KubeObjectDetailRegistration, KubeObjectMenuRegistration, - KubeObjectStatusRegistration, PageMenuRegistration, PageRegistration, StatusBarRegistration, WelcomeMenuRegistration, + KubeObjectStatusRegistration, PageMenuRegistration, PageRegistration, StatusBarRegistration, WelcomeMenuRegistration, WorkloadsOverviewDetailRegistration, } from "./registries"; import type { Cluster } from "../main/cluster"; import { LensExtension } from "./lens-extension"; @@ -40,6 +40,7 @@ export class LensRendererExtension extends LensExtension { statusBarItems: StatusBarRegistration[] = []; kubeObjectDetailItems: KubeObjectDetailRegistration[] = []; kubeObjectMenuItems: KubeObjectMenuRegistration[] = []; + kubeWorkloadsOverviewItems: WorkloadsOverviewDetailRegistration[] = []; commands: CommandRegistration[] = []; welcomeMenus: WelcomeMenuRegistration[] = []; catalogEntityDetailItems: CatalogEntityDetailRegistration[] = []; diff --git a/src/extensions/registries/index.ts b/src/extensions/registries/index.ts index ec23601016..b9ba986521 100644 --- a/src/extensions/registries/index.ts +++ b/src/extensions/registries/index.ts @@ -34,3 +34,4 @@ export * from "./entity-setting-registry"; export * from "./welcome-menu-registry"; export * from "./protocol-handler-registry"; export * from "./catalog-entity-detail-registry"; +export * from "./workloads-overview-detail-registry"; diff --git a/src/extensions/registries/workloads-overview-detail-registry.ts b/src/extensions/registries/workloads-overview-detail-registry.ts new file mode 100644 index 0000000000..8ad2a10e19 --- /dev/null +++ b/src/extensions/registries/workloads-overview-detail-registry.ts @@ -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 type React from "react"; +import { BaseRegistry } from "./base-registry"; + +export interface WorkloadsOverviewDetailComponents { + Details: React.ComponentType; +} + +export interface WorkloadsOverviewDetailRegistration { + components: WorkloadsOverviewDetailComponents; + priority?: number; +} + +export class WorkloadsOverviewDetailRegistry extends BaseRegistry { + getItems() { + const items = super.getItems(); + + return items.sort((a, b) => (b.priority ?? 50) - (a.priority ?? 50)); + } +} + +export const workloadsOverviewDetailRegistry = new WorkloadsOverviewDetailRegistry(); diff --git a/src/renderer/components/+apps-releases/release-rollback-dialog.tsx b/src/renderer/components/+apps-releases/release-rollback-dialog.tsx index d8ca8c390a..e42813f1f9 100644 --- a/src/renderer/components/+apps-releases/release-rollback-dialog.tsx +++ b/src/renderer/components/+apps-releases/release-rollback-dialog.tsx @@ -66,10 +66,8 @@ export class ReleaseRollbackDialog extends React.Component { onOpen = async () => { this.isLoading = true; - const currentRevision = this.release.getRevision(); let releases = await getReleaseHistory(this.release.getName(), this.release.getNs()); - releases = releases.filter(item => item.revision !== currentRevision); // remove current releases = orderBy(releases, "revision", "desc"); // sort this.revisions.replace(releases); this.revision = this.revisions[0]; diff --git a/src/renderer/components/+workloads-overview/overview.tsx b/src/renderer/components/+workloads-overview/overview.tsx index 82c3549fb1..24331d63a7 100644 --- a/src/renderer/components/+workloads-overview/overview.tsx +++ b/src/renderer/components/+workloads-overview/overview.tsx @@ -38,6 +38,7 @@ import { Events } from "../+events"; import { isAllowedResource } from "../../../common/rbac"; import { kubeWatchApi } from "../../api/kube-watch-api"; import { clusterContext } from "../context"; +import { workloadsOverviewDetailRegistry } from "../../../extensions/registries"; interface Props extends RouteComponentProps { } @@ -57,11 +58,34 @@ export class WorkloadsOverview extends React.Component { } render() { + const items = workloadsOverviewDetailRegistry.getItems().map((item, index) => { + return ( + + ); + }); + return (
- - {isAllowedResource("events") && } + {items}
); } } + +workloadsOverviewDetailRegistry.add([ + { + components: { + Details: (props: any) => , + } + }, + { + priority: 5, + components: { + Details: () => { + return ( + isAllowedResource("events") && + ); + } + } + } +]); diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index 67f0088e69..fc9ba90807 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -66,6 +66,10 @@ export class ClusterView extends React.Component { this.bindEvents(); } + componentWillUnmount() { + refreshViews(); + } + bindEvents() { disposeOnUnmount(this, [ reaction(() => this.clusterId, async (clusterId) => { @@ -81,7 +85,6 @@ export class ClusterView extends React.Component { const disconnected = values[1]; if (hasLoadedView(this.clusterId) && disconnected) { - refreshViews(); navigate(catalogURL()); // redirect to catalog when active cluster get disconnected/not available } }), diff --git a/src/renderer/components/dock/log-list.tsx b/src/renderer/components/dock/log-list.tsx index 3c4276e4ef..9437a854e2 100644 --- a/src/renderer/components/dock/log-list.tsx +++ b/src/renderer/components/dock/log-list.tsx @@ -106,7 +106,7 @@ export class LogList extends React.Component { */ @computed get logs() { - const showTimestamps = logTabStore.getData(this.props.id).showTimestamps; + const showTimestamps = logTabStore.getData(this.props.id)?.showTimestamps; if (!showTimestamps) { return logStore.logsWithoutTimestamps; diff --git a/yarn.lock b/yarn.lock index ea37a2b1ea..4526d78f67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -456,13 +456,6 @@ dependencies: purgecss "^3.1.3" -"@hapi/address@4.x.x": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz#267301ddf7bc453718377a6fb3832a2f04a721dd" - integrity sha512-0oEP5UiyV4f3d6cBL8F3Z5S7iWSX39Knnl0lY8i+6gfmmIBj44JCBNtcMgwyS+5v7j3VYavNay0NFHDS+UGQcw== - dependencies: - "@hapi/hoek" "^9.0.0" - "@hapi/b64@5.x.x": version "5.0.0" resolved "https://registry.yarnpkg.com/@hapi/b64/-/b64-5.0.0.tgz#b8210cbd72f4774985e78569b77e97498d24277d" @@ -482,12 +475,11 @@ resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.0.0.tgz#5bb2193eb685c0007540ca61d166d4e1edaf918d" integrity sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg== -"@hapi/call@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@hapi/call/-/call-8.0.0.tgz#a5e456b611d848cf5a12662ef120da886041c54d" - integrity sha512-4xHIWWqaIDQlVU88XAnomACSoC7iWUfaLfdu2T7I0y+HFFwZUrKKGfwn6ik4kwKsJRMnOliG3UXsF8V/94+Lkg== +"@hapi/call@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@hapi/call/-/call-8.0.1.tgz#9e64cd8ba6128eb5be6e432caaa572b1ed8cd7c0" + integrity sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g== dependencies: - "@hapi/address" "4.x.x" "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" @@ -13746,13 +13738,13 @@ strip-outer@^1.0.1: dependencies: escape-string-regexp "^1.0.2" -style-loader@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e" - integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q== +style-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c" + integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ== dependencies: loader-utils "^2.0.0" - schema-utils "^2.7.0" + schema-utils "^3.0.0" stylus@^0.54.7: version "0.54.8"