From 93e7febc94888d650bf645bd02cef1088e912cfd Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 19 May 2021 20:05:56 +0300 Subject: [PATCH] master-merge fixes Signed-off-by: Roman --- src/extensions/registries/command-registry.ts | 4 ++-- src/extensions/registries/page-menu-registry.ts | 2 +- src/extensions/registries/page-registry.ts | 4 ++-- src/extensions/renderer-api/navigation.ts | 2 +- src/main/catalog-pusher.ts | 2 +- src/renderer/api/endpoints/cron-job.api.ts | 2 +- src/renderer/api/endpoints/daemon-set.api.ts | 2 +- src/renderer/api/endpoints/deployment.api.ts | 2 +- src/renderer/api/endpoints/endpoint.api.ts | 2 +- src/renderer/api/endpoints/ingress.api.ts | 2 +- src/renderer/api/endpoints/job.api.ts | 2 +- src/renderer/api/endpoints/limit-range.api.ts | 2 +- src/renderer/api/endpoints/namespaces.api.ts | 2 +- src/renderer/api/endpoints/network-policy.api.ts | 2 +- src/renderer/api/endpoints/nodes.api.ts | 2 +- src/renderer/api/endpoints/persistent-volume-claims.api.ts | 2 +- src/renderer/api/endpoints/persistent-volume.api.ts | 2 +- src/renderer/api/endpoints/poddisruptionbudget.api.ts | 2 +- src/renderer/api/endpoints/pods.api.ts | 2 +- src/renderer/api/endpoints/podsecuritypolicy.api.ts | 2 +- src/renderer/api/endpoints/replica-set.api.ts | 2 +- src/renderer/api/endpoints/role-binding.api.ts | 2 +- src/renderer/api/endpoints/service-accounts.api.ts | 2 +- src/renderer/api/endpoints/service.api.ts | 2 +- src/renderer/api/endpoints/stateful-set.api.ts | 2 +- src/renderer/api/endpoints/storage-class.api.ts | 2 +- src/renderer/components/+catalog/catalog-entity.store.ts | 2 +- .../components/+custom-resources/crd-resource.store.ts | 2 +- .../add-role-binding-dialog.tsx | 2 +- src/renderer/components/cluster-manager/cluster-view.tsx | 3 ++- 30 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/extensions/registries/command-registry.ts b/src/extensions/registries/command-registry.ts index c3894b4008..b7b822d473 100644 --- a/src/extensions/registries/command-registry.ts +++ b/src/extensions/registries/command-registry.ts @@ -23,8 +23,8 @@ import { BaseRegistry } from "./base-registry"; import { makeObservable, observable } from "mobx"; -import { LensExtension } from "../lens-extension"; -import { CatalogEntity } from "../../common/catalog"; +import type { LensExtension } from "../lens-extension"; +import type { CatalogEntity } from "../../common/catalog"; export type CommandContext = { entity?: CatalogEntity; diff --git a/src/extensions/registries/page-menu-registry.ts b/src/extensions/registries/page-menu-registry.ts index edbf640a49..49003717f6 100644 --- a/src/extensions/registries/page-menu-registry.ts +++ b/src/extensions/registries/page-menu-registry.ts @@ -23,8 +23,8 @@ import type { IconProps } from "../../renderer/components/icon"; import type React from "react"; import type { PageTarget, RegisteredPage } from "./page-registry"; +import type { LensExtension } from "../lens-extension"; import { BaseRegistry } from "./base-registry"; -import { LensExtension } from "../lens-extension"; export interface PageMenuRegistration { target?: PageTarget; diff --git a/src/extensions/registries/page-registry.ts b/src/extensions/registries/page-registry.ts index 91bcef3ab1..3bd4c33878 100644 --- a/src/extensions/registries/page-registry.ts +++ b/src/extensions/registries/page-registry.ts @@ -25,7 +25,7 @@ import React from "react"; import { observer } from "mobx-react"; import { BaseRegistry } from "./base-registry"; import { LensExtension, LensExtensionId, sanitizeExtensionName } from "../lens-extension"; -import type { createPageParam, PageParam, PageParamInit, searchParamsOptions } from "../../renderer/navigation"; +import { createPageParam, PageParam, PageParamInit, searchParamsOptions } from "../../renderer/navigation"; export interface PageRegistration { /** @@ -116,7 +116,7 @@ export class PageRegistry extends BaseRegistry } protected normalizeParams(extensionId: LensExtensionId, params?: PageParams>): PageParams { - if (!params) return; + if (!params) return undefined; const normalizedParams: PageParams = {}; Object.entries(params).forEach(([paramName, paramValue]) => { diff --git a/src/extensions/renderer-api/navigation.ts b/src/extensions/renderer-api/navigation.ts index 9ed5776ea0..48896920b5 100644 --- a/src/extensions/renderer-api/navigation.ts +++ b/src/extensions/renderer-api/navigation.ts @@ -21,7 +21,7 @@ import { navigation, PageParam, PageParamInit } from "../../renderer/navigation"; -export { PageParamInit, PageParam } from "../../renderer/navigation/page-param"; +export type { PageParamInit, PageParam } from "../../renderer/navigation/page-param"; export { navigate, isActiveRoute } from "../../renderer/navigation/helpers"; export { hideDetails, showDetails, getDetailsUrl } from "../../renderer/components/kube-object/kube-object-details"; export type { IURLParams } from "../../common/utils/buildUrl"; diff --git a/src/main/catalog-pusher.ts b/src/main/catalog-pusher.ts index a93e4449f9..5011958d8c 100644 --- a/src/main/catalog-pusher.ts +++ b/src/main/catalog-pusher.ts @@ -23,7 +23,7 @@ import { autorun } from "mobx"; import { broadcastMessage, subscribeToBroadcast, unsubscribeFromBroadcast } from "../common/ipc"; import type { CatalogEntityRegistry } from "../common/catalog"; import "../common/catalog-entities/kubernetes-cluster"; -import type { Disposer, disposer } from "../common/utils"; +import { Disposer, disposer } from "../common/utils"; import logger from "./logger"; export class CatalogPusher { diff --git a/src/renderer/api/endpoints/cron-job.api.ts b/src/renderer/api/endpoints/cron-job.api.ts index 6c9c5e27de..43743b2bb4 100644 --- a/src/renderer/api/endpoints/cron-job.api.ts +++ b/src/renderer/api/endpoints/cron-job.api.ts @@ -25,7 +25,7 @@ import type { IPodContainer } from "./pods.api"; import { formatDuration } from "../../utils/formatDuration"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class CronJobApi extends KubeApi { suspend(params: { namespace: string; name: string }) { diff --git a/src/renderer/api/endpoints/daemon-set.api.ts b/src/renderer/api/endpoints/daemon-set.api.ts index 31fd1691e0..43419b5ac1 100644 --- a/src/renderer/api/endpoints/daemon-set.api.ts +++ b/src/renderer/api/endpoints/daemon-set.api.ts @@ -24,7 +24,7 @@ import type { IPodContainer } from "./pods.api"; import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class DaemonSet extends WorkloadKubeObject { static kind = "DaemonSet"; diff --git a/src/renderer/api/endpoints/deployment.api.ts b/src/renderer/api/endpoints/deployment.api.ts index 332de12552..ef5b1c9ca7 100644 --- a/src/renderer/api/endpoints/deployment.api.ts +++ b/src/renderer/api/endpoints/deployment.api.ts @@ -24,7 +24,7 @@ import moment from "moment"; import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class DeploymentApi extends KubeApi { protected getScaleApiUrl(params: { namespace: string; name: string }) { diff --git a/src/renderer/api/endpoints/endpoint.api.ts b/src/renderer/api/endpoints/endpoint.api.ts index 897e357b7d..9aa1701c1d 100644 --- a/src/renderer/api/endpoints/endpoint.api.ts +++ b/src/renderer/api/endpoints/endpoint.api.ts @@ -22,7 +22,7 @@ import { autoBind } from "../../utils"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface IEndpointPort { name?: string; diff --git a/src/renderer/api/endpoints/ingress.api.ts b/src/renderer/api/endpoints/ingress.api.ts index be1f30af8c..6b0fbaecba 100644 --- a/src/renderer/api/endpoints/ingress.api.ts +++ b/src/renderer/api/endpoints/ingress.api.ts @@ -23,7 +23,7 @@ import { KubeObject } from "../kube-object"; import { autoBind } from "../../utils"; import { IMetrics, metricsApi } from "./metrics.api"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class IngressApi extends KubeApi { getMetrics(ingress: string, namespace: string): Promise { diff --git a/src/renderer/api/endpoints/job.api.ts b/src/renderer/api/endpoints/job.api.ts index ec5fe5ee16..f9e3188021 100644 --- a/src/renderer/api/endpoints/job.api.ts +++ b/src/renderer/api/endpoints/job.api.ts @@ -25,7 +25,7 @@ import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; import type { IPodContainer } from "./pods.api"; import { KubeApi } from "../kube-api"; import type { JsonApiParams } from "../json-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class Job extends WorkloadKubeObject { static kind = "Job"; diff --git a/src/renderer/api/endpoints/limit-range.api.ts b/src/renderer/api/endpoints/limit-range.api.ts index 9f712af36c..82b02cfa70 100644 --- a/src/renderer/api/endpoints/limit-range.api.ts +++ b/src/renderer/api/endpoints/limit-range.api.ts @@ -22,7 +22,7 @@ import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; import { autoBind } from "../../utils"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export enum LimitType { CONTAINER = "Container", diff --git a/src/renderer/api/endpoints/namespaces.api.ts b/src/renderer/api/endpoints/namespaces.api.ts index 14aa243c7c..63dd6a2ab0 100644 --- a/src/renderer/api/endpoints/namespaces.api.ts +++ b/src/renderer/api/endpoints/namespaces.api.ts @@ -22,7 +22,7 @@ import { KubeApi } from "../kube-api"; import { KubeObject } from "../kube-object"; import { autoBind } from "../../utils"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export enum NamespaceStatus { ACTIVE = "Active", diff --git a/src/renderer/api/endpoints/network-policy.api.ts b/src/renderer/api/endpoints/network-policy.api.ts index 8034a3b210..03a06b7c42 100644 --- a/src/renderer/api/endpoints/network-policy.api.ts +++ b/src/renderer/api/endpoints/network-policy.api.ts @@ -22,7 +22,7 @@ import { KubeObject } from "../kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface IPolicyIpBlock { cidr: string; diff --git a/src/renderer/api/endpoints/nodes.api.ts b/src/renderer/api/endpoints/nodes.api.ts index 2e8ffedb64..4734c47a23 100644 --- a/src/renderer/api/endpoints/nodes.api.ts +++ b/src/renderer/api/endpoints/nodes.api.ts @@ -23,7 +23,7 @@ import { KubeObject } from "../kube-object"; import { autoBind, cpuUnitsToNumber, unitsToBytes } from "../../utils"; import { IMetrics, metricsApi } from "./metrics.api"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class NodesApi extends KubeApi { getMetrics(): Promise { diff --git a/src/renderer/api/endpoints/persistent-volume-claims.api.ts b/src/renderer/api/endpoints/persistent-volume-claims.api.ts index ecd2117a11..ca36151767 100644 --- a/src/renderer/api/endpoints/persistent-volume-claims.api.ts +++ b/src/renderer/api/endpoints/persistent-volume-claims.api.ts @@ -24,7 +24,7 @@ import { autoBind } from "../../utils"; import { IMetrics, metricsApi } from "./metrics.api"; import type { Pod } from "./pods.api"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class PersistentVolumeClaimsApi extends KubeApi { getMetrics(pvcName: string, namespace: string): Promise { diff --git a/src/renderer/api/endpoints/persistent-volume.api.ts b/src/renderer/api/endpoints/persistent-volume.api.ts index ab6aa82358..e71c355977 100644 --- a/src/renderer/api/endpoints/persistent-volume.api.ts +++ b/src/renderer/api/endpoints/persistent-volume.api.ts @@ -23,7 +23,7 @@ import { KubeObject } from "../kube-object"; import { unitsToBytes } from "../../utils/convertMemory"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface PersistentVolume { spec: { diff --git a/src/renderer/api/endpoints/poddisruptionbudget.api.ts b/src/renderer/api/endpoints/poddisruptionbudget.api.ts index 026e8d9bff..daa16933da 100644 --- a/src/renderer/api/endpoints/poddisruptionbudget.api.ts +++ b/src/renderer/api/endpoints/poddisruptionbudget.api.ts @@ -22,7 +22,7 @@ import { autoBind } from "../../utils"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface PodDisruptionBudget { spec: { diff --git a/src/renderer/api/endpoints/pods.api.ts b/src/renderer/api/endpoints/pods.api.ts index 4ca9c75fcd..a111cd9559 100644 --- a/src/renderer/api/endpoints/pods.api.ts +++ b/src/renderer/api/endpoints/pods.api.ts @@ -23,7 +23,7 @@ import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; import { IMetrics, metricsApi } from "./metrics.api"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class PodsApi extends KubeApi { async getLogs(params: { namespace: string; name: string }, query?: IPodLogsQuery): Promise { diff --git a/src/renderer/api/endpoints/podsecuritypolicy.api.ts b/src/renderer/api/endpoints/podsecuritypolicy.api.ts index 68b8c1d8ed..eac827ffcc 100644 --- a/src/renderer/api/endpoints/podsecuritypolicy.api.ts +++ b/src/renderer/api/endpoints/podsecuritypolicy.api.ts @@ -22,7 +22,7 @@ import { autoBind } from "../../utils"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface PodSecurityPolicy { spec: { diff --git a/src/renderer/api/endpoints/replica-set.api.ts b/src/renderer/api/endpoints/replica-set.api.ts index ddc362eb39..e2311c6b87 100644 --- a/src/renderer/api/endpoints/replica-set.api.ts +++ b/src/renderer/api/endpoints/replica-set.api.ts @@ -24,7 +24,7 @@ import { autoBind } from "../../utils"; import { WorkloadKubeObject } from "../workload-kube-object"; import type { IPodContainer, Pod } from "./pods.api"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class ReplicaSetApi extends KubeApi { protected getScaleApiUrl(params: { namespace: string; name: string }) { diff --git a/src/renderer/api/endpoints/role-binding.api.ts b/src/renderer/api/endpoints/role-binding.api.ts index f83d71f5d3..4e53752df1 100644 --- a/src/renderer/api/endpoints/role-binding.api.ts +++ b/src/renderer/api/endpoints/role-binding.api.ts @@ -22,7 +22,7 @@ import { autoBind } from "../../utils"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface IRoleBindingSubject { kind: string; diff --git a/src/renderer/api/endpoints/service-accounts.api.ts b/src/renderer/api/endpoints/service-accounts.api.ts index 0859e32351..6cc9d292ba 100644 --- a/src/renderer/api/endpoints/service-accounts.api.ts +++ b/src/renderer/api/endpoints/service-accounts.api.ts @@ -22,7 +22,7 @@ import { autoBind } from "../../utils"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface ServiceAccount { secrets?: { diff --git a/src/renderer/api/endpoints/service.api.ts b/src/renderer/api/endpoints/service.api.ts index 847d4ee04c..d1833f349d 100644 --- a/src/renderer/api/endpoints/service.api.ts +++ b/src/renderer/api/endpoints/service.api.ts @@ -22,7 +22,7 @@ import { autoBind } from "../../utils"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface ServicePort { name?: string; diff --git a/src/renderer/api/endpoints/stateful-set.api.ts b/src/renderer/api/endpoints/stateful-set.api.ts index e3f26351b8..b91e06c25c 100644 --- a/src/renderer/api/endpoints/stateful-set.api.ts +++ b/src/renderer/api/endpoints/stateful-set.api.ts @@ -24,7 +24,7 @@ import type { IPodContainer } from "./pods.api"; import { IAffinity, WorkloadKubeObject } from "../workload-kube-object"; import { autoBind } from "../../utils"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export class StatefulSetApi extends KubeApi { protected getScaleApiUrl(params: { namespace: string; name: string }) { diff --git a/src/renderer/api/endpoints/storage-class.api.ts b/src/renderer/api/endpoints/storage-class.api.ts index 231e89cf75..226e3ab477 100644 --- a/src/renderer/api/endpoints/storage-class.api.ts +++ b/src/renderer/api/endpoints/storage-class.api.ts @@ -22,7 +22,7 @@ import { autoBind } from "../../utils"; import { KubeObject } from "../kube-object"; import { KubeApi } from "../kube-api"; -import { KubeJsonApiData } from "../kube-json-api"; +import type { KubeJsonApiData } from "../kube-json-api"; export interface StorageClass { provisioner: string; // e.g. "storage.k8s.io/v1" diff --git a/src/renderer/components/+catalog/catalog-entity.store.ts b/src/renderer/components/+catalog/catalog-entity.store.ts index f249ead2f1..3c40a77d84 100644 --- a/src/renderer/components/+catalog/catalog-entity.store.ts +++ b/src/renderer/components/+catalog/catalog-entity.store.ts @@ -23,7 +23,7 @@ import { action, computed, makeObservable } from "mobx"; import { catalogEntityRegistry } from "../../api/catalog-entity-registry"; import type { CatalogEntity, CatalogEntityActionContext } from "../../api/catalog-entity"; import { ItemObject, ItemStore } from "../../item.store"; -import { CatalogCategory } from "../../../common/catalog"; +import type { CatalogCategory } from "../../../common/catalog"; export class CatalogEntityItem implements ItemObject { constructor(public entity: CatalogEntity) { diff --git a/src/renderer/components/+custom-resources/crd-resource.store.ts b/src/renderer/components/+custom-resources/crd-resource.store.ts index 03f3887f3d..8717884785 100644 --- a/src/renderer/components/+custom-resources/crd-resource.store.ts +++ b/src/renderer/components/+custom-resources/crd-resource.store.ts @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { KubeApi } from "../../api/kube-api"; +import type { KubeApi } from "../../api/kube-api"; import { KubeObjectStore } from "../../kube-object.store"; import type { KubeObject } from "../../api/kube-object"; diff --git a/src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx b/src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx index 7c27bb3f24..273a3c0d51 100644 --- a/src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx +++ b/src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx @@ -28,7 +28,7 @@ import { Dialog, DialogProps } from "../dialog"; import { Wizard, WizardStep } from "../wizard"; import { Select, SelectOption } from "../select"; import { SubTitle } from "../layout/sub-title"; -import { IRoleBindingSubject, Role, RoleBinding, ServiceAccount } from "../../api/endpoints"; +import type { IRoleBindingSubject, Role, RoleBinding, ServiceAccount } from "../../api/endpoints"; import { Icon } from "../icon"; import { Input } from "../input"; import { NamespaceSelect } from "../+namespaces/namespace-select"; diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index e3cd21ac37..5fb7c38123 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -81,12 +81,13 @@ export class ClusterView extends React.Component { ]); } - renderStatus() { + renderStatus(): React.ReactNode { const { clusterId, cluster, isReady } = this; if (cluster && !isReady) { return ; } + return null; } render() {