From 718834212ea708d375376cc74be6b506af352350 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 24 Oct 2022 07:49:14 -0400 Subject: [PATCH] Support Events on CustomResourece details panel Signed-off-by: Sebastian Malton --- .../+config-autoscalers/hpa-details.tsx | 3 - .../crd-resource-details.tsx | 4 +- .../+custom-resources/definition.store.ts | 2 +- .../+workloads-cronjobs/cronjob-details.tsx | 2 - ...rrent-kube-object-in-details.injectable.ts | 27 +-- ...custom-resource-detail-item.injectable.tsx | 37 ++++ ...fault-kube-meta-details-item.injectable.ts | 20 +++ ...ter-role-binding-detail-item.injectable.ts | 2 +- .../cluster-role-detail-item.injectable.ts | 2 +- .../config-map-detail-item.injectable.ts | 2 +- .../cron-job-detail-item.injectable.ts | 2 +- ...urce-definitions-detail-item.injectable.ts | 2 +- .../daemon-set-detail-item.injectable.ts | 2 +- .../deployment-detail-item.injectable.ts | 2 +- .../endpoints-detail-item.injectable.ts | 2 +- .../events-detail-item.injectable.ts | 2 +- ...l-pod-autoscaler-detail-item.injectable.ts | 2 +- .../ingress-detail-item.injectable.ts | 2 +- .../job-detail-item.injectable.ts | 2 +- .../kube-event-detail-item.injectable.ts | 72 +------- .../lease-detail-item.injectable.ts | 2 +- .../limit-range-detail-item.injectable.ts | 2 +- .../namespaces-detail-item.injectable.ts | 2 +- .../network-policy-detail-item.injectable.ts | 2 +- .../node-detail-item.injectable.ts | 2 +- ...ent-volume-claim-detail-item.injectable.ts | 2 +- ...ersistent-volume-detail-item.injectable.ts | 2 +- .../pod-detail-item.injectable.ts | 2 +- ...isruption-budget-detail-item.injectable.ts | 2 +- ...-security-policy-detail-item.injectable.ts | 2 +- .../priority-class-detail-item.injectable.ts | 2 +- .../replica-set-detail-item.injectable.ts | 2 +- .../resource-quota-detail-item.injectable.ts | 2 +- .../role-binding-detail-item.injectable.ts | 2 +- .../role-detail-item.injectable.ts | 2 +- .../runtime-class-detail-item.injectable.ts | 2 +- .../secrets-detail-item.injectable.ts | 2 +- .../service-account-detail-item.injectable.ts | 2 +- .../service-detail-item.injectable.ts | 2 +- .../stateful-set-detail-item.injectable.ts | 2 +- .../storage-class-detail-item.injectable.ts | 2 +- ...ject-detail-item-registrator.injectable.ts | 2 +- .../kube-object-details.tsx | 162 +++++------------- 43 files changed, 156 insertions(+), 241 deletions(-) create mode 100644 src/renderer/components/kube-object-details/custom-resource-detail-item.injectable.tsx create mode 100644 src/renderer/components/kube-object-details/default-kube-meta-details-item.injectable.ts diff --git a/src/renderer/components/+config-autoscalers/hpa-details.tsx b/src/renderer/components/+config-autoscalers/hpa-details.tsx index 887280d298..ab7ea2c726 100644 --- a/src/renderer/components/+config-autoscalers/hpa-details.tsx +++ b/src/renderer/components/+config-autoscalers/hpa-details.tsx @@ -16,7 +16,6 @@ import type { HorizontalPodAutoscalerMetricSpec, HorizontalPodAutoscalerMetricTa import { HorizontalPodAutoscaler, HpaMetricType } from "../../../common/k8s-api/endpoints/horizontal-pod-autoscaler.api"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; -import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -121,8 +120,6 @@ class NonInjectedHpaDetails extends React.Component - - {scaleTargetRef && ( diff --git a/src/renderer/components/+custom-resources/crd-resource-details.tsx b/src/renderer/components/+custom-resources/crd-resource-details.tsx index 3bd1e821fa..01f8b3a175 100644 --- a/src/renderer/components/+custom-resources/crd-resource-details.tsx +++ b/src/renderer/components/+custom-resources/crd-resource-details.tsx @@ -11,7 +11,6 @@ import { cssNames } from "../../utils"; import { Badge } from "../badge"; import { DrawerItem } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import { KubeObjectMeta } from "../kube-object-meta"; import { Input } from "../input"; import type { AdditionalPrinterColumnsV1 } from "../../../common/k8s-api/endpoints/custom-resource-definition.api"; import { CustomResourceDefinition } from "../../../common/k8s-api/endpoints/custom-resource-definition.api"; @@ -21,7 +20,7 @@ import { KubeObject } from "../../../common/k8s-api/kube-object"; import logger from "../../../common/logger"; export interface CustomResourceDetailsProps extends KubeObjectDetailsProps { - crd: CustomResourceDefinition; + crd?: CustomResourceDefinition; } function convertSpecValue(value: unknown): React.ReactNode { @@ -129,7 +128,6 @@ export class CustomResourceDetails extends React.Component - {this.renderAdditionalColumns(object, extraColumns)} {this.renderStatus(object, extraColumns)} diff --git a/src/renderer/components/+custom-resources/definition.store.ts b/src/renderer/components/+custom-resources/definition.store.ts index 6a4b88a70e..f58cb24fa0 100644 --- a/src/renderer/components/+custom-resources/definition.store.ts +++ b/src/renderer/components/+custom-resources/definition.store.ts @@ -58,7 +58,7 @@ export class CustomResourceDefinitionStore extends KubeObjectStore ( diff --git a/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx b/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx index 4b1d188d48..4701869ab6 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx +++ b/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx @@ -17,7 +17,6 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { getDetailsUrl } from "../kube-detail-params"; import type { Job } from "../../../common/k8s-api/endpoints"; import { CronJob } from "../../../common/k8s-api/endpoints"; -import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; @@ -61,7 +60,6 @@ class NonInjectedCronJobDetails extends React.Component - { cronJob.isNeverRun() diff --git a/src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts b/src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts index 3727c90395..72f534d4ae 100644 --- a/src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts +++ b/src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts @@ -3,10 +3,15 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { computed } from "mobx"; import kubeDetailsUrlParamInjectable from "../kube-detail-params/kube-details-url.injectable"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { asyncComputed } from "@ogre-tools/injectable-react"; +import type { KubeObject } from "../../../common/k8s-api/kube-object"; + +export type CurrentKubeObject = + | undefined + | { object: KubeObject; error?: undefined } + | { object?: undefined; error: string }; const currentKubeObjectInDetailsInjectable = getInjectable({ id: "current-kube-object-in-details", @@ -14,19 +19,21 @@ const currentKubeObjectInDetailsInjectable = getInjectable({ instantiate: (di) => { const urlParam = di.inject(kubeDetailsUrlParamInjectable); const apiManager = di.inject(apiManagerInjectable); - const logger = di.inject(loggerInjectable); - return computed(() => { + return asyncComputed(async (): Promise => { const path = urlParam.get(); + const store = apiManager.getStore(path); + + if (!store) { + return undefined; + } try { - return apiManager.getStore(path)?.getByPath(path); - } catch (error) { - logger.error( - `[KUBE-OBJECT-DETAILS]: failed to get store or object ${path}: ${error}`, - ); + const object = await store.loadFromPath(path); - return undefined; + return { object }; + } catch (error) { + return { error: String(error) }; } }); }, diff --git a/src/renderer/components/kube-object-details/custom-resource-detail-item.injectable.tsx b/src/renderer/components/kube-object-details/custom-resource-detail-item.injectable.tsx new file mode 100644 index 0000000000..62b469d5de --- /dev/null +++ b/src/renderer/components/kube-object-details/custom-resource-detail-item.injectable.tsx @@ -0,0 +1,37 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import React from "react"; +import { CustomResourceDetails } from "../+custom-resources"; +import customResourceDefinitionStoreInjectable from "../+custom-resources/definition.store.injectable"; +import currentKubeObjectInDetailsInjectable from "./current-kube-object-in-details.injectable"; +import { kubeObjectDetailItemInjectionToken } from "./kube-object-detail-items/kube-object-detail-item-injection-token"; + +const customResourceDetailItemInjectable = getInjectable({ + id: "custom-resource-detail-item", + instantiate: (di) => { + const customResourceDefinitionStore = di.inject(customResourceDefinitionStoreInjectable); + const currentKubeObjectInDetails = di.inject(currentKubeObjectInDetailsInjectable); + const currentCustomResourceDefinition = computed(() => { + const { object } = currentKubeObjectInDetails.value.get() ?? {}; + + if (!object) { + return undefined; + } + + return customResourceDefinitionStore.getByObject(object); + }); + + return { + Component: ({ object }) => , + enabled: computed(() => Boolean(currentCustomResourceDefinition.get())), + orderNumber: 100, + }; + }, + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default customResourceDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/default-kube-meta-details-item.injectable.ts b/src/renderer/components/kube-object-details/default-kube-meta-details-item.injectable.ts new file mode 100644 index 0000000000..9d8f662de5 --- /dev/null +++ b/src/renderer/components/kube-object-details/default-kube-meta-details-item.injectable.ts @@ -0,0 +1,20 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import { KubeObjectMeta } from "../kube-object-meta"; +import { kubeObjectDetailItemInjectionToken } from "./kube-object-detail-items/kube-object-detail-item-injection-token"; + +const defaultKubeObjectMetaDetailsItemInjectable = getInjectable({ + id: "default-kube-object-meta-details-item", + instantiate: () => ({ + Component: KubeObjectMeta, + enabled: computed(() => true), + orderNumber: -Infinity, + }), + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default defaultKubeObjectMetaDetailsItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts index ad70d9245a..eba49112c1 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts @@ -17,7 +17,7 @@ const clusterRoleBindingDetailItemInjectable = getInjectable({ return { Component: ClusterRoleBindingDetails, - enabled: computed(() => isClusterRoleBinding(kubeObject.get())), + enabled: computed(() => isClusterRoleBinding(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts index 11c0769e58..dff631a1d9 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts @@ -17,7 +17,7 @@ const clusterRoleDetailItemInjectable = getInjectable({ return { Component: ClusterRoleDetails, - enabled: computed(() => isClusterRole(kubeObject.get())), + enabled: computed(() => isClusterRole(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts index 7f0f37a589..111aa1f3a1 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts @@ -17,7 +17,7 @@ const configMapDetailItemInjectable = getInjectable({ return { Component: ConfigMapDetails, - enabled: computed(() => isConfigMap(kubeObject.get())), + enabled: computed(() => isConfigMap(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts index 1d268b4b0d..350dafcb64 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts @@ -17,7 +17,7 @@ const cronJobDetailItemInjectable = getInjectable({ return { Component: CronJobDetails, - enabled: computed(() => isCronJob(kubeObject.get())), + enabled: computed(() => isCronJob(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts index b459408ed3..432978cc13 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts @@ -17,7 +17,7 @@ const customResourceDefinitionsDetailItemInjectable = getInjectable({ return { Component: CRDDetails, - enabled: computed(() => isCustomResourceDefinition(kubeObject.get())), + enabled: computed(() => isCustomResourceDefinition(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts index 32ca10f938..4845dd3a46 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts @@ -17,7 +17,7 @@ const daemonSetDetailItemInjectable = getInjectable({ return { Component: DaemonSetDetails, - enabled: computed(() => isDaemonSet(kubeObject.get())), + enabled: computed(() => isDaemonSet(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts index 6ecb291702..8100b27c9e 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts @@ -17,7 +17,7 @@ const deploymentDetailItemInjectable = getInjectable({ return { Component: DeploymentDetails, - enabled: computed(() => isDeployment(kubeObject.get())), + enabled: computed(() => isDeployment(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts index c8b0e149e3..be7a3de219 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts @@ -17,7 +17,7 @@ const endpointsDetailItemInjectable = getInjectable({ return { Component: EndpointsDetails, - enabled: computed(() => isEndpoint(kubeObject.get())), + enabled: computed(() => isEndpoint(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts index 9263a5796f..fbb792ae38 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts @@ -17,7 +17,7 @@ const eventsDetailItemInjectable = getInjectable({ return { Component: EventDetails, - enabled: computed(() => isEvent(kubeObject.get())), + enabled: computed(() => isEvent(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts index 85566eedf7..66dbebe7c5 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts @@ -17,7 +17,7 @@ const horizontalPodAutoscalerDetailItemInjectable = getInjectable({ return { Component: HpaDetails, - enabled: computed(() => isHorizontalPodAutoscaler(kubeObject.get())), + enabled: computed(() => isHorizontalPodAutoscaler(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts index 86d4103197..77fa5ec86b 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts @@ -17,7 +17,7 @@ const ingressDetailItemInjectable = getInjectable({ return { Component: IngressDetails, - enabled: computed(() => isIngress(kubeObject.get())), + enabled: computed(() => isIngress(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts index 7c32c726e9..1d5d7642ca 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts @@ -17,7 +17,7 @@ const jobDetailItemInjectable = getInjectable({ return { Component: JobDetails, - enabled: computed(() => isJob(kubeObject.get())), + enabled: computed(() => isJob(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts index 1ca98ad704..f0d20862e8 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts @@ -6,77 +6,15 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; import { KubeEventDetails } from "../../../+events/kube-event-details"; -import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; -import { isClusterRole } from "./cluster-role-detail-item.injectable"; -import { isClusterRoleBinding } from "./cluster-role-binding-detail-item.injectable"; -import { isCronJob } from "./cron-job-detail-item.injectable"; -import { isDaemonSet } from "./daemon-set-detail-item.injectable"; -import { isDeployment } from "./deployment-detail-item.injectable"; -import { isEndpoint } from "./endpoints-detail-item.injectable"; -import { isHorizontalPodAutoscaler } from "./horizontal-pod-autoscaler-detail-item.injectable"; -import { isIngress } from "./ingress-detail-item.injectable"; -import { isJob } from "./job-detail-item.injectable"; -import { isNetworkPolicy } from "./network-policy-detail-item.injectable"; -import { isPersistentVolume } from "./persistent-volume-detail-item.injectable"; -import { isPersistentVolumeClaim } from "./persistent-volume-claim-detail-item.injectable"; -import { isNode } from "./node-detail-item.injectable"; -import { isPod } from "./pod-detail-item.injectable"; -import { isReplicaSet } from "./replica-set-detail-item.injectable"; -import { isRole } from "./role-detail-item.injectable"; -import { isRoleBinding } from "./role-binding-detail-item.injectable"; -import { isService } from "./service-detail-item.injectable"; -import { isServiceAccount } from "./service-account-detail-item.injectable"; -import { isStatefulSet } from "./stateful-set-detail-item.injectable"; -import { isStorageClass } from "./storage-class-detail-item.injectable"; const kubeEventDetailItemInjectable = getInjectable({ id: "kube-event-detail-item", - instantiate: (di) => { - const currentKubeObjectInDetails = di.inject( - currentKubeObjectInDetailsInjectable, - ); - - return { - Component: KubeEventDetails, - - enabled: computed(() => { - const kubeObject = currentKubeObjectInDetails.get(); - - if (!kubeObject) { - return false; - } - - const predicates = [ - isClusterRole, - isClusterRoleBinding, - isCronJob, - isDaemonSet, - isDeployment, - isEndpoint, - isHorizontalPodAutoscaler, - isIngress, - isJob, - isNetworkPolicy, - isNode, - isPersistentVolume, - isPersistentVolumeClaim, - isPod, - isReplicaSet, - isRole, - isRoleBinding, - isService, - isServiceAccount, - isStatefulSet, - isStorageClass, - ]; - - return predicates.some((predicate) => predicate(kubeObject)); - }), - - orderNumber: 355, - }; - }, + instantiate: () => ({ + Component: KubeEventDetails, + enabled: computed(() => true), + orderNumber: Infinity, + }), injectionToken: kubeObjectDetailItemInjectionToken, }); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts index baaabbf730..2bb7153028 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts @@ -17,7 +17,7 @@ const leaseDetailItemInjectable = getInjectable({ return { Component: LeaseDetails, - enabled: computed(() => isLease(kubeObject.get())), + enabled: computed(() => isLease(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts index 209bb86dde..f264ba32cf 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts @@ -17,7 +17,7 @@ const limitRangeDetailItemInjectable = getInjectable({ return { Component: LimitRangeDetails, - enabled: computed(() => isLimitRange(kubeObject.get())), + enabled: computed(() => isLimitRange(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts index 180a05805c..4a7b13c6d1 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts @@ -17,7 +17,7 @@ const namespacesDetailItemInjectable = getInjectable({ return { Component: NamespaceDetails, - enabled: computed(() => isNamespace(kubeObject.get())), + enabled: computed(() => isNamespace(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts index ff7d7f4a7f..53b6d57355 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts @@ -17,7 +17,7 @@ const networkPolicyDetailItemInjectable = getInjectable({ return { Component: NetworkPolicyDetails, - enabled: computed(() => isNetworkPolicy(kubeObject.get())), + enabled: computed(() => isNetworkPolicy(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts index 254187d01e..4ed6f66d7e 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts @@ -17,7 +17,7 @@ const nodeDetailItemInjectable = getInjectable({ return { Component: NodeDetails, - enabled: computed(() => isNode(kubeObject.get())), + enabled: computed(() => isNode(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts index 52283738dd..18c489a6d9 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts @@ -17,7 +17,7 @@ const persistentVolumeClaimDetailItemInjectable = getInjectable({ return { Component: PersistentVolumeClaimDetails, - enabled: computed(() => isPersistentVolumeClaim(kubeObject.get())), + enabled: computed(() => isPersistentVolumeClaim(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts index dd85502c05..536380a9a0 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts @@ -17,7 +17,7 @@ const persistentVolumeDetailItemInjectable = getInjectable({ return { Component: PersistentVolumeDetails, - enabled: computed(() => isPersistentVolume(kubeObject.get())), + enabled: computed(() => isPersistentVolume(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts index 7f98c6a9b7..c75f35217d 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts @@ -17,7 +17,7 @@ const podDetailItemInjectable = getInjectable({ return { Component: PodDetails, - enabled: computed(() => isPod(kubeObject.get())), + enabled: computed(() => isPod(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts index f320ba5be6..c35e2f6d15 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts @@ -17,7 +17,7 @@ const podDisruptionBudgetDetailItemInjectable = getInjectable({ return { Component: PodDisruptionBudgetDetails, - enabled: computed(() => isPodDisruptionBudget(kubeObject.get())), + enabled: computed(() => isPodDisruptionBudget(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts index 177745e5bb..54cd7691c9 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts @@ -17,7 +17,7 @@ const podSecurityPolicyDetailItemInjectable = getInjectable({ return { Component: PodSecurityPolicyDetails, - enabled: computed(() => isPodSecurityPolicy(kubeObject.get())), + enabled: computed(() => isPodSecurityPolicy(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/priority-class-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/priority-class-detail-item.injectable.ts index 63fa5c18b8..803c0655b6 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/priority-class-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/priority-class-detail-item.injectable.ts @@ -17,7 +17,7 @@ const priorityClassDetailItemInjectable = getInjectable({ return { Component: PriorityClassesDetails, - enabled: computed(() => isPriorityClass(kubeObject.get())), + enabled: computed(() => isPriorityClass(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts index 9091507ed5..e10d57fb11 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts @@ -17,7 +17,7 @@ const replicaSetDetailItemInjectable = getInjectable({ return { Component: ReplicaSetDetails, - enabled: computed(() => isReplicaSet(kubeObject.get())), + enabled: computed(() => isReplicaSet(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts index fd495285b5..eae2f0c48f 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts @@ -17,7 +17,7 @@ const resourceQuotaDetailItemInjectable = getInjectable({ return { Component: ResourceQuotaDetails, - enabled: computed(() => isResourceQuota(kubeObject.get())), + enabled: computed(() => isResourceQuota(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts index a64e727926..ae83190b61 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts @@ -17,7 +17,7 @@ const roleBindingDetailItemInjectable = getInjectable({ return { Component: RoleBindingDetails, - enabled: computed(() => isRoleBinding(kubeObject.get())), + enabled: computed(() => isRoleBinding(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts index c6acc8aa9f..77781640c5 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts @@ -17,7 +17,7 @@ const roleDetailItemInjectable = getInjectable({ return { Component: RoleDetails, - enabled: computed(() => isRole(kubeObject.get())), + enabled: computed(() => isRole(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/runtime-class-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/runtime-class-detail-item.injectable.ts index 446d515dbc..a06949094b 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/runtime-class-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/runtime-class-detail-item.injectable.ts @@ -17,7 +17,7 @@ const runtimeClassDetailItemInjectable = getInjectable({ return { Component: RuntimeClassesDetails, - enabled: computed(() => isRuntimeClass(kubeObject.get())), + enabled: computed(() => isRuntimeClass(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts index 7cd57f98b1..5645b40f0b 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts @@ -17,7 +17,7 @@ const secretsDetailItemInjectable = getInjectable({ return { Component: SecretDetails, - enabled: computed(() => isSecret(kubeObject.get())), + enabled: computed(() => isSecret(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts index 3d7ecdffef..77aa073c8f 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts @@ -17,7 +17,7 @@ const serviceAccountDetailItemInjectable = getInjectable({ return { Component: ServiceAccountsDetails, - enabled: computed(() => isServiceAccount(kubeObject.get())), + enabled: computed(() => isServiceAccount(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts index dad93b0064..108da710a9 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts @@ -17,7 +17,7 @@ const serviceDetailItemInjectable = getInjectable({ return { Component: ServiceDetails, - enabled: computed(() => isService(kubeObject.get())), + enabled: computed(() => isService(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts index f206a48aad..35970e5697 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts @@ -17,7 +17,7 @@ const statefulSetDetailItemInjectable = getInjectable({ return { Component: StatefulSetDetails, - enabled: computed(() => isStatefulSet(kubeObject.get())), + enabled: computed(() => isStatefulSet(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts index 2493b0eb8d..bc0c71ec5b 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts @@ -17,7 +17,7 @@ const storageClassDetailItemInjectable = getInjectable({ return { Component: StorageClassDetails, - enabled: computed(() => isStorageClass(kubeObject.get())), + enabled: computed(() => isStorageClass(kubeObject.value.get()?.object)), orderNumber: 10, }; }, diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts index bf7e296921..45b37d2ca1 100644 --- a/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts @@ -55,7 +55,7 @@ const kubeObjectDetailItemRegistratorInjectable = getInjectable({ return false; } - if (!isRelevantKubeObject(kubeObject.get())) { + if (!isRelevantKubeObject(kubeObject.value.get()?.object)) { return false; } diff --git a/src/renderer/components/kube-object-details/kube-object-details.tsx b/src/renderer/components/kube-object-details/kube-object-details.tsx index e049cc4640..26f9ab7568 100644 --- a/src/renderer/components/kube-object-details/kube-object-details.tsx +++ b/src/renderer/components/kube-object-details/kube-object-details.tsx @@ -6,25 +6,18 @@ import "./kube-object-details.scss"; import React from "react"; -import { disposeOnUnmount, observer } from "mobx-react"; +import { observer } from "mobx-react"; import type { IComputedValue } from "mobx"; -import { observable, reaction, makeObservable } from "mobx"; import { Drawer } from "../drawer"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; import { Spinner } from "../spinner"; -import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { KubeObjectMenu } from "../kube-object-menu"; -import { CustomResourceDetails } from "../+custom-resources"; -import { KubeObjectMeta } from "../kube-object-meta"; -import type { PageParam } from "../../navigation"; import type { HideDetails } from "../kube-detail-params/hide-details.injectable"; -import type { CustomResourceDefinitionStore } from "../+custom-resources/definition.store"; +import type { IAsyncComputed } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react"; -import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; -import customResourceDefinitionStoreInjectable from "../+custom-resources/definition.store.injectable"; import hideDetailsInjectable from "../kube-detail-params/hide-details.injectable"; -import kubeDetailsUrlParamInjectable from "../kube-detail-params/kube-details-url.injectable"; import kubeObjectDetailItemsInjectable from "./kube-object-detail-items/kube-object-detail-items.injectable"; +import type { CurrentKubeObject } from "./current-kube-object-in-details.injectable"; import currentKubeObjectInDetailsInjectable from "./current-kube-object-in-details.injectable"; export interface KubeObjectDetailsProps { @@ -34,128 +27,55 @@ export interface KubeObjectDetailsProps { interface Dependencies { detailComponents: IComputedValue; - kubeObject: IComputedValue; - kubeDetailsUrlParam: PageParam; - apiManager: ApiManager; + kubeObject: IAsyncComputed; hideDetails: HideDetails; - customResourceDefinitionStore: CustomResourceDefinitionStore; } -@observer -class NonInjectedKubeObjectDetails extends React.Component { - @observable isLoading = false; - @observable.ref loadingError: React.ReactNode; +const NonInjectedKubeObjectDetails = observer((props: Dependencies) => { + const { + detailComponents, + hideDetails, + kubeObject, + } = props; - constructor(props: Dependencies) { - super(props); - makeObservable(this); - } + const currentKubeObject = kubeObject.value.get(); + const isLoading = kubeObject.pending.get(); - get path() { - return this.props.kubeDetailsUrlParam.get(); - } - - get object() { - return this.props.kubeObject.get(); - } - - componentDidMount(): void { - disposeOnUnmount(this, [ - reaction(() => [ - this.path, - this.object, // resource might be updated via watch-event or from already opened details - this.props.customResourceDefinitionStore.items.length, // crd stores initialized after loading - ], async () => { - this.loadingError = ""; - const { path, object } = this; - - if (!object) { - const store = this.props.apiManager.getStore(path); - - if (store) { - this.isLoading = true; - - try { - await store.loadFromPath(path); - } catch (err) { - this.loadingError = ( - <> - Resource loading has failed: - {String(err)} - - ); - } finally { - this.isLoading = false; - } + return ( + } + onClose={hideDetails} + > + {isLoading && } + {currentKubeObject?.error && ( +
+ Resource loading has failed: + {currentKubeObject.error} +
+ )} + {currentKubeObject?.object && ( + <> + { + detailComponents.get() + .map((Component, index) => ) } - } - }), - ]); - } - - renderTitle(object: KubeObject | null | undefined) { - if (!object) { - return ""; - } - - return `${object.kind}: ${object.getName()}`; - } - - renderContents(object: KubeObject) { - const details = this.props.detailComponents.get(); - - if (details.length === 0) { - const crd = this.props.customResourceDefinitionStore.getByObject(object); - - /** - * This is a fallback so that if a custom resource object doesn't have - * any defined details we should try and display at least some details - */ - if (crd) { - return ( - - ); - } else { - // if we still don't have any details to show, just show the standard object metadata - return ; - } - } - - return details.map((DetailComponent, index) => ( - - )); - } - - render() { - const { object, isLoading, loadingError } = this; - - return ( - } - onClose={this.props.hideDetails} - > - {isLoading && } - {loadingError &&
{loadingError}
} - {object && this.renderContents(object)} - - ); - } -} + + )} + + ); +}); export const KubeObjectDetails = withInjectables(NonInjectedKubeObjectDetails, { getProps: (di, props) => ({ ...props, - apiManager: di.inject(apiManagerInjectable), - customResourceDefinitionStore: di.inject(customResourceDefinitionStoreInjectable), hideDetails: di.inject(hideDetailsInjectable), - kubeDetailsUrlParam: di.inject(kubeDetailsUrlParamInjectable), detailComponents: di.inject(kubeObjectDetailItemsInjectable), kubeObject: di.inject(currentKubeObjectInDetailsInjectable), }),