master-merge fixes

Signed-off-by: Roman <ixrock@gmail.com>

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 type { LensExtension } from "../lens-extension";
-import { CatalogEntity } from "../../common/catalog";
+import type { CatalogEntity } from "../../common/catalog";
 
 export type CommandContext = {
   entity?: CatalogEntity;

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;

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<PageRegistration, RegisteredPage>
   }
 
   protected normalizeParams(extensionId: LensExtensionId, params?: PageParams<string | Partial<PageParamInit>>): PageParams<PageParam> {
-    if (!params) return;
+    if (!params) return undefined;
     const normalizedParams: PageParams<PageParam> = {};
 
     Object.entries(params).forEach(([paramName, paramValue]) => {

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";

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 {

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<CronJob> {
   suspend(params: { namespace: string; name: string }) {

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";

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<Deployment> {
   protected getScaleApiUrl(params: { namespace: string; name: string }) {

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;

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<Ingress> {
   getMetrics(ingress: string, namespace: string): Promise<IIngressMetrics> {

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";

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",

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",

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;

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<Node> {
   getMetrics(): Promise<INodeMetrics> {

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<PersistentVolumeClaim> {
   getMetrics(pvcName: string, namespace: string): Promise<IPvcMetrics> {

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: {

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: {

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<Pod> {
   async getLogs(params: { namespace: string; name: string }, query?: IPodLogsQuery): Promise<string> {

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: {

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<ReplicaSet> {
   protected getScaleApiUrl(params: { namespace: string; name: string }) {

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;

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?: {

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;

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<StatefulSet> {
   protected getScaleApiUrl(params: { namespace: string; name: string }) {

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"

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) {

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";
 

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";

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 <ClusterStatus clusterId={clusterId} className="box center"/>;
     }
+    return null;
   }
 
   render() {