diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e764763208..b43814b584 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -54,7 +54,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4fc05cd5d3..911a103728 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,7 @@ jobs: commit: master tag: ${{ steps.tagger.outputs.tagname }} body: ${{ github.event.pull_request.body }} + prerelease: ${{ endsWith(steps.tagger.outputs.tagname, '-alpha') || endsWith(steps.tagger.outputs.tagname, '-beta') }} publish-npm: uses: ./.github/workflows/publish-release-npm.yml needs: release diff --git a/packages/core/package.json b/packages/core/package.json index 2776674153..ec3946c4a1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", - "version": "6.4.0-alpha.2", + "version": "6.4.0-alpha.4", "repository": { "type": "git", "url": "git+https://github.com/lensapp/lens.git" @@ -133,12 +133,12 @@ "history": "^4.10.1", "hpagent": "^1.2.0", "http-proxy": "^1.18.1", - "immer": "^9.0.17", + "immer": "^9.0.18", "joi": "^17.7.0", "js-yaml": "^4.1.0", "jsdom": "^16.7.0", "lodash": "^4.17.15", - "marked": "^4.2.5", + "marked": "^4.2.12", "md5-file": "^5.0.0", "mobx": "^6.7.0", "mobx-observable-history": "^2.0.3", @@ -158,8 +158,6 @@ "react-router": "^5.3.4", "react-virtualized-auto-sizer": "^1.0.7", "readable-stream": "^3.6.0", - "request": "^2.88.2", - "request-promise-native": "^1.0.9", "rfc6902": "^5.0.1", "selfsigned": "^2.1.1", "semver": "^7.3.8", @@ -183,7 +181,7 @@ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10", "@sentry/types": "^6.19.7", "@swc/cli": "^0.1.59", - "@swc/core": "^1.3.26", + "@swc/core": "^1.3.27", "@swc/jest": "^0.2.24", "@testing-library/dom": "^7.31.2", "@testing-library/jest-dom": "^5.16.5", @@ -226,8 +224,6 @@ "@types/react-virtualized-auto-sizer": "^1.0.1", "@types/react-window": "^1.8.5", "@types/readable-stream": "^2.3.13", - "@types/request": "^2.48.7", - "@types/request-promise-native": "^1.0.18", "@types/semver": "^7.3.13", "@types/sharp": "^0.31.1", "@types/tar": "^6.1.3", @@ -241,8 +237,8 @@ "@types/webpack-dev-server": "^4.7.2", "@types/webpack-env": "^1.18.0", "@types/webpack-node-externals": "^2.5.3", - "@typescript-eslint/eslint-plugin": "^5.48.1", - "@typescript-eslint/parser": "^5.48.1", + "@typescript-eslint/eslint-plugin": "^5.48.2", + "@typescript-eslint/parser": "^5.48.2", "adr": "^1.4.3", "ansi_up": "^5.1.0", "chalk": "^4.1.2", @@ -258,13 +254,13 @@ "electron": "^19.1.9", "electron-builder": "^23.6.0", "electron-notarize": "^0.3.0", - "esbuild": "^0.16.17", - "esbuild-loader": "^2.20.0", - "eslint": "^8.31.0", + "esbuild": "^0.17.3", + "esbuild-loader": "^2.21.0", + "eslint": "^8.32.0", "eslint-import-resolver-typescript": "^3.5.3", "eslint-plugin-header": "^3.1.1", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-react": "7.32.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-react": "^7.32.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-unused-imports": "^2.0.0", "fork-ts-checker-webpack-plugin": "^6.5.2", @@ -332,7 +328,6 @@ "@types/react-router-dom": "^5.3.3", "@types/react-virtualized-auto-sizer": "^1.0.1", "@types/react-window": "^1.8.5", - "@types/request-promise-native": "^1.0.18", "@types/tar": "^6.1.3", "@types/tcp-port-used": "^1.0.1", "@types/url-parse": "^1.4.8", diff --git a/packages/core/src/common/catalog-entities/kubernetes-cluster.ts b/packages/core/src/common/catalog-entities/kubernetes-cluster.ts index d47ab47831..57cac07122 100644 --- a/packages/core/src/common/catalog-entities/kubernetes-cluster.ts +++ b/packages/core/src/common/catalog-entities/kubernetes-cluster.ts @@ -8,7 +8,7 @@ import { CatalogEntity, CatalogCategory, categoryVersion } from "../catalog/cata import { broadcastMessage } from "../ipc"; import { app } from "electron"; import type { CatalogEntityConstructor, CatalogEntitySpec } from "../catalog/catalog-entity"; -import { IpcRendererNavigationEvents } from "../../renderer/navigation/events"; +import { IpcRendererNavigationEvents } from "../ipc/navigation-events"; import { requestClusterActivation, requestClusterDisconnection } from "../../renderer/ipc"; import KubeClusterCategoryIcon from "./icons/kubernetes.svg"; import getClusterByIdInjectable from "../cluster-store/get-by-id.injectable"; diff --git a/packages/core/src/common/cluster/cluster.ts b/packages/core/src/common/cluster/cluster.ts index c8e7e69e90..3f353dfee4 100644 --- a/packages/core/src/common/cluster/cluster.ts +++ b/packages/core/src/common/cluster/cluster.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { action, comparer, computed, makeObservable, observable, reaction, when } from "mobx"; +import { action, comparer, computed, makeObservable, observable, reaction, runInAction, when } from "mobx"; import type { ClusterContextHandler } from "../../main/context-handler/context-handler"; import type { KubeConfig } from "@kubernetes/client-node"; import { HttpError } from "@kubernetes/client-node"; @@ -11,13 +11,10 @@ import type { Kubectl } from "../../main/kubectl/kubectl"; import type { KubeconfigManager } from "../../main/kubeconfig-manager/kubeconfig-manager"; import type { KubeApiResource, KubeApiResourceDescriptor } from "../rbac"; import { formatKubeApiResource } from "../rbac"; -import type { VersionDetector } from "../../main/cluster-detectors/version-detector"; -import type { DetectorRegistry } from "../../main/cluster-detectors/detector-registry"; import plimit from "p-limit"; import type { ClusterState, ClusterMetricsResourceType, ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences, UpdateClusterModel, KubeAuthUpdate, ClusterConfigData } from "../cluster-types"; import { ClusterMetadataKey, initialNodeShellImage, ClusterStatus, clusterModelIdChecker, updateClusterModelChecker } from "../cluster-types"; import { disposer, isDefined, isRequestError, toJS } from "../utils"; -import type { Response } from "request"; import { clusterListNamespaceForbiddenChannel } from "../ipc/cluster"; import type { CanI } from "./authorization-review.injectable"; import type { ListNamespaces } from "./list-namespaces.injectable"; @@ -27,11 +24,14 @@ import type { BroadcastMessage } from "../ipc/broadcast-message.injectable"; import type { LoadConfigfromFile } from "../kube-helpers/load-config-from-file.injectable"; import type { CanListResource, RequestNamespaceListPermissions, RequestNamespaceListPermissionsFor } from "./request-namespace-list-permissions.injectable"; import type { RequestApiResources } from "../../main/cluster/request-api-resources.injectable"; +import type { DetectClusterMetadata } from "../../main/cluster-detectors/detect-cluster-metadata.injectable"; +import type { FalibleOnlyClusterMetadataDetector } from "../../main/cluster-detectors/token"; export interface ClusterDependencies { readonly directoryForKubeConfigs: string; readonly logger: Logger; - readonly detectorRegistry: DetectorRegistry; + readonly clusterVersionDetector: FalibleOnlyClusterMetadataDetector; + detectClusterMetadata: DetectClusterMetadata; createKubeconfigManager: (cluster: Cluster) => KubeconfigManager; createContextHandler: (cluster: Cluster) => ClusterContextHandler; createKubectl: (clusterVersion: string) => Kubectl; @@ -39,7 +39,6 @@ export interface ClusterDependencies { requestApiResources: RequestApiResources; requestNamespaceListPermissionsFor: RequestNamespaceListPermissionsFor; createListNamespaces: (config: KubeConfig) => ListNamespaces; - createVersionDetector: (cluster: Cluster) => VersionDetector; broadcastMessage: BroadcastMessage; loadConfigfromFile: LoadConfigfromFile; } @@ -444,57 +443,62 @@ export class Cluster implements ClusterModel { /** * @internal */ - @action + @action async refreshAccessibilityAndMetadata() { await this.refreshAccessibility(); await this.refreshMetadata(); } - /** - * @internal - */ - async refreshMetadata() { - this.dependencies.logger.info(`[CLUSTER]: refreshMetadata`, this.getMeta()); - const metadata = await this.dependencies.detectorRegistry.detectForCluster(this); - const existingMetadata = this.metadata; + /** + * @internal + */ + async refreshMetadata() { + this.dependencies.logger.info(`[CLUSTER]: refreshMetadata`, this.getMeta()); - this.metadata = Object.assign(existingMetadata, metadata); - } + const newMetadata = await this.dependencies.detectClusterMetadata(this); - /** - * @internal - */ - private async refreshAccessibility(): Promise { - this.dependencies.logger.info(`[CLUSTER]: refreshAccessibility`, this.getMeta()); - const proxyConfig = await this.getProxyKubeconfig(); - const canI = this.dependencies.createAuthorizationReview(proxyConfig); - const requestNamespaceListPermissions = this.dependencies.requestNamespaceListPermissionsFor(proxyConfig); + runInAction(() => { + this.metadata = { + ...this.metadata, + ...newMetadata, + }; + }); + } - this.isAdmin = await canI({ - namespace: "kube-system", - resource: "*", - verb: "create", - }); - this.isGlobalWatchEnabled = await canI({ - verb: "watch", - resource: "*", - }); - this.allowedNamespaces.replace(await this.requestAllowedNamespaces(proxyConfig)); - this.knownResources.replace(await this.dependencies.requestApiResources(this)); - this.allowedResources.replace(await this.getAllowedResources(requestNamespaceListPermissions)); - this.ready = true; - } + /** + * @internal + */ + private async refreshAccessibility(): Promise { + this.dependencies.logger.info(`[CLUSTER]: refreshAccessibility`, this.getMeta()); + const proxyConfig = await this.getProxyKubeconfig(); + const canI = this.dependencies.createAuthorizationReview(proxyConfig); + const requestNamespaceListPermissions = this.dependencies.requestNamespaceListPermissionsFor(proxyConfig); + + this.isAdmin = await canI({ + namespace: "kube-system", + resource: "*", + verb: "create", + }); + this.isGlobalWatchEnabled = await canI({ + verb: "watch", + resource: "*", + }); + this.allowedNamespaces.replace(await this.requestAllowedNamespaces(proxyConfig)); + this.knownResources.replace(await this.dependencies.requestApiResources(this)); + this.allowedResources.replace(await this.getAllowedResources(requestNamespaceListPermissions)); + this.ready = true; + } /** * @internal */ @action - async refreshConnectionStatus() { - const connectionStatus = await this.getConnectionStatus(); + async refreshConnectionStatus() { + const connectionStatus = await this.getConnectionStatus(); - this.online = connectionStatus > ClusterStatus.Offline; - this.accessible = connectionStatus == ClusterStatus.AccessGranted; - } + this.online = connectionStatus > ClusterStatus.Offline; + this.accessible = connectionStatus == ClusterStatus.AccessGranted; + } async getKubeconfig(): Promise { const { config } = await this.dependencies.loadConfigfromFile(this.kubeConfigPath); @@ -521,8 +525,7 @@ export class Cluster implements ClusterModel { protected async getConnectionStatus(): Promise { try { - const versionDetector = this.dependencies.createVersionDetector(this); - const versionData = await versionDetector.detect(); + const versionData = await this.dependencies.clusterVersionDetector.detect(this); this.metadata.version = versionData.value; @@ -560,6 +563,8 @@ export class Cluster implements ClusterModel { const message = String(error.error || error.message) || String(error); this.broadcastConnectUpdate(message, true); + } else if (error instanceof Error || typeof error === "string") { + this.broadcastConnectUpdate(`${error}`, true); } else { this.broadcastConnectUpdate("Unknown error has occurred", true); } @@ -652,7 +657,7 @@ export class Cluster implements ClusterModel { const namespaceList = [ctx?.namespace].filter(isDefined); if (namespaceList.length === 0 && error instanceof HttpError && error.statusCode === 403) { - const { response } = error as HttpError & { response: Response }; + const { response } = error as HttpError & { response: { body: unknown }}; this.dependencies.logger.info("[CLUSTER]: listing namespaces is forbidden, broadcasting", { clusterId: this.id, error: response.body }); this.dependencies.broadcastMessage(clusterListNamespaceForbiddenChannel, this.id); diff --git a/packages/core/src/common/fetch/lens-fetch.global-override-for-injectable.ts b/packages/core/src/common/fetch/lens-fetch.global-override-for-injectable.ts new file mode 100644 index 0000000000..0bc144b1be --- /dev/null +++ b/packages/core/src/common/fetch/lens-fetch.global-override-for-injectable.ts @@ -0,0 +1,9 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getGlobalOverrideForFunction } from "../test-utils/get-global-override-for-function"; +import lensFetchInjectable from "./lens-fetch.injectable"; + +export default getGlobalOverrideForFunction(lensFetchInjectable); diff --git a/packages/core/src/common/fetch/lens-fetch.injectable.ts b/packages/core/src/common/fetch/lens-fetch.injectable.ts new file mode 100644 index 0000000000..a90818e6cb --- /dev/null +++ b/packages/core/src/common/fetch/lens-fetch.injectable.ts @@ -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 { Agent } from "https"; +import type { RequestInit, Response } from "node-fetch"; +import lensProxyPortInjectable from "../../main/lens-proxy/lens-proxy-port.injectable"; +import lensProxyCertificateInjectable from "../certificate/lens-proxy-certificate.injectable"; +import nodeFetchModuleInjectable from "./fetch-module.injectable"; + +export type LensRequestInit = Omit; + +export type LensFetch = (pathnameAndQuery: string, init?: LensRequestInit) => Promise; + +const lensFetchInjectable = getInjectable({ + id: "lens-fetch", + instantiate: (di): LensFetch => { + const { default: fetch } = di.inject(nodeFetchModuleInjectable); + const lensProxyPort = di.inject(lensProxyPortInjectable); + const lensProxyCertificate = di.inject(lensProxyCertificateInjectable); + + return async (pathnameAndQuery, init = {}) => { + const agent = new Agent({ + ca: lensProxyCertificate.get().cert, + }); + + return fetch(`https://127.0.0.1:${lensProxyPort.get()}${pathnameAndQuery}`, { + ...init, + agent, + }); + }; + }, + causesSideEffects: true, +}); + +export default lensFetchInjectable; diff --git a/packages/core/src/common/front-end-routing/app-navigation-channel.ts b/packages/core/src/common/front-end-routing/app-navigation-channel.ts index e0b881eff9..b3d8f02c66 100644 --- a/packages/core/src/common/front-end-routing/app-navigation-channel.ts +++ b/packages/core/src/common/front-end-routing/app-navigation-channel.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { IpcRendererNavigationEvents } from "../../renderer/navigation/events"; +import { IpcRendererNavigationEvents } from "../ipc/navigation-events"; import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token"; export type AppNavigationChannel = MessageChannel; diff --git a/packages/core/src/common/front-end-routing/cluster-frame-navigation-channel.ts b/packages/core/src/common/front-end-routing/cluster-frame-navigation-channel.ts index 9d9a1904af..2439f523e2 100644 --- a/packages/core/src/common/front-end-routing/cluster-frame-navigation-channel.ts +++ b/packages/core/src/common/front-end-routing/cluster-frame-navigation-channel.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { IpcRendererNavigationEvents } from "../../renderer/navigation/events"; +import { IpcRendererNavigationEvents } from "../ipc/navigation-events"; import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token"; export type ClusterFrameNavigationChannel = MessageChannel; diff --git a/packages/core/src/common/ipc/ipc-main-injection-token.ts b/packages/core/src/common/ipc/ipc-main-injection-token.ts new file mode 100644 index 0000000000..932c700c97 --- /dev/null +++ b/packages/core/src/common/ipc/ipc-main-injection-token.ts @@ -0,0 +1,12 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { IpcMain } from "electron"; + +const ipcMainInjectionToken = getInjectionToken({ + id: "ipc-main-injection-token", +}); + +export default ipcMainInjectionToken; diff --git a/packages/core/src/common/ipc/ipc.ts b/packages/core/src/common/ipc/ipc.ts index f11227d17e..e84fcfec56 100644 --- a/packages/core/src/common/ipc/ipc.ts +++ b/packages/core/src/common/ipc/ipc.ts @@ -12,17 +12,17 @@ import { toJS } from "../utils/toJS"; import type { ClusterFrameInfo } from "../cluster-frames"; import { clusterFrameMap } from "../cluster-frames"; import type { Disposer } from "../utils"; -import ipcMainInjectable from "../../main/utils/channel/ipc-main/ipc-main.injectable"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable"; import loggerInjectable from "../logger.injectable"; +import ipcMainInjectionToken from "./ipc-main-injection-token"; export const broadcastMainChannel = "ipc:broadcast-main"; export function ipcMainHandle(channel: string, listener: (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any) { const di = getLegacyGlobalDiForExtensionApi(); - const ipcMain = di.inject(ipcMainInjectable); + const ipcMain = di.inject(ipcMainInjectionToken); ipcMain.handle(channel, async (event, ...args) => { return sanitizePayload(await listener(event, ...args)); @@ -90,7 +90,7 @@ export async function broadcastMessage(channel: string, ...args: any[]): Promise export function ipcMainOn(channel: string, listener: (event: Electron.IpcMainEvent, ...args: any[]) => any): Disposer { const di = getLegacyGlobalDiForExtensionApi(); - const ipcMain = di.inject(ipcMainInjectable); + const ipcMain = di.inject(ipcMainInjectionToken); ipcMain.on(channel, listener); diff --git a/packages/core/src/renderer/navigation/events.ts b/packages/core/src/common/ipc/navigation-events.ts similarity index 100% rename from packages/core/src/renderer/navigation/events.ts rename to packages/core/src/common/ipc/navigation-events.ts diff --git a/packages/core/src/common/utils/type-narrowing.ts b/packages/core/src/common/utils/type-narrowing.ts index 41552c3136..68d5265237 100644 --- a/packages/core/src/common/utils/type-narrowing.ts +++ b/packages/core/src/common/utils/type-narrowing.ts @@ -130,7 +130,7 @@ export function isFunction(val: unknown): val is (...args: unknown[]) => unknown /** * Checks if the value in the second position is non-nullable */ -export function hasDefinedTupleValue(pair: [K, V | undefined | null]): pair is [K, V] { +export function hasDefinedTupleValue(pair: readonly [K, V | undefined | null]): pair is [K, V] { return pair[1] != null; } diff --git a/packages/core/src/common/vars/extension-api-version.global-override-for-injectable.ts b/packages/core/src/common/vars/extension-api-version.global-override-for-injectable.ts new file mode 100644 index 0000000000..6d473eb1de --- /dev/null +++ b/packages/core/src/common/vars/extension-api-version.global-override-for-injectable.ts @@ -0,0 +1,9 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getGlobalOverride } from "../test-utils/get-global-override"; +import extensionApiVersionInjectable from "./extension-api-version.injectable"; + +export default getGlobalOverride(extensionApiVersionInjectable, () => "6.0.0"); diff --git a/packages/core/src/common/vars/extension-api-version.injectable.ts b/packages/core/src/common/vars/extension-api-version.injectable.ts index 9b84cf1177..d4ddb92f00 100644 --- a/packages/core/src/common/vars/extension-api-version.injectable.ts +++ b/packages/core/src/common/vars/extension-api-version.injectable.ts @@ -4,15 +4,16 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { SemVer } from "semver"; -import applicationInformationToken from "./application-information-token"; +import packageJson from "../../../package.json"; const extensionApiVersionInjectable = getInjectable({ id: "extension-api-version", - instantiate: (di) => { - const { major, minor, patch } = new SemVer(di.inject(applicationInformationToken).version); + instantiate: () => { + const { major, minor, patch } = new SemVer(packageJson.version); return `${major}.${minor}.${patch}`; }, + causesSideEffects: true, }); export default extensionApiVersionInjectable; diff --git a/packages/core/src/extensions/common-api/k8s-api.ts b/packages/core/src/extensions/common-api/k8s-api.ts index c24f7d14e3..d4b0ab673f 100644 --- a/packages/core/src/extensions/common-api/k8s-api.ts +++ b/packages/core/src/extensions/common-api/k8s-api.ts @@ -27,6 +27,11 @@ import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-exten import maybeKubeApiInjectable from "../../common/k8s-api/maybe-kube-api.injectable"; import { DeploymentApi as InternalDeploymentApi, IngressApi as InternalIngressApi, NodeApi, PersistentVolumeClaimApi, PodApi } from "../../common/k8s-api/endpoints"; import { storesAndApisCanBeCreatedInjectionToken } from "../../common/k8s-api/stores-apis-can-be-created.token"; +import type { JsonApiConfig } from "../../common/k8s-api/json-api"; +import type { KubeJsonApi as InternalKubeJsonApi } from "../../common/k8s-api/kube-json-api"; +import createKubeJsonApiInjectable from "../../common/k8s-api/create-kube-json-api.injectable"; +import type { RequestInit } from "node-fetch"; +import createKubeJsonApiForClusterInjectable from "../../common/k8s-api/create-kube-json-api-for-cluster.injectable"; export const apiManager = asLegacyGlobalForExtensionApi(apiManagerInjectable); export const forCluster = asLegacyGlobalFunctionForExtensionApi(createKubeApiForClusterInjectable); @@ -59,6 +64,11 @@ function KubeApiCstr< return api; } +export type KubeApi< + Object extends KubeObject = KubeObject, + Data extends KubeJsonApiDataFor = KubeJsonApiDataFor, +> = InternalKubeApi; + export const KubeApi = KubeApiCstr as unknown as new< Object extends KubeObject = KubeObject, Data extends KubeJsonApiDataFor = KubeJsonApiDataFor, @@ -107,11 +117,26 @@ export { type KubeStatusData, } from "../../common/k8s-api/kube-object"; -export { - KubeJsonApi, - type KubeJsonApiData, +export type { + KubeJsonApiData, } from "../../common/k8s-api/kube-json-api"; +function KubeJsonApiCstr(config: JsonApiConfig, reqInit?: RequestInit) { + const di = getLegacyGlobalDiForExtensionApi(); + const createKubeJsonApi = di.inject(createKubeJsonApiInjectable); + + return createKubeJsonApi(config, reqInit); +} + +export type KubeJsonApi = InternalKubeJsonApi; + +export const KubeJsonApi = Object.assign( + KubeJsonApiCstr as unknown as new (config: JsonApiConfig, reqInit?: RequestInit) => InternalKubeJsonApi, + { + forCluster: asLegacyGlobalForExtensionApi(createKubeJsonApiForClusterInjectable), + }, +); + export abstract class KubeObjectStore< K extends KubeObject = KubeObject, A extends InternalKubeApi = InternalKubeApi>, @@ -186,30 +211,35 @@ function PodsApiConstructor(opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions return new PodApi(getKubeApiDeps(), opts); } +export type PodsApi = PodApi; export const PodsApi = PodsApiConstructor as unknown as new (opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions) => PodApi; function NodesApiConstructor(opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions) { return new NodeApi(getKubeApiDeps(), opts); } +export type NodesApi = NodeApi; export const NodesApi = NodesApiConstructor as unknown as new (opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions) => NodeApi; function DeploymentApiConstructor(opts?: DerivedKubeApiOptions) { return new InternalDeploymentApi(getKubeApiDeps(), opts); } +export type DeploymentApi = InternalDeploymentApi; export const DeploymentApi = DeploymentApiConstructor as unknown as new (opts?: DerivedKubeApiOptions) => InternalDeploymentApi; function IngressApiConstructor(opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions) { return new InternalIngressApi(getKubeApiDeps(), opts); } +export type IngressApi = InternalIngressApi; export const IngressApi = IngressApiConstructor as unknown as new (opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions) => InternalIngressApi; function PersistentVolumeClaimsApiConstructor(opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions) { return new PersistentVolumeClaimApi(getKubeApiDeps(), opts); } +export type PersistentVolumeClaimsApi = PersistentVolumeClaimApi; export const PersistentVolumeClaimsApi = PersistentVolumeClaimsApiConstructor as unknown as new (opts?: DerivedKubeApiOptions & IgnoredKubeApiOptions) => PersistentVolumeClaimApi; export { diff --git a/packages/core/src/extensions/renderer-api/components.ts b/packages/core/src/extensions/renderer-api/components.ts index dc8c52053d..e4102433bf 100644 --- a/packages/core/src/extensions/renderer-api/components.ts +++ b/packages/core/src/extensions/renderer-api/components.ts @@ -73,14 +73,14 @@ export * from "../../renderer/components/dialog"; export * from "../../renderer/components/line-progress"; export * from "../../renderer/components/menu"; -export type { - CreateNotificationOptions, - Notification, - NotificationId, - NotificationMessage, +export { NotificationStatus, - ShowNotification, - NotificationsStore, + type CreateNotificationOptions, + type Notification, + type NotificationId, + type NotificationMessage, + type ShowNotification, + type NotificationsStore, } from "../../renderer/components/notifications"; export const Notifications = { diff --git a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap index 5f9f15db46..71d807a43d 100644 --- a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap +++ b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap @@ -54,21 +54,6 @@ exports[`disable kube object detail items when cluster is not relevant given ext
-
- - Created - - - <unknown> - ago - -
@@ -104,12 +89,17 @@ exports[`disable kube object detail items when cluster is not relevant given ext
Events
+
+ No events found +
@@ -680,21 +670,6 @@ exports[`disable kube object detail items when cluster is not relevant given ext
-
- - Created - - - <unknown> - ago - -
@@ -725,12 +700,17 @@ exports[`disable kube object detail items when cluster is not relevant given ext
Events
+
+ No events found +
@@ -1301,21 +1281,6 @@ exports[`disable kube object detail items when cluster is not relevant given not
-
- - Created - - - <unknown> - ago - -
@@ -1346,12 +1311,17 @@ exports[`disable kube object detail items when cluster is not relevant given not
Events
+
+ No events found +
diff --git a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap index b6c14ca470..9222e8a538 100644 --- a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap +++ b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap @@ -54,21 +54,6 @@ exports[`reactively hide kube object detail item renders 1`] = `
-
- - Created - - - <unknown> - ago - -
@@ -99,12 +84,17 @@ exports[`reactively hide kube object detail item renders 1`] = `
Events
+
+ No events found +
@@ -675,21 +665,6 @@ exports[`reactively hide kube object detail item when the item is shown renders
-
- - Created - - - <unknown> - ago - -
@@ -725,12 +700,17 @@ exports[`reactively hide kube object detail item when the item is shown renders
Events
+
+ No events found +
diff --git a/packages/core/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap b/packages/core/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap index 0aaff6db77..9e3eaf6f93 100644 --- a/packages/core/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap +++ b/packages/core/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap @@ -1375,11 +1375,17 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
- my-second-namespace - +
+
+ Set global namespace filter to: + + my-second-namespace + +
- my-second-namespace - +
+
+ Set global namespace filter to: + + my-second-namespace + +
- my-second-namespace - +
+
+ Set global namespace filter to: + + my-second-namespace + +
- my-second-namespace - +
+
+ Set global namespace filter to: + + my-second-namespace + +
- my-second-namespace - +
+
+ Set global namespace filter to: + + my-second-namespace + +
- my-second-namespace - +
+
+ Set global namespace filter to: + + my-second-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
- some-namespace - +
+
+ Set global namespace filter to: + + some-namespace + +
- some-other-namespace - +
+
+ Set global namespace filter to: + + some-other-namespace + +
RobotoMono diff --git a/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx b/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx index 14bc5efacd..cdd7a96633 100644 --- a/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx +++ b/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx @@ -5,66 +5,30 @@ import React from "react"; import { SubTitle } from "../../../../../../renderer/components/layout/sub-title"; import { withInjectables } from "@ogre-tools/injectable-react"; -import type { UserStore } from "../../../../../../common/user-store"; -import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable"; import { observer } from "mobx-react"; -import type { SelectOption } from "../../../../../../renderer/components/select"; import { Select } from "../../../../../../renderer/components/select"; -import type { Logger } from "../../../../../../common/logger"; -import { action } from "mobx"; -import loggerInjectable from "../../../../../../common/logger.injectable"; +import type { TerminalFontPreferencePresenter } from "./terminal-font-options.injectable"; +import terminalFontPreferencePresenterInjectable from "./terminal-font-options.injectable"; interface Dependencies { - userStore: UserStore; - logger: Logger; + model: TerminalFontPreferencePresenter; } -const NonInjectedTerminalFontFamily = observer( - ({ userStore, logger }: Dependencies) => { +const NonInjectedTerminalFontFamily = observer(({ model }: Dependencies) => ( +
+ + -
- ); - }, -); - -export const TerminalFontFamily = withInjectables( - NonInjectedTerminalFontFamily, - - { - getProps: (di) => ({ - userStore: di.inject(userStoreInjectable), - logger: di.inject(loggerInjectable), - }), - }, -); +export const TerminalFontFamily = withInjectables(NonInjectedTerminalFontFamily, { + getProps: (di) => ({ + model: di.inject(terminalFontPreferencePresenterInjectable), + }), +}); diff --git a/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-options.injectable.tsx b/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-options.injectable.tsx new file mode 100644 index 0000000000..3d6a0d2ae0 --- /dev/null +++ b/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-options.injectable.tsx @@ -0,0 +1,50 @@ +/** + * 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 type { IComputedValue } from "mobx"; +import { action, computed } from "mobx"; +import React from "react"; +import type { SingleValue } from "react-select"; +import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable"; +import { defaultTerminalFontFamily } from "../../../../../../common/vars"; +import type { SelectOption } from "../../../../../../renderer/components/select"; +import { terminalFontInjectionToken } from "../../../../../terminal/renderer/fonts/token"; + +export interface TerminalFontPreferencePresenter { + readonly options: IComputedValue[]>; + readonly current: IComputedValue; + onSelection: (selection: SingleValue>) => void; +} + +const terminalFontPreferencePresenterInjectable = getInjectable({ + id: "terminal-font-preference-presenter", + instantiate: (di): TerminalFontPreferencePresenter => { + const userStore = di.inject(userStoreInjectable); + const terminalFonts = di.injectMany(terminalFontInjectionToken); + + return { + options: computed(() => terminalFonts.map(font => ({ + label: ( + + {font.name} + + ), + value: font.name, + isSelected: userStore.terminalConfig.fontFamily === font.name, + }))), + current: computed(() => userStore.terminalConfig.fontFamily), + onSelection: action(selection => { + userStore.terminalConfig.fontFamily = selection?.value ?? defaultTerminalFontFamily; + }), + }; + }, +}); + +export default terminalFontPreferencePresenterInjectable; diff --git a/packages/core/src/renderer/fonts/AnonymousPro-Regular.ttf b/packages/core/src/features/terminal/renderer/fonts/AnonymousPro-Regular.ttf similarity index 100% rename from packages/core/src/renderer/fonts/AnonymousPro-Regular.ttf rename to packages/core/src/features/terminal/renderer/fonts/AnonymousPro-Regular.ttf diff --git a/packages/core/src/renderer/fonts/IBMPlexMono-Regular.ttf b/packages/core/src/features/terminal/renderer/fonts/IBMPlexMono-Regular.ttf similarity index 100% rename from packages/core/src/renderer/fonts/IBMPlexMono-Regular.ttf rename to packages/core/src/features/terminal/renderer/fonts/IBMPlexMono-Regular.ttf diff --git a/packages/core/src/renderer/fonts/JetBrainsMono-Regular.ttf b/packages/core/src/features/terminal/renderer/fonts/JetBrainsMono-Regular.ttf similarity index 100% rename from packages/core/src/renderer/fonts/JetBrainsMono-Regular.ttf rename to packages/core/src/features/terminal/renderer/fonts/JetBrainsMono-Regular.ttf diff --git a/packages/core/src/renderer/fonts/RedHatMono-Regular.ttf b/packages/core/src/features/terminal/renderer/fonts/RedHatMono-Regular.ttf similarity index 100% rename from packages/core/src/renderer/fonts/RedHatMono-Regular.ttf rename to packages/core/src/features/terminal/renderer/fonts/RedHatMono-Regular.ttf diff --git a/packages/core/src/renderer/fonts/Roboto-Mono-nerd.ttf b/packages/core/src/features/terminal/renderer/fonts/Roboto-Mono.ttf similarity index 100% rename from packages/core/src/renderer/fonts/Roboto-Mono-nerd.ttf rename to packages/core/src/features/terminal/renderer/fonts/Roboto-Mono.ttf diff --git a/packages/core/src/renderer/fonts/SourceCodePro-Regular.ttf b/packages/core/src/features/terminal/renderer/fonts/SourceCodePro-Regular.ttf similarity index 100% rename from packages/core/src/renderer/fonts/SourceCodePro-Regular.ttf rename to packages/core/src/features/terminal/renderer/fonts/SourceCodePro-Regular.ttf diff --git a/packages/core/src/renderer/fonts/SpaceMono-Regular.ttf b/packages/core/src/features/terminal/renderer/fonts/SpaceMono-Regular.ttf similarity index 100% rename from packages/core/src/renderer/fonts/SpaceMono-Regular.ttf rename to packages/core/src/features/terminal/renderer/fonts/SpaceMono-Regular.ttf diff --git a/packages/core/src/renderer/fonts/UbuntuMono-Regular.ttf b/packages/core/src/features/terminal/renderer/fonts/UbuntuMono-Regular.ttf similarity index 100% rename from packages/core/src/renderer/fonts/UbuntuMono-Regular.ttf rename to packages/core/src/features/terminal/renderer/fonts/UbuntuMono-Regular.ttf diff --git a/packages/core/src/features/terminal/renderer/fonts/anonymous-pro.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/anonymous-pro.injectable.ts new file mode 100644 index 0000000000..d0a671e5bd --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/anonymous-pro.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import AnonymousPro from "./AnonymousPro-Regular.ttf"; + +const anonymousProTerminalFontInjectable = getInjectable({ + id: "anonymous-pro-terminal-font", + instantiate: () => ({ + name:"Anonymous Pro", + url: AnonymousPro, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default anonymousProTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/fonts.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/fonts.injectable.ts new file mode 100644 index 0000000000..2c8dc1d57a --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/fonts.injectable.ts @@ -0,0 +1,13 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; + +const terminalFontsInjectable = getInjectable({ + id: "terminal-fonts", + instantiate: (di) => di.injectMany(terminalFontInjectionToken), +}); + +export default terminalFontsInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/ibm-plex-mono.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/ibm-plex-mono.injectable.ts new file mode 100644 index 0000000000..b75440adbc --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/ibm-plex-mono.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import IBMPlexMono from "./IBMPlexMono-Regular.ttf"; + +const ibmPlexMonoTerminalFontInjectable = getInjectable({ + id: "ibm-plex-mono-terminal-font", + instantiate: () => ({ + name: "IBM Plex Mono", + url: IBMPlexMono, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default ibmPlexMonoTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/jetbrains-mono.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/jetbrains-mono.injectable.ts new file mode 100644 index 0000000000..c86d93d55a --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/jetbrains-mono.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import JetBrainsMono from "./JetBrainsMono-Regular.ttf"; + +const jetbrainsMonoTerminalFontInjectable = getInjectable({ + id: "jetbrains-mono-terminal-font", + instantiate: () => ({ + name: "JetBrains Mono", + url: JetBrainsMono, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default jetbrainsMonoTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/load-font.global-override-for-injectable.ts b/packages/core/src/features/terminal/renderer/fonts/load-font.global-override-for-injectable.ts new file mode 100644 index 0000000000..0d1b23bfde --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/load-font.global-override-for-injectable.ts @@ -0,0 +1,9 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getGlobalOverride } from "../../../../common/test-utils/get-global-override"; +import loadTerminalFontInjectable from "./load-font.injectable"; + +export default getGlobalOverride(loadTerminalFontInjectable, () => async () => {}); diff --git a/packages/core/src/features/terminal/renderer/fonts/load-font.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/load-font.injectable.ts new file mode 100644 index 0000000000..920042e5df --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/load-font.injectable.ts @@ -0,0 +1,27 @@ +/** + * 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 type { TerminalFont } from "./token"; + +export type LoadTerminalFont = (font: TerminalFont) => Promise; + +const loadTerminalFontInjectable = getInjectable({ + id: "load-terminal-font", + instantiate: (): LoadTerminalFont => async (font) => { + const fontLoaded = document.fonts.check(`10px ${font.name}`); + + if (fontLoaded) { + return; + } + + const fontFace = new FontFace(font.name, `url(${font.url})`); + + document.fonts.add(fontFace); + await fontFace.load(); + }, + causesSideEffects: true, +}); + +export default loadTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/preload-fonts.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/preload-fonts.injectable.ts new file mode 100644 index 0000000000..64c40247b7 --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/preload-fonts.injectable.ts @@ -0,0 +1,24 @@ +/** + * 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 { beforeFrameStartsFirstInjectionToken } from "../../../../renderer/before-frame-starts/tokens"; +import terminalFontsInjectable from "./fonts.injectable"; +import loadTerminalFontInjectable from "./load-font.injectable"; + +const preloadTerminalFontsInjectable = getInjectable({ + id: "preload-terminal-fonts", + instantiate: (di) => ({ + id: "preload-terminal-fonts", + run: async () => { + const terminalFonts = di.inject(terminalFontsInjectable); + const loadTerminalFont = di.inject(loadTerminalFontInjectable); + + await Promise.allSettled(terminalFonts.map(loadTerminalFont)); + }, + }), + injectionToken: beforeFrameStartsFirstInjectionToken, +}); + +export default preloadTerminalFontsInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/red-hat-mono.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/red-hat-mono.injectable.ts new file mode 100644 index 0000000000..4229bc8d1d --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/red-hat-mono.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import RedHatMono from "./RedHatMono-Regular.ttf"; + +const redHatMonoTerminalFontInjectable = getInjectable({ + id: "red-hat-mono-terminal-font", + instantiate: () => ({ + name: "Red Hat Mono", + url: RedHatMono, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default redHatMonoTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/roboto-mono.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/roboto-mono.injectable.ts new file mode 100644 index 0000000000..e3aa188486 --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/roboto-mono.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import RobotoMono from "./Roboto-Mono.ttf"; // patched font with icons + +const robotoMonoTerminalFontInjectable = getInjectable({ + id: "roboto-mono-terminal-font", + instantiate: () => ({ + name: "RobotoMono", + url: RobotoMono, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default robotoMonoTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/source-code-pro.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/source-code-pro.injectable.ts new file mode 100644 index 0000000000..8b84a275f3 --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/source-code-pro.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import SourceCodePro from "./SourceCodePro-Regular.ttf"; + +const sourceCodeProTerminalFontInjectable = getInjectable({ + id: "source-code-pro-terminal-font", + instantiate: () => ({ + name: "Source Code Pro", + url: SourceCodePro, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default sourceCodeProTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/space-mono.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/space-mono.injectable.ts new file mode 100644 index 0000000000..ea2df1c72e --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/space-mono.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import SpaceMono from "./SpaceMono-Regular.ttf"; + +const spaceMonoTerminalFontInjectable = getInjectable({ + id: "space-mono-terminal-font", + instantiate: () => ({ + name: "Space Mono", + url: SpaceMono, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default spaceMonoTerminalFontInjectable; diff --git a/packages/core/src/features/terminal/renderer/fonts/token.ts b/packages/core/src/features/terminal/renderer/fonts/token.ts new file mode 100644 index 0000000000..8f90d400e2 --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/token.ts @@ -0,0 +1,15 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getInjectionToken } from "@ogre-tools/injectable"; + +export interface TerminalFont { + name: string; + url: string; +} + +export const terminalFontInjectionToken = getInjectionToken({ + id: "terminal-font-token", +}); diff --git a/packages/core/src/features/terminal/renderer/fonts/ubuntu-mono.injectable.ts b/packages/core/src/features/terminal/renderer/fonts/ubuntu-mono.injectable.ts new file mode 100644 index 0000000000..ab8ffb7b78 --- /dev/null +++ b/packages/core/src/features/terminal/renderer/fonts/ubuntu-mono.injectable.ts @@ -0,0 +1,18 @@ +/** + * 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 { terminalFontInjectionToken } from "./token"; +import UbuntuMono from "./UbuntuMono-Regular.ttf"; + +const ubunutuMonoTerminalFontInjectable = getInjectable({ + id: "ubunutu-mono-terminal-font", + instantiate: () => ({ + name: "Ubuntu Mono", + url: UbuntuMono, + }), + injectionToken: terminalFontInjectionToken, +}); + +export default ubunutuMonoTerminalFontInjectable; diff --git a/packages/core/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts b/packages/core/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts index 6be9826c98..bdcd3034d3 100644 --- a/packages/core/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts +++ b/packages/core/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts @@ -4,11 +4,11 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { reaction } from "mobx"; +import ipcMainInjectionToken from "../../common/ipc/ipc-main-injection-token"; import { catalogInitChannel } from "../../common/ipc/catalog"; import { disposer, toJS } from "../../common/utils"; import { getStartableStoppable } from "../../common/utils/get-startable-stoppable"; import catalogEntityRegistryInjectable from "../catalog/entity-registry.injectable"; -import ipcMainInjectable from "../utils/channel/ipc-main/ipc-main.injectable"; import catalogSyncBroadcasterInjectable from "./broadcaster.injectable"; const catalogSyncToRendererInjectable = getInjectable({ @@ -16,7 +16,7 @@ const catalogSyncToRendererInjectable = getInjectable({ instantiate: (di) => { const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable); - const ipcMain = di.inject(ipcMainInjectable); + const ipcMain = di.inject(ipcMainInjectionToken); const catalogSyncBroadcaster = di.inject(catalogSyncBroadcasterInjectable); return getStartableStoppable( diff --git a/packages/core/src/main/cluster-detectors/base-cluster-detector.ts b/packages/core/src/main/cluster-detectors/base-cluster-detector.ts deleted file mode 100644 index 1aca321dfe..0000000000 --- a/packages/core/src/main/cluster-detectors/base-cluster-detector.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import type { RequestPromiseOptions } from "request-promise-native"; -import type { Cluster } from "../../common/cluster/cluster"; -import type { K8sRequest } from "../k8s-request.injectable"; - -export interface ClusterDetectionResult { - value: string | number | boolean; - accuracy: number; -} - -export abstract class BaseClusterDetector { - abstract readonly key: string; - - constructor(public readonly cluster: Cluster, private _k8sRequest: K8sRequest) {} - - abstract detect(): Promise; - - protected async k8sRequest(path: string, options: RequestPromiseOptions = {}): Promise { - return this._k8sRequest(this.cluster, path, options); - } -} diff --git a/packages/core/src/main/cluster-detectors/cluster-distribution-detector.injectable.ts b/packages/core/src/main/cluster-detectors/cluster-distribution-detector.injectable.ts new file mode 100644 index 0000000000..7a13c62515 --- /dev/null +++ b/packages/core/src/main/cluster-detectors/cluster-distribution-detector.injectable.ts @@ -0,0 +1,141 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { clusterMetadataDetectorInjectionToken } from "./token"; +import { ClusterMetadataKey } from "../../common/cluster-types"; +import { getInjectable } from "@ogre-tools/injectable"; +import k8SRequestInjectable from "../k8s-request.injectable"; +import type { Cluster } from "../../common/cluster/cluster"; +import requestClusterVersionInjectable from "./request-cluster-version.injectable"; + +const isGKE = (version: string) => version.includes("gke"); +const isEKS = (version: string) => version.includes("eks"); +const isIKS = (version: string) => version.includes("IKS"); +const isAKS = (cluster: Cluster) => cluster.apiUrl.includes("azmk8s.io"); +const isMirantis = (version: string) => version.includes("-mirantis-") || version.includes("-docker-"); +const isDigitalOcean = (cluster: Cluster) => cluster.apiUrl.endsWith("k8s.ondigitalocean.com"); +const isMinikube = (cluster: Cluster) => cluster.contextName.startsWith("minikube"); +const isMicrok8s = (cluster: Cluster) => cluster.contextName.startsWith("microk8s"); +const isKind = (cluster: Cluster) => cluster.contextName.startsWith("kubernetes-admin@kind-"); +const isDockerDesktop = (cluster: Cluster) => cluster.contextName === "docker-desktop"; +const isTke = (version: string) => version.includes("-tke."); +const isCustom = (version: string) => version.includes("+"); +const isVMWare = (version: string) => version.includes("+vmware"); +const isRke = (version: string) => version.includes("-rancher"); +const isRancherDesktop = (cluster: Cluster) => cluster.contextName === "rancher-desktop"; +const isK3s = (version: string) => version.includes("+k3s"); +const isK0s = (version: string) => version.includes("-k0s") || version.includes("+k0s"); +const isAlibaba = (version: string) => version.includes("-aliyun"); +const isHuawei = (version: string) => version.includes("-CCE"); + +const clusterDistributionDetectorInjectable = getInjectable({ + id: "cluster-distribution-detector", + instantiate: (di) => { + const k8sRequest = di.inject(k8SRequestInjectable); + const requestClusterVersion = di.inject(requestClusterVersionInjectable); + const isOpenshift = async (cluster: Cluster) => { + try { + const { paths = [] } = await k8sRequest(cluster, "") as { paths?: string[] }; + + return paths.includes("/apis/project.openshift.io"); + } catch (e) { + return false; + } + }; + + return { + key: ClusterMetadataKey.DISTRIBUTION, + detect: async (cluster) => { + const version = await requestClusterVersion(cluster); + + if (isRke(version)) { + return { value: "rke", accuracy: 80 }; + } + + if (isRancherDesktop(cluster)) { + return { value: "rancher-desktop", accuracy: 80 }; + } + + if (isK3s(version)) { + return { value: "k3s", accuracy: 80 }; + } + + if (isGKE(version)) { + return { value: "gke", accuracy: 80 }; + } + + if (isEKS(version)) { + return { value: "eks", accuracy: 80 }; + } + + if (isIKS(version)) { + return { value: "iks", accuracy: 80 }; + } + + if (isAKS(cluster)) { + return { value: "aks", accuracy: 80 }; + } + + if (isDigitalOcean(cluster)) { + return { value: "digitalocean", accuracy: 90 }; + } + + if (isK0s(version)) { + return { value: "k0s", accuracy: 80 }; + } + + if (isVMWare(version)) { + return { value: "vmware", accuracy: 90 }; + } + + if (isMirantis(version)) { + return { value: "mirantis", accuracy: 90 }; + } + + if (isAlibaba(version)) { + return { value: "alibaba", accuracy: 90 }; + } + + if (isHuawei(version)) { + return { value: "huawei", accuracy: 90 }; + } + + if (isTke(version)) { + return { value: "tencent", accuracy: 90 }; + } + + if (isMinikube(cluster)) { + return { value: "minikube", accuracy: 80 }; + } + + if (isMicrok8s(cluster)) { + return { value: "microk8s", accuracy: 80 }; + } + + if (isKind(cluster)) { + return { value: "kind", accuracy: 70 }; + } + + if (isDockerDesktop(cluster)) { + return { value: "docker-desktop", accuracy: 80 }; + } + + if (isCustom(version)) { + if (await isOpenshift(cluster)) { + return { value: "openshift", accuracy: 90 }; + } + + return { value: "custom", accuracy: 10 }; + } + + return { value: "unknown", accuracy: 10 }; + }, + }; + }, + injectionToken: clusterMetadataDetectorInjectionToken, +}); + +export default clusterDistributionDetectorInjectable; + diff --git a/packages/core/src/main/cluster-detectors/cluster-id-detector.injectable.ts b/packages/core/src/main/cluster-detectors/cluster-id-detector.injectable.ts new file mode 100644 index 0000000000..8d7a90fedc --- /dev/null +++ b/packages/core/src/main/cluster-detectors/cluster-id-detector.injectable.ts @@ -0,0 +1,43 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { clusterMetadataDetectorInjectionToken } from "./token"; +import { createHash } from "crypto"; +import { ClusterMetadataKey } from "../../common/cluster-types"; +import { getInjectable } from "@ogre-tools/injectable"; +import k8SRequestInjectable from "../k8s-request.injectable"; +import type { Cluster } from "../../common/cluster/cluster"; + +const clusterIdDetectorFactoryInjectable = getInjectable({ + id: "cluster-id-detector-factory", + instantiate: (di) => { + const k8sRequest = di.inject(k8SRequestInjectable); + const getDefaultNamespaceId = async (cluster: Cluster) => { + const { metadata } = await k8sRequest(cluster, "/api/v1/namespaces/default") as { metadata: { uid: string }}; + + return metadata.uid; + }; + + return { + key: ClusterMetadataKey.CLUSTER_ID, + detect: async (cluster) => { + let id: string; + + try { + id = await getDefaultNamespaceId(cluster); + } catch(_) { + id = cluster.apiUrl; + } + const value = createHash("sha256").update(id).digest("hex"); + + return { value, accuracy: 100 }; + }, + }; + }, + injectionToken: clusterMetadataDetectorInjectionToken, +}); + +export default clusterIdDetectorFactoryInjectable; + diff --git a/packages/core/src/main/cluster-detectors/cluster-id-detector.ts b/packages/core/src/main/cluster-detectors/cluster-id-detector.ts deleted file mode 100644 index 8f1486fcb1..0000000000 --- a/packages/core/src/main/cluster-detectors/cluster-id-detector.ts +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { BaseClusterDetector } from "./base-cluster-detector"; -import { createHash } from "crypto"; -import { ClusterMetadataKey } from "../../common/cluster-types"; - -export class ClusterIdDetector extends BaseClusterDetector { - key = ClusterMetadataKey.CLUSTER_ID; - - public async detect() { - let id: string; - - try { - id = await this.getDefaultNamespaceId(); - } catch(_) { - id = this.cluster.apiUrl; - } - const value = createHash("sha256").update(id).digest("hex"); - - return { value, accuracy: 100 }; - } - - protected async getDefaultNamespaceId() { - const response = await this.k8sRequest("/api/v1/namespaces/default"); - - return response.metadata.uid; - } -} diff --git a/packages/core/src/main/cluster-detectors/cluster-last-seen-detector.injectable.ts b/packages/core/src/main/cluster-detectors/cluster-last-seen-detector.injectable.ts new file mode 100644 index 0000000000..64b05b22ab --- /dev/null +++ b/packages/core/src/main/cluster-detectors/cluster-last-seen-detector.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { clusterMetadataDetectorInjectionToken } from "./token"; +import { ClusterMetadataKey } from "../../common/cluster-types"; +import { getInjectable } from "@ogre-tools/injectable"; +import requestClusterVersionInjectable from "./request-cluster-version.injectable"; + +const clusterLastSeenDetectorInjectable = getInjectable({ + id: "cluster-last-seen-detector", + instantiate: (di) => { + const requestClusterVersion = di.inject(requestClusterVersionInjectable); + + return { + key: ClusterMetadataKey.LAST_SEEN, + detect: async (cluster) => { + try { + await requestClusterVersion(cluster); + + return { value: new Date().toJSON(), accuracy: 100 }; + } catch { + return null; + } + }, + }; + }, + injectionToken: clusterMetadataDetectorInjectionToken, +}); + +export default clusterLastSeenDetectorInjectable; diff --git a/packages/core/src/main/cluster-detectors/cluster-nodes-count-detector.injectable.ts b/packages/core/src/main/cluster-detectors/cluster-nodes-count-detector.injectable.ts new file mode 100644 index 0000000000..e9f0f91e65 --- /dev/null +++ b/packages/core/src/main/cluster-detectors/cluster-nodes-count-detector.injectable.ts @@ -0,0 +1,40 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { clusterMetadataDetectorInjectionToken } from "./token"; +import { ClusterMetadataKey } from "../../common/cluster-types"; +import { getInjectable } from "@ogre-tools/injectable"; +import k8SRequestInjectable from "../k8s-request.injectable"; +import type { Cluster } from "../../common/cluster/cluster"; + +const clusterNodeCountDetectorInjectable = getInjectable({ + id: "cluster-node-count-detector", + instantiate: (di) => { + const k8sRequest = di.inject(k8SRequestInjectable); + const requestNodeCount = async (cluster: Cluster) => { + const { items } = await k8sRequest(cluster, "/api/v1/nodes") as { items: unknown[] }; + + return items.length; + }; + + return { + key: ClusterMetadataKey.NODES_COUNT, + detect: async (cluster) => { + try { + return { + value: await requestNodeCount(cluster), + accuracy: 1000, + }; + } catch { + return null; + } + }, + }; + }, + injectionToken: clusterMetadataDetectorInjectionToken, +}); + +export default clusterNodeCountDetectorInjectable; + diff --git a/packages/core/src/main/cluster-detectors/cluster-version-detector.injectable.ts b/packages/core/src/main/cluster-detectors/cluster-version-detector.injectable.ts new file mode 100644 index 0000000000..82d8c18fdc --- /dev/null +++ b/packages/core/src/main/cluster-detectors/cluster-version-detector.injectable.ts @@ -0,0 +1,28 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { clusterMetadataDetectorInjectionToken } from "./token"; +import { ClusterMetadataKey } from "../../common/cluster-types"; +import { getInjectable } from "@ogre-tools/injectable"; +import requestClusterVersionInjectable from "./request-cluster-version.injectable"; + +const clusterVersionDetectorInjectable = getInjectable({ + id: "cluster-version-detector", + instantiate: (di) => { + const requestClusterVersion = di.inject(requestClusterVersionInjectable); + + return { + key: ClusterMetadataKey.VERSION, + detect: async (cluster) => ({ + value: await requestClusterVersion(cluster), + accuracy: 100, + }), + }; + }, + injectionToken: clusterMetadataDetectorInjectionToken, +}); + +export default clusterVersionDetectorInjectable; + diff --git a/packages/core/src/main/cluster-detectors/create-version-detector.injectable.ts b/packages/core/src/main/cluster-detectors/create-version-detector.injectable.ts deleted file mode 100644 index efd59dcfc3..0000000000 --- a/packages/core/src/main/cluster-detectors/create-version-detector.injectable.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * 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 { VersionDetector } from "./version-detector"; -import k8sRequestInjectable from "../k8s-request.injectable"; -import type { Cluster } from "../../common/cluster/cluster"; - -const createVersionDetectorInjectable = getInjectable({ - id: "create-version-detector", - - instantiate: (di) => { - const k8sRequest = di.inject(k8sRequestInjectable); - - return (cluster: Cluster) => - new VersionDetector(cluster, k8sRequest); - }, -}); - -export default createVersionDetectorInjectable; diff --git a/packages/core/src/main/cluster-detectors/detect-cluster-metadata.injectable.ts b/packages/core/src/main/cluster-detectors/detect-cluster-metadata.injectable.ts new file mode 100644 index 0000000000..3665f74f52 --- /dev/null +++ b/packages/core/src/main/cluster-detectors/detect-cluster-metadata.injectable.ts @@ -0,0 +1,51 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { pipeline } from "@ogre-tools/fp"; +import { getInjectable } from "@ogre-tools/injectable"; +import { groupBy, reduce } from "lodash"; +import { filter, map } from "lodash/fp"; +import type { ClusterMetadata } from "../../common/cluster-types"; +import type { Cluster } from "../../common/cluster/cluster"; +import { hasDefinedTupleValue, isDefined, object } from "../../common/utils"; +import type { ClusterDetectionResult, ClusterMetadataDetector } from "./token"; +import { clusterMetadataDetectorInjectionToken } from "./token"; + +export type DetectClusterMetadata = (cluster: Cluster) => Promise; + +const pickHighestAccuracy = (prev: ClusterDetectionResult, curr: ClusterDetectionResult) => ( + prev.accuracy > curr.accuracy + ? prev + : curr +); + +const detectMetadataWithFor = (cluster: Cluster) => async (clusterMetadataDetector: ClusterMetadataDetector) => { + try { + return await clusterMetadataDetector.detect(cluster); + } catch { + return null; + } +}; + +const detectClusterMetadataInjectable = getInjectable({ + id: "detect-cluster-metadata", + instantiate: (di): DetectClusterMetadata => { + const clusterMetadataDetectors = di.injectMany(clusterMetadataDetectorInjectionToken); + + return async (cluster) => { + const entries = pipeline( + await Promise.all(clusterMetadataDetectors.map(detectMetadataWithFor(cluster))), + filter(isDefined), + (arg) => groupBy(arg, "key"), + (arg) => object.entries(arg), + map(([ key, results ]) => [key, reduce(results, pickHighestAccuracy)] as const), + filter(hasDefinedTupleValue), + ); + + return object.fromEntries(entries); + }; + }, +}); + +export default detectClusterMetadataInjectable; diff --git a/packages/core/src/main/cluster-detectors/detector-registry.injectable.ts b/packages/core/src/main/cluster-detectors/detector-registry.injectable.ts deleted file mode 100644 index 344e82003f..0000000000 --- a/packages/core/src/main/cluster-detectors/detector-registry.injectable.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * 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 { DetectorRegistry } from "./detector-registry"; -import k8sRequestInjectable from "../k8s-request.injectable"; - -const detectorRegistryInjectable = getInjectable({ - id: "detector-registry", - - instantiate: (di) => - new DetectorRegistry({ k8sRequest: di.inject(k8sRequestInjectable) }), -}); - -export default detectorRegistryInjectable; diff --git a/packages/core/src/main/cluster-detectors/detector-registry.ts b/packages/core/src/main/cluster-detectors/detector-registry.ts deleted file mode 100644 index 395d819850..0000000000 --- a/packages/core/src/main/cluster-detectors/detector-registry.ts +++ /dev/null @@ -1,55 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { observable } from "mobx"; -import type { ClusterMetadata } from "../../common/cluster-types"; -import type { Cluster } from "../../common/cluster/cluster"; -import type { BaseClusterDetector, ClusterDetectionResult } from "./base-cluster-detector"; -import type { K8sRequest } from "../k8s-request.injectable"; - -interface Dependencies { - k8sRequest: K8sRequest; -} - -export type DetectorConstructor = new (cluster: Cluster, k8sRequest: K8sRequest) => BaseClusterDetector; - -export class DetectorRegistry { - constructor(private dependencies: Dependencies) {} - - registry = observable.array([], { deep: false }); - - add(detectorClass: DetectorConstructor): this { - this.registry.push(detectorClass); - - return this; - } - - async detectForCluster(cluster: Cluster): Promise { - const results: { [key: string]: ClusterDetectionResult } = {}; - - for (const detectorClass of this.registry) { - const detector = new detectorClass(cluster, this.dependencies.k8sRequest); - - try { - const data = await detector.detect(); - - if (!data) continue; - const existingValue = results[detector.key]; - - if (existingValue && existingValue.accuracy > data.accuracy) continue; // previous value exists and is more accurate - results[detector.key] = data; - } catch (e) { - // detector raised error, do nothing - } - } - const metadata: ClusterMetadata = {}; - - for (const [key, result] of Object.entries(results)) { - metadata[key] = result.value; - } - - return metadata; - } -} diff --git a/packages/core/src/main/cluster-detectors/distribution-detector.ts b/packages/core/src/main/cluster-detectors/distribution-detector.ts deleted file mode 100644 index dcdacfb253..0000000000 --- a/packages/core/src/main/cluster-detectors/distribution-detector.ts +++ /dev/null @@ -1,189 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { BaseClusterDetector } from "./base-cluster-detector"; -import { ClusterMetadataKey } from "../../common/cluster-types"; - -export class DistributionDetector extends BaseClusterDetector { - key = ClusterMetadataKey.DISTRIBUTION; - - public async detect() { - const version = await this.getKubernetesVersion(); - - if (this.isRke(version)) { - return { value: "rke", accuracy: 80 }; - } - - if (this.isRancherDesktop()) { - return { value: "rancher-desktop", accuracy: 80 }; - } - - if (this.isK3s(version)) { - return { value: "k3s", accuracy: 80 }; - } - - if (this.isGKE(version)) { - return { value: "gke", accuracy: 80 }; - } - - if (this.isEKS(version)) { - return { value: "eks", accuracy: 80 }; - } - - if (this.isIKS(version)) { - return { value: "iks", accuracy: 80 }; - } - - if (this.isAKS()) { - return { value: "aks", accuracy: 80 }; - } - - if (this.isDigitalOcean()) { - return { value: "digitalocean", accuracy: 90 }; - } - - if (this.isK0s(version)) { - return { value: "k0s", accuracy: 80 }; - } - - if (this.isVMWare(version)) { - return { value: "vmware", accuracy: 90 }; - } - - if (this.isMirantis(version)) { - return { value: "mirantis", accuracy: 90 }; - } - - if (this.isAlibaba(version)) { - return { value: "alibaba", accuracy: 90 }; - } - - if (this.isHuawei(version)) { - return { value: "huawei", accuracy: 90 }; - } - - if (this.isTke(version)) { - return { value: "tencent", accuracy: 90 }; - } - - if (this.isMinikube()) { - return { value: "minikube", accuracy: 80 }; - } - - if (this.isMicrok8s()) { - return { value: "microk8s", accuracy: 80 }; - } - - if (this.isKind()) { - return { value: "kind", accuracy: 70 }; - } - - if (this.isDockerDesktop()) { - return { value: "docker-desktop", accuracy: 80 }; - } - - if (this.isCustom(version) && await this.isOpenshift()) { - return { value: "openshift", accuracy: 90 }; - } - - if (this.isCustom(version)) { - return { value: "custom", accuracy: 10 }; - } - - return { value: "unknown", accuracy: 10 }; - } - - public async getKubernetesVersion() { - const response = await this.k8sRequest("/version"); - - return response.gitVersion; - } - - protected isGKE(version: string) { - return version.includes("gke"); - } - - protected isEKS(version: string) { - return version.includes("eks"); - } - - protected isIKS(version: string) { - return version.includes("IKS"); - } - - protected isAKS() { - return this.cluster.apiUrl.includes("azmk8s.io"); - } - - protected isMirantis(version: string) { - return version.includes("-mirantis-") || version.includes("-docker-"); - } - - protected isDigitalOcean() { - return this.cluster.apiUrl.endsWith("k8s.ondigitalocean.com"); - } - - protected isMinikube() { - return this.cluster.contextName.startsWith("minikube"); - } - - protected isMicrok8s() { - return this.cluster.contextName.startsWith("microk8s"); - } - - protected isKind() { - return this.cluster.contextName.startsWith("kubernetes-admin@kind-"); - } - - protected isDockerDesktop() { - return this.cluster.contextName === "docker-desktop"; - } - - protected isTke(version: string) { - return version.includes("-tke."); - } - - protected isCustom(version: string) { - return version.includes("+"); - } - - protected isVMWare(version: string) { - return version.includes("+vmware"); - } - - protected isRke(version: string) { - return version.includes("-rancher"); - } - - protected isRancherDesktop() { - return this.cluster.contextName === "rancher-desktop"; - } - - protected isK3s(version: string) { - return version.includes("+k3s"); - } - - protected isK0s(version: string) { - return version.includes("-k0s") || version.includes("+k0s"); - } - - protected isAlibaba(version: string) { - return version.includes("-aliyun"); - } - - protected isHuawei(version: string) { - return version.includes("-CCE"); - } - - protected async isOpenshift() { - try { - const response = await this.k8sRequest(""); - - return response.paths?.includes("/apis/project.openshift.io"); - } catch (e) { - return false; - } - } -} diff --git a/packages/core/src/main/cluster-detectors/last-seen-detector.ts b/packages/core/src/main/cluster-detectors/last-seen-detector.ts deleted file mode 100644 index 087557f083..0000000000 --- a/packages/core/src/main/cluster-detectors/last-seen-detector.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { BaseClusterDetector } from "./base-cluster-detector"; -import { ClusterMetadataKey } from "../../common/cluster-types"; - -export class LastSeenDetector extends BaseClusterDetector { - key = ClusterMetadataKey.LAST_SEEN; - - public async detect() { - if (!this.cluster.accessible) return null; - - await this.k8sRequest("/version"); - - return { value: new Date().toJSON(), accuracy: 100 }; - } -} diff --git a/packages/core/src/main/cluster-detectors/nodes-count-detector.ts b/packages/core/src/main/cluster-detectors/nodes-count-detector.ts deleted file mode 100644 index f9b3c02dbf..0000000000 --- a/packages/core/src/main/cluster-detectors/nodes-count-detector.ts +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { BaseClusterDetector } from "./base-cluster-detector"; -import { ClusterMetadataKey } from "../../common/cluster-types"; - -export class NodesCountDetector extends BaseClusterDetector { - key = ClusterMetadataKey.NODES_COUNT; - - public async detect() { - if (!this.cluster.accessible) return null; - const nodeCount = await this.getNodeCount(); - - return { value: nodeCount, accuracy: 100 }; - } - - protected async getNodeCount(): Promise { - const response = await this.k8sRequest("/api/v1/nodes"); - - return response.items.length; - } -} diff --git a/packages/core/src/main/cluster-detectors/request-cluster-version.injectable.ts b/packages/core/src/main/cluster-detectors/request-cluster-version.injectable.ts new file mode 100644 index 0000000000..3863e75a0c --- /dev/null +++ b/packages/core/src/main/cluster-detectors/request-cluster-version.injectable.ts @@ -0,0 +1,22 @@ +/** + * 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 type { Cluster } from "../../common/cluster/cluster"; +import k8SRequestInjectable from "../k8s-request.injectable"; + +const requestClusterVersionInjectable = getInjectable({ + id: "request-cluster-version", + instantiate: (di) => { + const k8sRequest = di.inject(k8SRequestInjectable); + + return async (cluster: Cluster) => { + const { gitVersion } = await k8sRequest(cluster, "/version") as { gitVersion: string }; + + return gitVersion; + }; + }, +}); + +export default requestClusterVersionInjectable; diff --git a/packages/core/src/main/cluster-detectors/token.ts b/packages/core/src/main/cluster-detectors/token.ts new file mode 100644 index 0000000000..fc9031c815 --- /dev/null +++ b/packages/core/src/main/cluster-detectors/token.ts @@ -0,0 +1,26 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { Cluster } from "../../common/cluster/cluster"; + +export interface ClusterDetectionResult { + value: string | number | boolean; + accuracy: number; +} + +export interface FalibleOnlyClusterMetadataDetector { + readonly key: string; + detect(cluster: Cluster): Promise; +} + +export interface ClusterMetadataDetector { + readonly key: string; + detect(cluster: Cluster): Promise; +} + +export const clusterMetadataDetectorInjectionToken = getInjectionToken({ + id: "cluster-metadata-detector-token", +}); diff --git a/packages/core/src/main/cluster-detectors/version-detector.ts b/packages/core/src/main/cluster-detectors/version-detector.ts deleted file mode 100644 index cc228734c5..0000000000 --- a/packages/core/src/main/cluster-detectors/version-detector.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { BaseClusterDetector } from "./base-cluster-detector"; -import { ClusterMetadataKey } from "../../common/cluster-types"; - -export class VersionDetector extends BaseClusterDetector { - key = ClusterMetadataKey.VERSION; - - public async detect() { - const version = await this.getKubernetesVersion(); - - return { value: version, accuracy: 100 }; - } - - public async getKubernetesVersion() { - const response = await this.k8sRequest("/version"); - - return response.gitVersion; - } -} diff --git a/packages/core/src/main/create-cluster/create-cluster.injectable.ts b/packages/core/src/main/create-cluster/create-cluster.injectable.ts index 760e8e2e75..79eee5a151 100644 --- a/packages/core/src/main/create-cluster/create-cluster.injectable.ts +++ b/packages/core/src/main/create-cluster/create-cluster.injectable.ts @@ -14,11 +14,11 @@ import authorizationReviewInjectable from "../../common/cluster/authorization-re import listNamespacesInjectable from "../../common/cluster/list-namespaces.injectable"; import createListApiResourcesInjectable from "../cluster/request-api-resources.injectable"; import loggerInjectable from "../../common/logger.injectable"; -import detectorRegistryInjectable from "../cluster-detectors/detector-registry.injectable"; -import createVersionDetectorInjectable from "../cluster-detectors/create-version-detector.injectable"; import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable"; import loadConfigfromFileInjectable from "../../common/kube-helpers/load-config-from-file.injectable"; import requestNamespaceListPermissionsForInjectable from "../../common/cluster/request-namespace-list-permissions.injectable"; +import detectClusterMetadataInjectable from "../cluster-detectors/detect-cluster-metadata.injectable"; +import clusterVersionDetectorInjectable from "../cluster-detectors/cluster-version-detector.injectable"; const createClusterInjectable = getInjectable({ id: "create-cluster", @@ -26,6 +26,8 @@ const createClusterInjectable = getInjectable({ instantiate: (di) => { const dependencies: ClusterDependencies = { directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable), + logger: di.inject(loggerInjectable), + clusterVersionDetector: di.inject(clusterVersionDetectorInjectable), createKubeconfigManager: di.inject(createKubeconfigManagerInjectable), createKubectl: di.inject(createKubectlInjectable), createContextHandler: di.inject(createContextHandlerInjectable), @@ -33,11 +35,9 @@ const createClusterInjectable = getInjectable({ requestNamespaceListPermissionsFor: di.inject(requestNamespaceListPermissionsForInjectable), requestApiResources: di.inject(createListApiResourcesInjectable), createListNamespaces: di.inject(listNamespacesInjectable), - logger: di.inject(loggerInjectable), - detectorRegistry: di.inject(detectorRegistryInjectable), - createVersionDetector: di.inject(createVersionDetectorInjectable), broadcastMessage: di.inject(broadcastMessageInjectable), loadConfigfromFile: di.inject(loadConfigfromFileInjectable), + detectClusterMetadata: di.inject(detectClusterMetadataInjectable), }; return (model, configData) => new Cluster(dependencies, model, configData); diff --git a/packages/core/src/main/get-metrics.injectable.ts b/packages/core/src/main/get-metrics.injectable.ts index 0ceaf01735..7a17ce3884 100644 --- a/packages/core/src/main/get-metrics.injectable.ts +++ b/packages/core/src/main/get-metrics.injectable.ts @@ -4,16 +4,19 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../common/cluster/cluster"; +import nodeFetchModuleInjectable from "../common/fetch/fetch-module.injectable"; import type { RequestMetricsParams } from "../common/k8s-api/endpoints/metrics.api/request-metrics.injectable"; +import { object } from "../common/utils"; import k8sRequestInjectable from "./k8s-request.injectable"; -export type GetMetrics = (cluster: Cluster, prometheusPath: string, queryParams: RequestMetricsParams & { query: string }) => Promise; +export type GetMetrics = (cluster: Cluster, prometheusPath: string, queryParams: RequestMetricsParams & { query: string }) => Promise; const getMetricsInjectable = getInjectable({ id: "get-metrics", instantiate: (di): GetMetrics => { const k8sRequest = di.inject(k8sRequestInjectable); + const { FormData } = di.inject(nodeFetchModuleInjectable); return async ( cluster, @@ -22,13 +25,16 @@ const getMetricsInjectable = getInjectable({ ) => { const prometheusPrefix = cluster.preferences.prometheus?.prefix || ""; const metricsPath = `/api/v1/namespaces/${prometheusPath}/proxy${prometheusPrefix}/api/v1/query_range`; + const body = new FormData(); + + for (const [key, value] of object.entries(queryParams)) { + body.set(key, value.toString()); + } return k8sRequest(cluster, metricsPath, { timeout: 0, - resolveWithFullResponse: false, - json: true, method: "POST", - form: queryParams, + body, }); }; }, diff --git a/packages/core/src/main/k8s-request.injectable.ts b/packages/core/src/main/k8s-request.injectable.ts index c00e70ec3f..b15056b50b 100644 --- a/packages/core/src/main/k8s-request.injectable.ts +++ b/packages/core/src/main/k8s-request.injectable.ts @@ -2,35 +2,49 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { RequestPromiseOptions } from "request-promise-native"; -import request from "request-promise-native"; import type { Cluster } from "../common/cluster/cluster"; import { getInjectable } from "@ogre-tools/injectable"; -import lensProxyPortInjectable from "./lens-proxy/lens-proxy-port.injectable"; -import lensProxyCertificateInjectable from "../common/certificate/lens-proxy-certificate.injectable"; +import type { LensRequestInit } from "../common/fetch/lens-fetch.injectable"; +import lensFetchInjectable from "../common/fetch/lens-fetch.injectable"; +import { withTimeout } from "../common/fetch/timeout-controller"; -export type K8sRequest = (cluster: Cluster, path: string, options?: RequestPromiseOptions) => Promise; +export interface K8sRequestInit extends LensRequestInit { + timeout?: number; +} + +export type K8sRequest = (cluster: Cluster, pathnameAndQuery: string, init?: K8sRequestInit) => Promise; const k8sRequestInjectable = getInjectable({ id: "k8s-request", - instantiate: (di) => { - const lensProxyPort = di.inject(lensProxyPortInjectable); - const lensProxyCertificate = di.inject(lensProxyCertificateInjectable); + instantiate: (di): K8sRequest => { + const lensFetch = di.inject(lensFetchInjectable); return async ( - cluster: Cluster, - path: string, - options: RequestPromiseOptions = {}, + cluster, + pathnameAndQuery, + { + timeout = 30_000, + signal, + ...init + } = {}, ) => { - const kubeProxyUrl = `https://127.0.0.1:${lensProxyPort.get()}/${cluster.id}`; + const controller = timeout ? withTimeout(timeout) : undefined; - options.ca = lensProxyCertificate.get().cert; - options.headers ??= {}; - options.json ??= true; - options.timeout ??= 30000; + if (controller) { + signal?.addEventListener("abort", () => controller.abort()); + } - return request(kubeProxyUrl + path, options); + const response = await lensFetch(`/${cluster.id}${pathnameAndQuery}`, { + ...init, + signal: controller?.signal ?? signal, + }); + + if (response.status < 200 || response.status >= 300) { + throw new Error(`Failed to ${init.method ?? "get"} ${pathnameAndQuery} for clusterId=${cluster.id}: ${response.statusText}`, { cause: response }); + } + + return response.json(); }; }, }); diff --git a/packages/core/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts b/packages/core/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts index 2c0f30b83b..4046db5d9d 100644 --- a/packages/core/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts +++ b/packages/core/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts @@ -3,15 +3,15 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import ipcMainInjectionToken from "../../../../common/ipc/ipc-main-injection-token"; import { bundledExtensionsLoaded } from "../../../../common/ipc/extension-handling"; import { delay } from "../../../../common/utils"; -import ipcMainInjectable from "../../../utils/channel/ipc-main/ipc-main.injectable"; const waitUntilBundledExtensionsAreLoadedInjectable = getInjectable({ id: "wait-until-bundled-extensions-are-loaded", instantiate: (di) => { - const ipcMain = di.inject(ipcMainInjectable); + const ipcMain = di.inject(ipcMainInjectionToken); return async () => { const viewHasLoaded = new Promise((resolve) => { diff --git a/packages/core/src/main/start-main-application/lens-window/navigate.injectable.ts b/packages/core/src/main/start-main-application/lens-window/navigate.injectable.ts index 8b204be9b3..7bcd14072b 100644 --- a/packages/core/src/main/start-main-application/lens-window/navigate.injectable.ts +++ b/packages/core/src/main/start-main-application/lens-window/navigate.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { iter } from "../../../common/utils"; import clusterFramesInjectable from "../../../common/cluster-frames.injectable"; -import { IpcRendererNavigationEvents } from "../../../renderer/navigation/events"; +import { IpcRendererNavigationEvents } from "../../../common/ipc/navigation-events"; import showApplicationWindowInjectable from "./show-application-window.injectable"; import getCurrentApplicationWindowInjectable from "./application-window/get-current-application-window.injectable"; import assert from "assert"; diff --git a/packages/core/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts b/packages/core/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts deleted file mode 100644 index 0e8b7ffba2..0000000000 --- a/packages/core/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts +++ /dev/null @@ -1,36 +0,0 @@ -/** - * 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 { ClusterIdDetector } from "../../cluster-detectors/cluster-id-detector"; -import { LastSeenDetector } from "../../cluster-detectors/last-seen-detector"; -import { VersionDetector } from "../../cluster-detectors/version-detector"; -import { DistributionDetector } from "../../cluster-detectors/distribution-detector"; -import { NodesCountDetector } from "../../cluster-detectors/nodes-count-detector"; -import detectorRegistryInjectable from "../../cluster-detectors/detector-registry.injectable"; -import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token"; - -const setupDetectorRegistryInjectable = getInjectable({ - id: "setup-detector-registry", - - instantiate: (di) => { - const detectorRegistry = di.inject(detectorRegistryInjectable); - - return { - id: "setup-detector-registry", - run: () => { - detectorRegistry - .add(ClusterIdDetector) - .add(LastSeenDetector) - .add(VersionDetector) - .add(DistributionDetector) - .add(NodesCountDetector); - }, - }; - }, - - injectionToken: onLoadOfApplicationInjectionToken, -}); - -export default setupDetectorRegistryInjectable; diff --git a/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts b/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts index 6ace54c845..db6435ea56 100644 --- a/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts +++ b/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts @@ -4,14 +4,14 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { IpcMainEvent } from "electron"; -import ipcMainInjectable from "../ipc-main/ipc-main.injectable"; import { enlistMessageChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token"; +import ipcMainInjectionToken from "../../../../common/ipc/ipc-main-injection-token"; const enlistMessageChannelListenerInjectable = getInjectable({ id: "enlist-message-channel-listener-for-main", instantiate: (di) => { - const ipcMain = di.inject(ipcMainInjectable); + const ipcMain = di.inject(ipcMainInjectionToken); return ({ channel, handler }) => { const nativeOnCallback = (_: IpcMainEvent, message: unknown) => { diff --git a/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts b/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts index d72e4afcaf..1af1b6fb55 100644 --- a/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts +++ b/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts @@ -4,10 +4,10 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { IpcMainInvokeEvent } from "electron"; -import ipcMainInjectable from "../ipc-main/ipc-main.injectable"; import type { Disposer } from "../../../../common/utils"; import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token"; import type { RequestChannelListener } from "./listener-tokens"; +import ipcMainInjectionToken from "../../../../common/ipc/ipc-main-injection-token"; export type EnlistRequestChannelListener = >(listener: RequestChannelListener) => Disposer; @@ -15,7 +15,7 @@ const enlistRequestChannelListenerInjectable = getInjectable({ id: "enlist-request-channel-listener-for-main", instantiate: (di): EnlistRequestChannelListener => { - const ipcMain = di.inject(ipcMainInjectable); + const ipcMain = di.inject(ipcMainInjectionToken); return ({ channel, handler }) => { const nativeHandleCallback = (_: IpcMainInvokeEvent, request: unknown) => handler(request); diff --git a/packages/core/src/main/utils/channel/ipc-main/ipc-main.injectable.ts b/packages/core/src/main/utils/channel/ipc-main/ipc-main.injectable.ts index 13684bf8ec..b012c5be47 100644 --- a/packages/core/src/main/utils/channel/ipc-main/ipc-main.injectable.ts +++ b/packages/core/src/main/utils/channel/ipc-main/ipc-main.injectable.ts @@ -4,11 +4,13 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { ipcMain } from "electron"; +import ipcMainInjectionToken from "../../../../common/ipc/ipc-main-injection-token"; const ipcMainInjectable = getInjectable({ id: "ipc-main", instantiate: () => ipcMain, causesSideEffects: true, + injectionToken: ipcMainInjectionToken, }); export default ipcMainInjectable; diff --git a/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-catalog-add-menu.injectable.ts b/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-catalog-add-menu.injectable.ts index 20566b5dac..5d6efad5eb 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-catalog-add-menu.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-catalog-add-menu.injectable.ts @@ -16,7 +16,6 @@ const setupKubernetesClusterCatalogAddMenuListenerInjectable = getInjectable({ instantiate: (di) => ({ id: "setup-kubernetes-cluster-catalog-add-menu-listener", run: () => { - // NOTE: these have to be here so that they are initialized only after the `runAfter` is ran const navigateToAddCluster = di.inject(navigateToAddClusterInjectable); const addSyncEntries = di.inject(addSyncEntriesInjectable); const kubernetesClusterCategory = di.inject(kubernetesClusterCategoryInjectable); diff --git a/packages/core/src/renderer/cluster/create-cluster.injectable.ts b/packages/core/src/renderer/cluster/create-cluster.injectable.ts index 385dfe8d66..ff8ea38fff 100644 --- a/packages/core/src/renderer/cluster/create-cluster.injectable.ts +++ b/packages/core/src/renderer/cluster/create-cluster.injectable.ts @@ -29,9 +29,12 @@ const createClusterInjectable = getInjectable({ createAuthorizationReview: () => { throw new Error("Tried to access back-end feature in front-end."); }, requestNamespaceListPermissionsFor: () => { throw new Error("Tried to access back-end feature in front-end."); }, createListNamespaces: () => { throw new Error("Tried to access back-end feature in front-end."); }, - requestApiResources: ()=> { throw new Error("Tried to access back-end feature in front-end."); }, - detectorRegistry: undefined as never, - createVersionDetector: () => { throw new Error("Tried to access back-end feature in front-end."); }, + requestApiResources: () => { throw new Error("Tried to access back-end feature in front-end."); }, + detectClusterMetadata: () => { throw new Error("Tried to access back-end feature in front-end."); }, + clusterVersionDetector: { + detect: () => { throw new Error("Tried to access back-end feature in front-end."); }, + key: "irrelavent", + }, }; return (model, configData) => new Cluster(dependencies, model, configData); diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa.tsx b/packages/core/src/renderer/components/+config-autoscalers/hpa.tsx index 8900d7b73d..efdc7fd48d 100644 --- a/packages/core/src/renderer/components/+config-autoscalers/hpa.tsx +++ b/packages/core/src/renderer/components/+config-autoscalers/hpa.tsx @@ -10,15 +10,14 @@ import { observer } from "mobx-react"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import type { HorizontalPodAutoscaler } from "../../../common/k8s-api/endpoints/horizontal-pod-autoscaler.api"; import { Badge } from "../badge"; -import { cssNames, prevDefault } from "../../utils"; +import { cssNames } from "../../utils"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { HorizontalPodAutoscalerStore } from "./store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import horizontalPodAutoscalerStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -33,7 +32,6 @@ enum columnId { interface Dependencies { horizontalPodAutoscalerStore: HorizontalPodAutoscalerStore; - filterByNamespace: FilterByNamespace; } @observer @@ -90,13 +88,10 @@ class NonInjectedHorizontalPodAutoscalers extends React.Component renderTableContents={hpa => [ hpa.getName(), , - this.props.filterByNamespace(hpa.getNs()))} - > - {hpa.getNs()} - , + namespace={hpa.getNs()} + />, this.getTargets(hpa), hpa.getMinPods(), hpa.getMaxPods(), @@ -124,7 +119,6 @@ class NonInjectedHorizontalPodAutoscalers extends React.Component export const HorizontalPodAutoscalers = withInjectables(NonInjectedHorizontalPodAutoscalers, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), horizontalPodAutoscalerStore: di.inject(horizontalPodAutoscalerStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/+config-leases/leases.scss b/packages/core/src/renderer/components/+config-leases/leases.scss index f40556550e..5cc62798a9 100644 --- a/packages/core/src/renderer/components/+config-leases/leases.scss +++ b/packages/core/src/renderer/components/+config-leases/leases.scss @@ -21,8 +21,6 @@ flex: .5; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+config-leases/leases.tsx b/packages/core/src/renderer/components/+config-leases/leases.tsx index 6c3025c077..950c52b778 100644 --- a/packages/core/src/renderer/components/+config-leases/leases.tsx +++ b/packages/core/src/renderer/components/+config-leases/leases.tsx @@ -16,9 +16,7 @@ import { KubeObjectAge } from "../kube-object/age"; import { withInjectables } from "@ogre-tools/injectable-react"; import leaseStoreInjectable from "./store.injectable"; import type { LeaseStore } from "./store"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -32,7 +30,6 @@ export interface LeaseProps extends KubeObjectDetailsProps { interface Dependencies { leaseStore: LeaseStore; - filterByNamespace: FilterByNamespace; } @observer @@ -67,13 +64,10 @@ class NonInjectedLease extends React.Component { renderTableContents={lease => [ lease.getName(), , - this.props.filterByNamespace(lease.getNs()))} - > - {lease.getNs()} - , + namespace={lease.getNs()} + />, lease.getHolderIdentity(), , ]} @@ -87,6 +81,5 @@ export const Leases = withInjectables(NonInjectedLease getProps: (di, props) => ({ ...props, leaseStore: di.inject(leaseStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+config-limit-ranges/limit-ranges.tsx b/packages/core/src/renderer/components/+config-limit-ranges/limit-ranges.tsx index ed189ed184..b89c7478f9 100644 --- a/packages/core/src/renderer/components/+config-limit-ranges/limit-ranges.tsx +++ b/packages/core/src/renderer/components/+config-limit-ranges/limit-ranges.tsx @@ -11,12 +11,10 @@ import React from "react"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import type { LimitRangeStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import limitRangeStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -25,7 +23,6 @@ enum columnId { } interface Dependencies { - filterByNamespace: FilterByNamespace; limitRangeStore: LimitRangeStore; } @@ -58,13 +55,10 @@ class NonInjectedLimitRanges extends React.Component { renderTableContents={limitRange => [ limitRange.getName(), , - this.props.filterByNamespace(limitRange.getNs()))} - > - {limitRange.getNs()} - , + namespace={limitRange.getNs()} + />, , ]} /> @@ -76,7 +70,6 @@ class NonInjectedLimitRanges extends React.Component { export const LimitRanges = withInjectables(NonInjectedLimitRanges, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), limitRangeStore: di.inject(limitRangeStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/+config-maps/config-maps.scss b/packages/core/src/renderer/components/+config-maps/config-maps.scss index 7f8fd61f5c..cf81669f79 100644 --- a/packages/core/src/renderer/components/+config-maps/config-maps.scss +++ b/packages/core/src/renderer/components/+config-maps/config-maps.scss @@ -21,8 +21,6 @@ flex: .5; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+config-maps/config-maps.tsx b/packages/core/src/renderer/components/+config-maps/config-maps.tsx index 212e8020e0..b422c6e916 100644 --- a/packages/core/src/renderer/components/+config-maps/config-maps.tsx +++ b/packages/core/src/renderer/components/+config-maps/config-maps.tsx @@ -11,12 +11,10 @@ import { KubeObjectListLayout } from "../kube-object-list-layout"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; import type { ConfigMapStore } from "./store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import configMapStoreInjectable from "./store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -27,7 +25,6 @@ enum columnId { interface Dependencies { configMapStore: ConfigMapStore; - filterByNamespace: FilterByNamespace; } @observer @@ -61,13 +58,10 @@ class NonInjectedConfigMaps extends React.Component { renderTableContents={configMap => [ configMap.getName(), , - this.props.filterByNamespace(configMap.getNs()))} - > - {configMap.getNs()} - , + namespace={configMap.getNs()} + />, configMap.getKeys().join(", "), , ]} @@ -81,6 +75,5 @@ export const ConfigMaps = withInjectables(NonInjectedConfigMaps, { getProps: (di, props) => ({ ...props, configMapStore: di.inject(configMapStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss b/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss index 99f8fedec6..8dc2dfd721 100644 --- a/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss +++ b/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.scss @@ -21,8 +21,6 @@ flex: .5; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx b/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx index f2cfa76090..9a57b972a4 100644 --- a/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx +++ b/packages/core/src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx @@ -13,12 +13,10 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import type { PodDisruptionBudgetStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import podDisruptionBudgetStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -34,7 +32,6 @@ export interface PodDisruptionBudgetsProps extends KubeObjectDetailsProps [ pdb.getName(), , - this.props.filterByNamespace(pdb.getNs()))} - > - {pdb.getNs()} - , + namespace={pdb.getNs()} + />, pdb.getMinAvailable(), pdb.getMaxUnavailable(), pdb.getCurrentHealthy(), @@ -96,7 +90,6 @@ class NonInjectedPodDisruptionBudgets extends React.Component(NonInjectedPodDisruptionBudgets, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), podDisruptionBudgetStore: di.inject(podDisruptionBudgetStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.scss b/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.scss index 5cfef82e92..b0bf869741 100644 --- a/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.scss +++ b/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.scss @@ -9,8 +9,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.tsx b/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.tsx index 28c3355b43..d769de7d07 100644 --- a/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.tsx +++ b/packages/core/src/renderer/components/+config-resource-quotas/resource-quotas.tsx @@ -12,13 +12,11 @@ import { AddQuotaDialog } from "./add-dialog/view"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; import type { ResourceQuotaStore } from "./store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import resourceQuotaStoreInjectable from "./store.injectable"; import openAddQuotaDialogInjectable from "./add-dialog/open.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -28,7 +26,6 @@ enum columnId { interface Dependencies { resourceQuotaStore: ResourceQuotaStore; - filterByNamespace: FilterByNamespace; openAddQuotaDialog: () => void; } @@ -61,13 +58,10 @@ class NonInjectedResourceQuotas extends React.Component { renderTableContents={resourceQuota => [ resourceQuota.getName(), , - this.props.filterByNamespace(resourceQuota.getNs()))} - > - {resourceQuota.getNs()} - , + namespace={resourceQuota.getNs()} + />, , ]} addRemoveButtons={{ @@ -84,7 +78,6 @@ class NonInjectedResourceQuotas extends React.Component { export const ResourceQuotas = withInjectables(NonInjectedResourceQuotas, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), resourceQuotaStore: di.inject(resourceQuotaStoreInjectable), openAddQuotaDialog: di.inject(openAddQuotaDialogInjectable), }), diff --git a/packages/core/src/renderer/components/+config-secrets/secrets.scss b/packages/core/src/renderer/components/+config-secrets/secrets.scss index 41dd4ca709..4a533a5f34 100644 --- a/packages/core/src/renderer/components/+config-secrets/secrets.scss +++ b/packages/core/src/renderer/components/+config-secrets/secrets.scss @@ -17,8 +17,6 @@ @include table-cell-labels-offsets; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+config-secrets/secrets.tsx b/packages/core/src/renderer/components/+config-secrets/secrets.tsx index c58d06ce18..248bfcca85 100644 --- a/packages/core/src/renderer/components/+config-secrets/secrets.tsx +++ b/packages/core/src/renderer/components/+config-secrets/secrets.tsx @@ -13,13 +13,11 @@ import { Badge } from "../badge"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import type { SecretStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import secretStoreInjectable from "./store.injectable"; import openAddSecretDialogInjectable from "./add-dialog/open.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -31,7 +29,6 @@ enum columnId { } interface Dependencies { - filterByNamespace: FilterByNamespace; secretStore: SecretStore; openAddSecretDialog: () => void; } @@ -71,13 +68,10 @@ class NonInjectedSecrets extends React.Component { renderTableContents={secret => [ secret.getName(), , - this.props.filterByNamespace(secret.getNs()))} - > - {secret.getNs()} - , + namespace={secret.getNs()} + />, secret.getLabels().map(label => ( { export const Secrets = withInjectables(NonInjectedSecrets, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), secretStore: di.inject(secretStoreInjectable), openAddSecretDialog: di.inject(openAddSecretDialogInjectable), }), diff --git a/packages/core/src/renderer/components/+custom-resources/crd-resources.scss b/packages/core/src/renderer/components/+custom-resources/crd-resources.scss index 3b217a77bf..0d0ee419d8 100644 --- a/packages/core/src/renderer/components/+custom-resources/crd-resources.scss +++ b/packages/core/src/renderer/components/+custom-resources/crd-resources.scss @@ -4,7 +4,4 @@ */ .CrdResources { - a.filterNamespace { - border-bottom: unset; - } } diff --git a/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx b/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx index 51ecd656ae..3cd0864c36 100644 --- a/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx +++ b/packages/core/src/renderer/components/+custom-resources/crd-resources.tsx @@ -19,9 +19,7 @@ import { KubeObjectAge } from "../kube-object/age"; import type { CustomResourceDefinitionStore } from "./definition.store"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import customResourceDefinitionStoreInjectable from "./definition.store.injectable"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -34,7 +32,6 @@ interface Dependencies { name: IComputedValue; apiManager: ApiManager; customResourceDefinitionStore: CustomResourceDefinitionStore; - filterByNamespace: FilterByNamespace; } @observer @@ -107,13 +104,7 @@ class NonInjectedCustomResources extends React.Component { renderTableContents={customResource => [ customResource.getName(), isNamespaced && ( - this.props.filterByNamespace(customResource.getNs() as string))} - > - {customResource.getNs()} - + ), ...extraColumns.map((column) => safeJSONPathValue(customResource, column.jsonPath)), , @@ -141,7 +132,6 @@ export const CustomResources = withInjectables(NonInjectedCustomRe ...di.inject(customResourcesRouteParametersInjectable), apiManager: di.inject(apiManagerInjectable), customResourceDefinitionStore: di.inject(customResourceDefinitionStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+events/event-details.tsx b/packages/core/src/renderer/components/+events/event-details.tsx index 07842b6f78..afe2af1dc5 100644 --- a/packages/core/src/renderer/components/+events/event-details.tsx +++ b/packages/core/src/renderer/components/+events/event-details.tsx @@ -78,7 +78,7 @@ const NonInjectedEventDetails = observer(({ Involved object - + Name Namespace Kind diff --git a/packages/core/src/renderer/components/+events/events.tsx b/packages/core/src/renderer/components/+events/events.tsx index e1b9e57bb8..d68bb21a53 100644 --- a/packages/core/src/renderer/components/+events/events.tsx +++ b/packages/core/src/renderer/components/+events/events.tsx @@ -19,7 +19,7 @@ import type { HeaderCustomizer } from "../item-object-list"; import { Tooltip } from "../tooltip"; import { Link } from "react-router-dom"; import type { IClassName } from "../../utils"; -import { prevDefault, cssNames, stopPropagation } from "../../utils"; +import { cssNames, stopPropagation } from "../../utils"; import { Icon } from "../icon"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -28,10 +28,9 @@ import { KubeObjectAge } from "../kube-object/age"; import { ReactiveDuration } from "../duration/reactive-duration"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import eventStoreInjectable from "./store.injectable"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { message = "message", @@ -58,7 +57,6 @@ interface Dependencies { navigateToEvents: () => void; eventStore: EventStore; apiManager: ApiManager; - filterByNamespace: FilterByNamespace; getDetailsUrl: GetDetailsUrl; } @@ -202,15 +200,7 @@ class NonInjectedEvents extends React.Component { ), }, compact - ? ( - this.props.filterByNamespace(event.getNs()))} - > - {event.getNs()} - - ) + ? : event.getNs(), (NonInjectedEven navigateToEvents: di.inject(navigateToEventsInjectable), apiManager: di.inject(apiManagerInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), getDetailsUrl: di.inject(getDetailsUrlInjectable), }), }); diff --git a/packages/core/src/renderer/components/+events/kube-event-details.scss b/packages/core/src/renderer/components/+events/kube-event-details.module.scss similarity index 91% rename from packages/core/src/renderer/components/+events/kube-event-details.scss rename to packages/core/src/renderer/components/+events/kube-event-details.module.scss index 4e781eaf2e..4e6b9cd5a0 100644 --- a/packages/core/src/renderer/components/+events/kube-event-details.scss +++ b/packages/core/src/renderer/components/+events/kube-event-details.module.scss @@ -22,8 +22,8 @@ } } } - - .no-items { - text-align: center; - } +} + +.empty { + opacity: 0.6; } diff --git a/packages/core/src/renderer/components/+events/kube-event-details.tsx b/packages/core/src/renderer/components/+events/kube-event-details.tsx index aef3bf7b10..80c6938630 100644 --- a/packages/core/src/renderer/components/+events/kube-event-details.tsx +++ b/packages/core/src/renderer/components/+events/kube-event-details.tsx @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import "./kube-event-details.scss"; +import styles from "./kube-event-details.module.scss"; import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; @@ -57,14 +57,14 @@ class NonInjectedKubeEventDetails extends React.Component - + Events {events.length > 0 && ( -
+
{events.map(event => ( -
-
+
+
{event.message}
@@ -85,6 +85,11 @@ class NonInjectedKubeEventDetails extends React.Component )} + {events.length === 0 && ( +
+ No events found +
+ )}
); } diff --git a/packages/core/src/renderer/components/+helm-releases/releases.scss b/packages/core/src/renderer/components/+helm-releases/releases.scss index 04955a60eb..1cce1c5358 100644 --- a/packages/core/src/renderer/components/+helm-releases/releases.scss +++ b/packages/core/src/renderer/components/+helm-releases/releases.scss @@ -21,8 +21,6 @@ } } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+helm-releases/releases.tsx b/packages/core/src/renderer/components/+helm-releases/releases.tsx index 5714c92fd1..1a0aded7b0 100644 --- a/packages/core/src/renderer/components/+helm-releases/releases.tsx +++ b/packages/core/src/renderer/components/+helm-releases/releases.tsx @@ -23,9 +23,7 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import helmReleasesRouteParametersInjectable from "./helm-releases-route-parameters.injectable"; import type { NavigateToHelmReleases } from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; import navigateToHelmReleasesInjectable from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -43,19 +41,9 @@ interface Dependencies { releasesArePending: IComputedValue; namespace: IComputedValue; navigateToHelmReleases: NavigateToHelmReleases; - filterByNamespace: FilterByNamespace; } class NonInjectedHelmReleases extends Component { - // TODO: This side-effect in mount must go. - componentDidMount() { - const namespace = this.props.namespace.get(); - - if (namespace) { - this.props.filterByNamespace(namespace); - } - } - onDetails = (item: HelmRelease) => { this.showDetails(item); }; @@ -188,13 +176,10 @@ class NonInjectedHelmReleases extends Component { ]} renderTableContents={release => [ release.getName(), - this.props.filterByNamespace(release.getNs()))} - > - {release.getNs()} - , + namespace={release.getNs()} + />, release.getChart(), release.getRevision(), release.getVersion(), @@ -226,7 +211,6 @@ export const HelmReleases = withInjectables(NonInjectedHelmRelease releases: di.inject(removableReleasesInjectable), releasesArePending: di.inject(releasesInjectable).pending, navigateToHelmReleases: di.inject(navigateToHelmReleasesInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), ...di.inject(helmReleasesRouteParametersInjectable), }), }); diff --git a/packages/core/src/renderer/components/+namespaces/namespace-select-badge.module.scss b/packages/core/src/renderer/components/+namespaces/namespace-select-badge.module.scss new file mode 100644 index 0000000000..75bb18bf40 --- /dev/null +++ b/packages/core/src/renderer/components/+namespaces/namespace-select-badge.module.scss @@ -0,0 +1,9 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +.NamespaceSelectBadge { + @include pseudo-link; + border-bottom: unset; +} \ No newline at end of file diff --git a/packages/core/src/renderer/components/+namespaces/namespace-select-badge.tsx b/packages/core/src/renderer/components/+namespaces/namespace-select-badge.tsx new file mode 100644 index 0000000000..9ae46b0342 --- /dev/null +++ b/packages/core/src/renderer/components/+namespaces/namespace-select-badge.tsx @@ -0,0 +1,58 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import styles from "./namespace-select-badge.module.scss"; +import React from "react"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import type { BadgeProps } from "../badge"; +import { Badge } from "../badge"; +import type { + FilterByNamespace, +} from "./namespace-select-filter-model/filter-by-namespace.injectable"; +import filterByNamespaceInjectable + from "./namespace-select-filter-model/filter-by-namespace.injectable"; +import { prevDefault, cssNames } from "../../utils"; + +export interface NamespaceSelectBadgeProps extends BadgeProps { + namespace: string; +} + +export interface Dependencies { + filterByNamespace: FilterByNamespace; +} + +export function NamespaceSelectBadgeNonInjected( + { + namespace, + label, + filterByNamespace, + ...props + }: NamespaceSelectBadgeProps & Dependencies) { + return ( + + Set global namespace filter to: + {namespace} + + )} + className={cssNames(styles.NamespaceSelectBadge, props.className)} + onClick={prevDefault(() => filterByNamespace(namespace))} + /> + ); +} + +export const NamespaceSelectBadge = withInjectables(NamespaceSelectBadgeNonInjected, { + getProps(di, props) { + return { + ...props, + filterByNamespace: di.inject(filterByNamespaceInjectable), + }; + }, +}); diff --git a/packages/core/src/renderer/components/+network-endpoints/endpoints.scss b/packages/core/src/renderer/components/+network-endpoints/endpoints.scss index a79d36ff17..3e4ea7a85c 100644 --- a/packages/core/src/renderer/components/+network-endpoints/endpoints.scss +++ b/packages/core/src/renderer/components/+network-endpoints/endpoints.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+network-endpoints/endpoints.tsx b/packages/core/src/renderer/components/+network-endpoints/endpoints.tsx index 4358906a67..55d1551860 100644 --- a/packages/core/src/renderer/components/+network-endpoints/endpoints.tsx +++ b/packages/core/src/renderer/components/+network-endpoints/endpoints.tsx @@ -11,12 +11,10 @@ import { KubeObjectListLayout } from "../kube-object-list-layout"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; import type { EndpointsStore } from "./store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import endpointsStoreInjectable from "./store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -27,7 +25,6 @@ enum columnId { interface Dependencies { endpointsStore: EndpointsStore; - filterByNamespace: FilterByNamespace; } @observer @@ -59,13 +56,10 @@ class NonInjectedEndpoints extends React.Component { renderTableContents={endpoint => [ endpoint.getName(), , - this.props.filterByNamespace(endpoint.getNs()))} - > - {endpoint.getNs()} - , + namespace={endpoint.getNs()} + />, endpoint.toString(), , ]} @@ -86,6 +80,5 @@ export const Endpoints = withInjectables(NonInjectedEndpoints, { getProps: (di, props) => ({ ...props, endpointsStore: di.inject(endpointsStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx b/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx index d49d1e49a5..a01ced5b7f 100644 --- a/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -37,7 +37,7 @@ class NonInjectedIngressDetails extends React.Component - + Path Link Backends diff --git a/packages/core/src/renderer/components/+network-ingresses/ingresses.scss b/packages/core/src/renderer/components/+network-ingresses/ingresses.scss index fdf0bda6b8..4c6d5a75c1 100644 --- a/packages/core/src/renderer/components/+network-ingresses/ingresses.scss +++ b/packages/core/src/renderer/components/+network-ingresses/ingresses.scss @@ -32,8 +32,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+network-ingresses/ingresses.tsx b/packages/core/src/renderer/components/+network-ingresses/ingresses.tsx index e8c8745926..6817d967fb 100644 --- a/packages/core/src/renderer/components/+network-ingresses/ingresses.tsx +++ b/packages/core/src/renderer/components/+network-ingresses/ingresses.tsx @@ -12,12 +12,10 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import { computeRouteDeclarations } from "../../../common/k8s-api/endpoints"; -import { prevDefault } from "../../utils"; import type { IngressStore } from "./ingress-store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import ingressStoreInjectable from "./ingress-store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -29,13 +27,11 @@ enum columnId { interface Dependencies { ingressStore: IngressStore; - filterByNamespace: FilterByNamespace; } const NonInjectedIngresses = observer((props: Dependencies) => { const { ingressStore, - filterByNamespace, } = props; return ( @@ -66,13 +62,7 @@ const NonInjectedIngresses = observer((props: Dependencies) => { renderTableContents={ ingress => [ ingress.getName(), , - filterByNamespace(ingress.getNs()))} - > - {ingress.getNs()} - , + , ingress.getLoadBalancers().map(lb =>

{ lb }

), computeRouteDeclarations(ingress).map(decl => ( decl.displayAsLink @@ -112,6 +102,5 @@ export const Ingresses = withInjectables(NonInjectedIngresses, { getProps: (di, props) => ({ ...props, ingressStore: di.inject(ingressStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+network-policies/network-policies.scss b/packages/core/src/renderer/components/+network-policies/network-policies.scss index d9170a4cb4..38e6cd3d75 100644 --- a/packages/core/src/renderer/components/+network-policies/network-policies.scss +++ b/packages/core/src/renderer/components/+network-policies/network-policies.scss @@ -9,8 +9,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+network-policies/network-policies.tsx b/packages/core/src/renderer/components/+network-policies/network-policies.tsx index a4aeac21f7..47f8e52776 100644 --- a/packages/core/src/renderer/components/+network-policies/network-policies.tsx +++ b/packages/core/src/renderer/components/+network-policies/network-policies.tsx @@ -12,11 +12,9 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { NetworkPolicyStore } from "./store"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import networkPolicyStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -27,7 +25,6 @@ enum columnId { interface Dependencies { networkPolicyStore: NetworkPolicyStore; - filterByNamespace: FilterByNamespace; } @observer @@ -59,13 +56,10 @@ class NonInjectedNetworkPolicies extends React.Component { renderTableContents={networkPolicy => [ networkPolicy.getName(), , - this.props.filterByNamespace(networkPolicy.getNs()))} - > - {networkPolicy.getNs()} - , + namespace={networkPolicy.getNs()} + />, networkPolicy.getTypes().join(", "), , ]} @@ -78,7 +72,6 @@ class NonInjectedNetworkPolicies extends React.Component { export const NetworkPolicies = withInjectables(NonInjectedNetworkPolicies, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), networkPolicyStore: di.inject(networkPolicyStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/+network-port-forwards/port-forwards.scss b/packages/core/src/renderer/components/+network-port-forwards/port-forwards.scss index ede9873736..0da7b0e002 100644 --- a/packages/core/src/renderer/components/+network-port-forwards/port-forwards.scss +++ b/packages/core/src/renderer/components/+network-port-forwards/port-forwards.scss @@ -14,8 +14,6 @@ flex: 0.6; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+network-port-forwards/port-forwards.tsx b/packages/core/src/renderer/components/+network-port-forwards/port-forwards.tsx index 8010bf9545..97ab37cdd6 100644 --- a/packages/core/src/renderer/components/+network-port-forwards/port-forwards.tsx +++ b/packages/core/src/renderer/components/+network-port-forwards/port-forwards.tsx @@ -19,9 +19,7 @@ import { computed, makeObservable } from "mobx"; import portForwardsRouteParametersInjectable from "./port-forwards-route-parameters.injectable"; import type { NavigateToPortForwards } from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; import navigateToPortForwardsInjectable from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -37,7 +35,6 @@ interface Dependencies { portForwardStore: PortForwardStore; forwardport: IComputedValue; navigateToPortForwards: NavigateToPortForwards; - filterByNamespace: FilterByNamespace; } @observer @@ -132,13 +129,10 @@ class NonInjectedPortForwards extends React.Component { ]} renderTableContents={item => [ item.getName(), - this.props.filterByNamespace(item.getNs()))} - > - {item.getNs()} - , + namespace={item.getNs()} + />, item.getKind(), item.getPort(), item.getForwardPort(), @@ -173,7 +167,6 @@ export const PortForwards = withInjectables(NonInjectedPortForward portForwardStore: di.inject(portForwardStoreInjectable), ...di.inject(portForwardsRouteParametersInjectable), navigateToPortForwards: di.inject(navigateToPortForwardsInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx b/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx index f7dec5077a..7e3eaaf34b 100644 --- a/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx +++ b/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx @@ -46,7 +46,7 @@ class NonInjectedServiceDetailsEndpoint extends React.Component - + Name Endpoints diff --git a/packages/core/src/renderer/components/+network-services/services.scss b/packages/core/src/renderer/components/+network-services/services.scss index 5136582cf0..dcc8ed9d1d 100644 --- a/packages/core/src/renderer/components/+network-services/services.scss +++ b/packages/core/src/renderer/components/+network-services/services.scss @@ -26,8 +26,6 @@ flex: 0.6; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+network-services/services.tsx b/packages/core/src/renderer/components/+network-services/services.tsx index 17295b0af8..7d9a7ba7f4 100644 --- a/packages/core/src/renderer/components/+network-services/services.tsx +++ b/packages/core/src/renderer/components/+network-services/services.tsx @@ -12,13 +12,11 @@ import { Badge } from "../badge"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; import type { ServiceStore } from "./store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import type { Service } from "../../../common/k8s-api/endpoints"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import serviceStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -48,7 +46,6 @@ const formatExternalIps = (service: Service) => { interface Dependencies { serviceStore: ServiceStore; - filterByNamespace: FilterByNamespace; } @observer @@ -92,13 +89,10 @@ class NonInjectedServices extends React.Component { renderTableContents={service => [ service.getName(), , - this.props.filterByNamespace(service.getNs())) } - > - { service.getNs() } - , + namespace={service.getNs()} + />, service.getType(), service.getClusterIp(), service.getPorts().join(", "), @@ -116,7 +110,6 @@ class NonInjectedServices extends React.Component { export const Services = withInjectables(NonInjectedServices, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), serviceStore: di.inject(serviceStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/+nodes/details-resources.tsx b/packages/core/src/renderer/components/+nodes/details-resources.tsx index b8cb2663a1..0ea4e37019 100644 --- a/packages/core/src/renderer/components/+nodes/details-resources.tsx +++ b/packages/core/src/renderer/components/+nodes/details-resources.tsx @@ -38,7 +38,7 @@ export function NodeDetailsResources({ type, node: { status = {}}}: NodeDetailsR selectable scrollable={false} > - + CPU Memory Ephemeral Storage diff --git a/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.scss b/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.scss index ac476c595c..f34b575bb3 100644 --- a/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.scss +++ b/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.scss @@ -39,8 +39,6 @@ flex: 0.4; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx b/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx index 31ebee4bc4..39ec81f8de 100644 --- a/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx +++ b/packages/core/src/renderer/components/+storage-volume-claims/volume-claims.tsx @@ -10,7 +10,7 @@ import { observer } from "mobx-react"; import { Link } from "react-router-dom"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { unitsToBytes } from "../../../common/utils/convertMemory"; -import { prevDefault, stopPropagation } from "../../utils"; +import { stopPropagation } from "../../utils"; import type { StorageClassApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; @@ -18,13 +18,12 @@ import { KubeObjectAge } from "../kube-object/age"; import type { PersistentVolumeClaimStore } from "./store"; import type { PodStore } from "../+workloads-pods/store"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; import persistentVolumeClaimStoreInjectable from "./store.injectable"; import podStoreInjectable from "../+workloads-pods/store.injectable"; import storageClassApiInjectable from "../../../common/k8s-api/endpoints/storage-class.api.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -41,7 +40,6 @@ interface Dependencies { storageClassApi: StorageClassApi; podStore: PodStore; getDetailsUrl: GetDetailsUrl; - filterByNamespace: FilterByNamespace; } @observer @@ -49,7 +47,6 @@ class NonInjectedPersistentVolumeClaims extends React.Component { render() { const { persistentVolumeClaimStore, - filterByNamespace, getDetailsUrl, podStore, storageClassApi, @@ -97,13 +94,10 @@ class NonInjectedPersistentVolumeClaims extends React.Component { return [ pvc.getName(), , - filterByNamespace(pvc.getNs()))} - > - {pvc.getNs()} - , + namespace={pvc.getNs()} + />, { export const PersistentVolumeClaims = withInjectables(NonInjectedPersistentVolumeClaims, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), getDetailsUrl: di.inject(getDetailsUrlInjectable), persistentVolumeClaimStore: di.inject(persistentVolumeClaimStoreInjectable), podStore: di.inject(podStoreInjectable), diff --git a/packages/core/src/renderer/components/+user-management/+role-bindings/view.scss b/packages/core/src/renderer/components/+user-management/+role-bindings/view.scss index d57c5679c3..3c72d3f115 100644 --- a/packages/core/src/renderer/components/+user-management/+role-bindings/view.scss +++ b/packages/core/src/renderer/components/+user-management/+role-bindings/view.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+user-management/+role-bindings/view.tsx b/packages/core/src/renderer/components/+user-management/+role-bindings/view.tsx index 3f5e458453..2489d9cfa3 100644 --- a/packages/core/src/renderer/components/+user-management/+role-bindings/view.tsx +++ b/packages/core/src/renderer/components/+user-management/+role-bindings/view.tsx @@ -14,17 +14,15 @@ import { KubeObjectAge } from "../../kube-object/age"; import type { RoleStore } from "../+roles/store"; import type { ServiceAccountStore } from "../+service-accounts/store"; import type { RoleBindingStore } from "./store"; -import { prevDefault } from "../../../utils"; import type { ClusterRoleStore } from "../+cluster-roles/store"; -import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import clusterRoleStoreInjectable from "../+cluster-roles/store.injectable"; -import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import roleBindingStoreInjectable from "./store.injectable"; import roleStoreInjectable from "../+roles/store.injectable"; import serviceAccountStoreInjectable from "../+service-accounts/store.injectable"; import type { OpenRoleBindingDialog } from "./dialog/open.injectable"; import openRoleBindingDialogInjectable from "./dialog/open.injectable"; +import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -38,7 +36,6 @@ interface Dependencies { roleStore: RoleStore; clusterRoleStore: ClusterRoleStore; serviceAccountStore: ServiceAccountStore; - filterByNamespace: FilterByNamespace; openRoleBindingDialog: OpenRoleBindingDialog; } @@ -50,7 +47,6 @@ class NonInjectedRoleBindings extends React.Component { roleBindingStore, roleStore, serviceAccountStore, - filterByNamespace, openRoleBindingDialog, } = this.props; @@ -83,13 +79,10 @@ class NonInjectedRoleBindings extends React.Component { renderTableContents={binding => [ binding.getName(), , - filterByNamespace(binding.getNs()))} - > - {binding.getNs()} - , + namespace={binding.getNs()} + />, binding.getSubjectNames(), , ]} @@ -108,7 +101,6 @@ export const RoleBindings = withInjectables(NonInjectedRoleBinding getProps: (di, props) => ({ ...props, clusterRoleStore: di.inject(clusterRoleStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), roleBindingStore: di.inject(roleBindingStoreInjectable), roleStore: di.inject(roleStoreInjectable), serviceAccountStore: di.inject(serviceAccountStoreInjectable), diff --git a/packages/core/src/renderer/components/+user-management/+roles/view.scss b/packages/core/src/renderer/components/+user-management/+roles/view.scss index 7ed72f8cc2..6fae603fd3 100644 --- a/packages/core/src/renderer/components/+user-management/+roles/view.scss +++ b/packages/core/src/renderer/components/+user-management/+roles/view.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+user-management/+roles/view.tsx b/packages/core/src/renderer/components/+user-management/+roles/view.tsx index bf308b38af..a299ac1085 100644 --- a/packages/core/src/renderer/components/+user-management/+roles/view.tsx +++ b/packages/core/src/renderer/components/+user-management/+roles/view.tsx @@ -13,12 +13,10 @@ import { AddRoleDialog } from "./add-dialog/view"; import { SiblingsInTabLayout } from "../../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../../kube-object/age"; import type { RoleStore } from "./store"; -import { prevDefault } from "../../../utils"; -import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import roleStoreInjectable from "./store.injectable"; import openAddRoleDialogInjectable from "./add-dialog/open.injectable"; +import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -28,7 +26,6 @@ enum columnId { interface Dependencies { roleStore: RoleStore; - filterByNamespace: FilterByNamespace; openAddRoleDialog: () => void; } @@ -36,7 +33,6 @@ interface Dependencies { class NonInjectedRoles extends React.Component { render() { const { - filterByNamespace, roleStore, openAddRoleDialog, } = this.props; @@ -66,13 +62,10 @@ class NonInjectedRoles extends React.Component { renderTableContents={role => [ role.getName(), , - filterByNamespace(role.getNs()))} - > - {role.getNs()} - , + namespace={role.getNs()} + />, , ]} addRemoveButtons={{ @@ -89,7 +82,6 @@ class NonInjectedRoles extends React.Component { export const Roles = withInjectables(NonInjectedRoles, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), roleStore: di.inject(roleStoreInjectable), openAddRoleDialog: di.inject(openAddRoleDialogInjectable), }), diff --git a/packages/core/src/renderer/components/+user-management/+service-accounts/view.scss b/packages/core/src/renderer/components/+user-management/+service-accounts/view.scss index e1fa133b5e..4cc730d949 100644 --- a/packages/core/src/renderer/components/+user-management/+service-accounts/view.scss +++ b/packages/core/src/renderer/components/+user-management/+service-accounts/view.scss @@ -9,8 +9,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+user-management/+service-accounts/view.tsx b/packages/core/src/renderer/components/+user-management/+service-accounts/view.tsx index 1043250d73..ce7eb4988e 100644 --- a/packages/core/src/renderer/components/+user-management/+service-accounts/view.tsx +++ b/packages/core/src/renderer/components/+user-management/+service-accounts/view.tsx @@ -12,14 +12,12 @@ import { KubeObjectStatusIcon } from "../../kube-object-status-icon"; import { CreateServiceAccountDialog } from "./create-dialog/view"; import { SiblingsInTabLayout } from "../../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../../kube-object/age"; -import { prevDefault } from "../../../utils"; import type { ServiceAccountStore } from "./store"; -import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import serviceAccountStoreInjectable from "./store.injectable"; import type { OpenCreateServiceAccountDialog } from "./create-dialog/open.injectable"; import openCreateServiceAccountDialogInjectable from "./create-dialog/open.injectable"; +import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -29,7 +27,6 @@ enum columnId { interface Dependencies { serviceAccountStore: ServiceAccountStore; - filterByNamespace: FilterByNamespace; openCreateServiceAccountDialog: OpenCreateServiceAccountDialog; } @@ -37,7 +34,6 @@ interface Dependencies { class NonInjectedServiceAccounts extends React.Component { render() { const { - filterByNamespace, serviceAccountStore, openCreateServiceAccountDialog, } = this.props; @@ -67,13 +63,10 @@ class NonInjectedServiceAccounts extends React.Component { renderTableContents={account => [ account.getName(), , - filterByNamespace(account.getNs()))} - > - {account.getNs()} - , + namespace={account.getNs()} + />, , ]} addRemoveButtons={{ @@ -90,7 +83,6 @@ class NonInjectedServiceAccounts extends React.Component { export const ServiceAccounts = withInjectables(NonInjectedServiceAccounts, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), serviceAccountStore: di.inject(serviceAccountStoreInjectable), openCreateServiceAccountDialog: di.inject(openCreateServiceAccountDialogInjectable), }), diff --git a/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.scss b/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.scss index 29b9fb18c1..9fc51383b7 100644 --- a/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.scss +++ b/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.scss @@ -9,8 +9,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.tsx b/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.tsx index 1dba28c478..365c469917 100644 --- a/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.tsx +++ b/packages/core/src/renderer/components/+workloads-cronjobs/cronjobs.tsx @@ -17,9 +17,7 @@ import type { EventStore } from "../+events/store"; import { withInjectables } from "@ogre-tools/injectable-react"; import cronJobStoreInjectable from "./store.injectable"; import eventStoreInjectable from "../+events/store.injectable"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -34,14 +32,12 @@ enum columnId { interface Dependencies { cronJobStore: CronJobStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedCronJobs = observer((props: Dependencies) => { const { cronJobStore, eventStore, - filterByNamespace, } = props; return ( @@ -82,13 +78,10 @@ const NonInjectedCronJobs = observer((props: Dependencies) => { renderTableContents={cronJob => [ cronJob.getName(), , - filterByNamespace(cronJob.getNs()))} - > - {cronJob.getNs()} - , + namespace={cronJob.getNs()} + />, cronJob.isNeverRun() ? "never" : cronJob.getSchedule(), cronJob.getSuspendFlag(), cronJobStore.getActiveJobsNum(cronJob), @@ -105,6 +98,5 @@ export const CronJobs = withInjectables(NonInjectedCronJobs, { ...props, cronJobStore: di.inject(cronJobStoreInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.scss b/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.scss index 1500c74d78..a5ea8e74be 100644 --- a/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.scss +++ b/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.scss @@ -22,8 +22,6 @@ @include table-cell-labels-offsets; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.tsx b/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.tsx index 5fc4ac6bc8..9760cd2457 100644 --- a/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.tsx +++ b/packages/core/src/renderer/components/+workloads-daemonsets/daemonsets.tsx @@ -15,12 +15,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { DaemonSetStore } from "./store"; import type { EventStore } from "../+events/store"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import daemonSetStoreInjectable from "./store.injectable"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -33,14 +31,12 @@ enum columnId { interface Dependencies { daemonSetStore: DaemonSetStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedDaemonSets = observer((props: Dependencies) => { const { daemonSetStore, eventStore, - filterByNamespace, } = props; const getPodsLength = (daemonSet: DaemonSet) => daemonSetStore.getChildPods(daemonSet).length; @@ -66,7 +62,12 @@ const NonInjectedDaemonSets = observer((props: Dependencies) => { renderHeaderTitle="Daemon Sets" renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, { title: "Pods", className: "pods", sortBy: columnId.pods, id: columnId.pods }, { className: "warning", showWithColumn: columnId.pods }, { title: "Node Selector", className: "labels scrollable", id: columnId.labels }, @@ -74,13 +75,10 @@ const NonInjectedDaemonSets = observer((props: Dependencies) => { ]} renderTableContents={daemonSet => [ daemonSet.getName(), - filterByNamespace(daemonSet.getNs()))} - > - {daemonSet.getNs()} - , + namespace={daemonSet.getNs()} + />, getPodsLength(daemonSet), , daemonSet.getNodeSelectors().map(selector => ( @@ -102,6 +100,5 @@ export const DaemonSets = withInjectables(NonInjectedDaemonSets, { ...props, daemonSetStore: di.inject(daemonSetStoreInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx b/packages/core/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx index d46e3e7f31..fc334f87f0 100644 --- a/packages/core/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx +++ b/packages/core/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx @@ -78,7 +78,7 @@ class NonInjectedDeploymentReplicaSets extends React.Component - + Name Namespace diff --git a/packages/core/src/renderer/components/+workloads-deployments/deployments.scss b/packages/core/src/renderer/components/+workloads-deployments/deployments.scss index 322faa6d8d..5d9ed72c03 100644 --- a/packages/core/src/renderer/components/+workloads-deployments/deployments.scss +++ b/packages/core/src/renderer/components/+workloads-deployments/deployments.scss @@ -43,8 +43,6 @@ } } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+workloads-deployments/deployments.tsx b/packages/core/src/renderer/components/+workloads-deployments/deployments.tsx index d069cd73c1..6fa9fff211 100644 --- a/packages/core/src/renderer/components/+workloads-deployments/deployments.tsx +++ b/packages/core/src/renderer/components/+workloads-deployments/deployments.tsx @@ -9,7 +9,7 @@ import React from "react"; import { observer } from "mobx-react"; import type { Deployment } from "../../../common/k8s-api/endpoints"; import { KubeObjectListLayout } from "../kube-object-list-layout"; -import { cssNames, prevDefault } from "../../utils"; +import { cssNames } from "../../utils"; import kebabCase from "lodash/kebabCase"; import orderBy from "lodash/orderBy"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; @@ -17,11 +17,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { DeploymentStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import deploymentStoreInjectable from "./store.injectable"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -35,7 +34,6 @@ enum columnId { interface Dependencies { deploymentStore: DeploymentStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } @observer @@ -64,7 +62,6 @@ class NonInjectedDeployments extends React.Component { const { deploymentStore, eventStore, - filterByNamespace, } = this.props; return ( @@ -90,22 +87,34 @@ class NonInjectedDeployments extends React.Component { renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, { className: "warning", showWithColumn: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, { title: "Pods", className: "pods", id: columnId.pods }, - { title: "Replicas", className: "replicas", sortBy: columnId.replicas, id: columnId.replicas }, + { + title: "Replicas", + className: "replicas", + sortBy: columnId.replicas, + id: columnId.replicas, + }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, - { title: "Conditions", className: "conditions", sortBy: columnId.condition, id: columnId.condition }, + { + title: "Conditions", + className: "conditions", + sortBy: columnId.condition, + id: columnId.condition, + }, ]} renderTableContents={deployment => [ deployment.getName(), , - filterByNamespace(deployment.getNs()))} - > - {deployment.getNs()} - , + namespace={deployment.getNs()} + />, this.renderPods(deployment), deployment.getReplicas(), , @@ -122,6 +131,5 @@ export const Deployments = withInjectables(NonInjectedDeployments, ...props, deploymentStore: di.inject(deploymentStoreInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+workloads-jobs/jobs.scss b/packages/core/src/renderer/components/+workloads-jobs/jobs.scss index a24cfc7b06..f293ba5b38 100644 --- a/packages/core/src/renderer/components/+workloads-jobs/jobs.scss +++ b/packages/core/src/renderer/components/+workloads-jobs/jobs.scss @@ -19,8 +19,6 @@ @include job-condition-colors; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+workloads-jobs/jobs.tsx b/packages/core/src/renderer/components/+workloads-jobs/jobs.tsx index c0bc9e2d66..5893a27708 100644 --- a/packages/core/src/renderer/components/+workloads-jobs/jobs.tsx +++ b/packages/core/src/renderer/components/+workloads-jobs/jobs.tsx @@ -14,12 +14,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { JobStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import { prevDefault } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import jobStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -32,13 +30,11 @@ enum columnId { interface Dependencies { jobStore: JobStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedJobs = observer((props: Dependencies) => { const { eventStore, - filterByNamespace, jobStore, } = props; @@ -73,13 +69,10 @@ const NonInjectedJobs = observer((props: Dependencies) => { return [ job.getName(), - filterByNamespace(job.getNs()))} - > - {job.getNs()} - , + namespace={job.getNs()} + />, `${job.getCompletions()} / ${job.getDesiredCompletions()}`, , , @@ -98,7 +91,6 @@ export const Jobs = withInjectables(NonInjectedJobs, { getProps: (di, props) => ({ ...props, eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), jobStore: di.inject(jobStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/+workloads-pods/pod-details-list.tsx b/packages/core/src/renderer/components/+workloads-pods/pod-details-list.tsx index 37e8dab23f..83e15f794e 100644 --- a/packages/core/src/renderer/components/+workloads-pods/pod-details-list.tsx +++ b/packages/core/src/renderer/components/+workloads-pods/pod-details-list.tsx @@ -190,7 +190,7 @@ class NonInjectedPodDetailsList extends React.Component - + Name Node diff --git a/packages/core/src/renderer/components/+workloads-pods/pods.scss b/packages/core/src/renderer/components/+workloads-pods/pods.scss index ee606bc762..3555c54701 100644 --- a/packages/core/src/renderer/components/+workloads-pods/pods.scss +++ b/packages/core/src/renderer/components/+workloads-pods/pods.scss @@ -38,8 +38,6 @@ flex-grow: 0.7; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+workloads-pods/pods.tsx b/packages/core/src/renderer/components/+workloads-pods/pods.tsx index 2e55562154..ab793359b0 100644 --- a/packages/core/src/renderer/components/+workloads-pods/pods.tsx +++ b/packages/core/src/renderer/components/+workloads-pods/pods.tsx @@ -11,7 +11,7 @@ import { Link } from "react-router-dom"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import type { NodeApi, Pod } from "../../../common/k8s-api/endpoints"; import { StatusBrick } from "../status-brick"; -import { cssNames, getConvertedParts, object, prevDefault, stopPropagation } from "../../utils"; +import { cssNames, getConvertedParts, object, stopPropagation } from "../../utils"; import startCase from "lodash/startCase"; import kebabCase from "lodash/kebabCase"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; @@ -28,8 +28,7 @@ import type { PodStore } from "./store"; import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable"; import eventStoreInjectable from "../+events/store.injectable"; import podStoreInjectable from "./store.injectable"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -45,7 +44,6 @@ enum columnId { interface Dependencies { getDetailsUrl: GetDetailsUrl; - filterByNamespace: FilterByNamespace; apiManager: ApiManager; eventStore: EventStore; podStore: PodStore; @@ -111,7 +109,7 @@ class NonInjectedPods extends React.Component { className="Pods" store={podStore} dependentStores={[eventStore]} // status icon component uses event store - tableId = "workloads_pods" + tableId="workloads_pods" isConfigurable sortingCallbacks={{ [columnId.name]: pod => getConvertedParts(pod.getName()), @@ -134,10 +132,30 @@ class NonInjectedPods extends React.Component { renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, { className: "warning", showWithColumn: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, - { title: "Containers", className: "containers", sortBy: columnId.containers, id: columnId.containers }, - { title: "Restarts", className: "restarts", sortBy: columnId.restarts, id: columnId.restarts }, - { title: "Controlled By", className: "owners", sortBy: columnId.owners, id: columnId.owners }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, + { + title: "Containers", + className: "containers", + sortBy: columnId.containers, + id: columnId.containers, + }, + { + title: "Restarts", + className: "restarts", + sortBy: columnId.restarts, + id: columnId.restarts, + }, + { + title: "Controlled By", + className: "owners", + sortBy: columnId.owners, + id: columnId.owners, + }, { title: "Node", className: "node", sortBy: columnId.node, id: columnId.node }, { title: "QoS", className: "qos", sortBy: columnId.qos, id: columnId.qos }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, @@ -152,13 +170,10 @@ class NonInjectedPods extends React.Component { expandable={false} />, , - this.props.filterByNamespace(pod.getNs()))} - > - {pod.getNs()} - , + namespace={pod.getNs()} + />, this.renderContainersStatus(pod), pod.getRestartsCount(), pod.getOwnerRefs().map(ref => { @@ -186,7 +201,9 @@ class NonInjectedPods extends React.Component { tooltip={pod.getNodeName()} expandable={false} > - + {pod.getNodeName()} @@ -210,6 +227,5 @@ export const Pods = withInjectables(NonInjectedPods, { nodeApi: di.inject(nodeApiInjectable), eventStore: di.inject(eventStoreInjectable), podStore: di.inject(podStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/packages/core/src/renderer/components/+workloads-replicasets/replicasets.scss b/packages/core/src/renderer/components/+workloads-replicasets/replicasets.scss index 07e70c53c1..15274677e2 100644 --- a/packages/core/src/renderer/components/+workloads-replicasets/replicasets.scss +++ b/packages/core/src/renderer/components/+workloads-replicasets/replicasets.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+workloads-replicasets/replicasets.tsx b/packages/core/src/renderer/components/+workloads-replicasets/replicasets.tsx index 685315551c..92eb0c45ac 100644 --- a/packages/core/src/renderer/components/+workloads-replicasets/replicasets.tsx +++ b/packages/core/src/renderer/components/+workloads-replicasets/replicasets.tsx @@ -13,12 +13,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { ReplicaSetStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import { prevDefault } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import replicaSetStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -32,13 +30,11 @@ enum columnId { interface Dependencies { replicaSetStore: ReplicaSetStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedReplicaSets = observer((props: Dependencies) => { const { eventStore, - filterByNamespace, replicaSetStore, } = props; @@ -65,22 +61,34 @@ const NonInjectedReplicaSets = observer((props: Dependencies) => { renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, { className: "warning", showWithColumn: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, - { title: "Desired", className: "desired", sortBy: columnId.desired, id: columnId.desired }, - { title: "Current", className: "current", sortBy: columnId.current, id: columnId.current }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, + { + title: "Desired", + className: "desired", + sortBy: columnId.desired, + id: columnId.desired, + }, + { + title: "Current", + className: "current", + sortBy: columnId.current, + id: columnId.current, + }, { title: "Ready", className: "ready", sortBy: columnId.ready, id: columnId.ready }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, ]} renderTableContents={replicaSet => [ replicaSet.getName(), , - filterByNamespace(replicaSet.getNs()))} - > - {replicaSet.getNs()} - , + namespace={replicaSet.getNs()} + />, replicaSet.getDesired(), replicaSet.getCurrent(), replicaSet.getReady(), @@ -95,7 +103,6 @@ export const ReplicaSets = withInjectables(NonInjectedReplicaSets, getProps: (di, props) => ({ ...props, eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), replicaSetStore: di.inject(replicaSetStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.scss b/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.scss index 23b4da9242..ce9277c6bb 100644 --- a/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.scss +++ b/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.scss @@ -17,8 +17,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.tsx b/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.tsx index 30a3970c69..0e35cd6584 100644 --- a/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.tsx +++ b/packages/core/src/renderer/components/+workloads-statefulsets/statefulsets.tsx @@ -14,12 +14,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { StatefulSetStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import statefulSetStoreInjectable from "./store.injectable"; -import { prevDefault } from "../../utils"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -32,7 +30,6 @@ enum columnId { interface Dependencies { statefulSetStore: StatefulSetStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const renderPodCounts = (statefulSet: StatefulSet) => { @@ -44,7 +41,6 @@ const renderPodCounts = (statefulSet: StatefulSet) => { const NonInjectedStatefulSets = observer((props: Dependencies) => { const { eventStore, - filterByNamespace, statefulSetStore, } = props; @@ -68,21 +64,28 @@ const NonInjectedStatefulSets = observer((props: Dependencies) => { renderHeaderTitle="Stateful Sets" renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, { title: "Pods", className: "pods", id: columnId.pods }, - { title: "Replicas", className: "replicas", sortBy: columnId.replicas, id: columnId.replicas }, + { + title: "Replicas", + className: "replicas", + sortBy: columnId.replicas, + id: columnId.replicas, + }, { className: "warning", showWithColumn: columnId.replicas }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, ]} renderTableContents={statefulSet => [ statefulSet.getName(), - filterByNamespace(statefulSet.getNs()))} - > - {statefulSet.getNs()} - , + namespace={statefulSet.getNs()} + />, renderPodCounts(statefulSet), statefulSet.getReplicas(), , @@ -97,7 +100,6 @@ export const StatefulSets = withInjectables(NonInjectedStatefulSet getProps: (di, props) => ({ ...props, eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), statefulSetStore: di.inject(statefulSetStoreInjectable), }), }); diff --git a/packages/core/src/renderer/components/app.scss b/packages/core/src/renderer/components/app.scss index f44d1ee165..b8dd5007b1 100755 --- a/packages/core/src/renderer/components/app.scss +++ b/packages/core/src/renderer/components/app.scss @@ -232,22 +232,6 @@ iframe { } } -#fonts-preloading { - > span { - position: absolute; - visibility: hidden; - height: 0; - - &:before { - width: 0; - display: block; - overflow: hidden; - content: "text-example"; // some text required to start applying/rendering font in document - font-family: inherit; // font-family must be specified via style="" (see: template.html) - } - } -} - // app's common loading indicator, displaying on the route transitions #loading { position: absolute; diff --git a/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts index cc980eb91d..f1b169915f 100644 --- a/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts +++ b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts @@ -88,7 +88,15 @@ export class ClusterFrameHandler { () => { this.dependencies.logger.info(`[LENS-VIEW]: remove dashboard, clusterId=${clusterId}`); this.views.delete(clusterId); - parentElem.removeChild(iframe); + + // Must only remove iframe from DOM after it unloads old code. Else it crashes + iframe.addEventListener("load", () => parentElem.removeChild(iframe), { + once: true, + }); + + // This causes the old code to be unloaded. + iframe.setAttribute("src", ""); + dispose(); }, ); diff --git a/packages/core/src/renderer/components/command-palette/command-dialog.tsx b/packages/core/src/renderer/components/command-palette/command-dialog.tsx index db33bde1cd..ba4036f4c5 100644 --- a/packages/core/src/renderer/components/command-palette/command-dialog.tsx +++ b/packages/core/src/renderer/components/command-palette/command-dialog.tsx @@ -11,7 +11,7 @@ import React, { useState } from "react"; import commandOverlayInjectable from "./command-overlay.injectable"; import type { CatalogEntity } from "../../../common/catalog"; import { broadcastMessage } from "../../../common/ipc"; -import { IpcRendererNavigationEvents } from "../../navigation/events"; +import { IpcRendererNavigationEvents } from "../../../common/ipc/navigation-events"; import type { RegisteredCommand } from "./registered-commands/commands"; import { iter } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts b/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts index 27c7c0664a..2ff82e2c17 100644 --- a/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts +++ b/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts @@ -9,7 +9,8 @@ import type { TabId } from "../dock/store"; import type { TerminalApi } from "../../../api/terminal-api"; import terminalSpawningPoolInjectable from "./terminal-spawning-pool.injectable"; import terminalConfigInjectable from "../../../../common/user-store/terminal-config.injectable"; -import terminalCopyOnSelectInjectable from "../../../../common/user-store/terminal-copy-on-select.injectable"; +import terminalCopyOnSelectInjectable + from "../../../../common/user-store/terminal-copy-on-select.injectable"; import isMacInjectable from "../../../../common/vars/is-mac.injectable"; import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-browser.injectable"; import xtermColorThemeInjectable from "../../../themes/terminal-colors.injectable"; diff --git a/packages/core/src/renderer/components/drawer/drawer.scss b/packages/core/src/renderer/components/drawer/drawer.scss index 2ef81a82dc..58bb056f51 100644 --- a/packages/core/src/renderer/components/drawer/drawer.scss +++ b/packages/core/src/renderer/components/drawer/drawer.scss @@ -86,9 +86,5 @@ .drawer-content { overflow: auto; padding: var(--spacing); - - .Table .TableHead { - border-bottom: 1px solid var(--borderFaintColor); - } } } diff --git a/packages/core/src/renderer/components/fonts.scss b/packages/core/src/renderer/components/fonts.scss index 40f9e9625b..ebbe2894dc 100644 --- a/packages/core/src/renderer/components/fonts.scss +++ b/packages/core/src/renderer/components/fonts.scss @@ -44,58 +44,3 @@ font-display: block; src: url("../fonts/MaterialIcons-Regular.ttf") format("truetype"); } - - -// Terminal fonts (monospaced) -// Source: https://fonts.google.com/?category=Monospace -@font-face { - font-family: "Anonymous Pro"; - src: local("Anonymous Pro"), url("../fonts/AnonymousPro-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "IBM Plex Mono"; - src: local("IBM Plex Mono"), url("../fonts/IBMPlexMono-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "JetBrains Mono"; - src: local("JetBrains Mono"), url("../fonts/JetBrainsMono-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "Red Hat Mono"; - src: local("Red Hat Mono"), url("../fonts/RedHatMono-Regular.ttf") format("truetype"); - font-display: block; -} - - -@font-face { - font-family: "Source Code Pro"; - src: local("Source Code Pro"), url("../fonts/SourceCodePro-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "Space Mono"; - src: local("Space Mono"), url("../fonts/SpaceMono-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "Ubuntu Mono"; - src: local("Ubuntu Mono"), url("../fonts/UbuntuMono-Regular.ttf") format("truetype"); - font-display: block; -} - -// Patched RobotoMono font with icons -// RobotoMono Windows Compatible for using in terminal -// https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/RobotoMono -@font-face { - font-family: "RobotoMono"; - src: local("RobotoMono"), url("../fonts/Roboto-Mono-nerd.ttf") format("truetype"); - font-display: block; -} diff --git a/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx b/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx index 593f2cb2ae..a61ee7dd60 100644 --- a/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx +++ b/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx @@ -62,7 +62,7 @@ const NonInjectedKubeObjectMeta = observer(({ return ( <> -
- + Name Namespace Kind diff --git a/src/renderer/components/+events/events.tsx b/src/renderer/components/+events/events.tsx index e1b9e57bb8..d68bb21a53 100644 --- a/src/renderer/components/+events/events.tsx +++ b/src/renderer/components/+events/events.tsx @@ -19,7 +19,7 @@ import type { HeaderCustomizer } from "../item-object-list"; import { Tooltip } from "../tooltip"; import { Link } from "react-router-dom"; import type { IClassName } from "../../utils"; -import { prevDefault, cssNames, stopPropagation } from "../../utils"; +import { cssNames, stopPropagation } from "../../utils"; import { Icon } from "../icon"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -28,10 +28,9 @@ import { KubeObjectAge } from "../kube-object/age"; import { ReactiveDuration } from "../duration/reactive-duration"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import eventStoreInjectable from "./store.injectable"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { message = "message", @@ -58,7 +57,6 @@ interface Dependencies { navigateToEvents: () => void; eventStore: EventStore; apiManager: ApiManager; - filterByNamespace: FilterByNamespace; getDetailsUrl: GetDetailsUrl; } @@ -202,15 +200,7 @@ class NonInjectedEvents extends React.Component { ), }, compact - ? ( - this.props.filterByNamespace(event.getNs()))} - > - {event.getNs()} - - ) + ? : event.getNs(), (NonInjectedEven navigateToEvents: di.inject(navigateToEventsInjectable), apiManager: di.inject(apiManagerInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), getDetailsUrl: di.inject(getDetailsUrlInjectable), }), }); diff --git a/src/renderer/components/+events/kube-event-details.scss b/src/renderer/components/+events/kube-event-details.module.scss similarity index 91% rename from src/renderer/components/+events/kube-event-details.scss rename to src/renderer/components/+events/kube-event-details.module.scss index 4e781eaf2e..4e6b9cd5a0 100644 --- a/src/renderer/components/+events/kube-event-details.scss +++ b/src/renderer/components/+events/kube-event-details.module.scss @@ -22,8 +22,8 @@ } } } - - .no-items { - text-align: center; - } +} + +.empty { + opacity: 0.6; } diff --git a/src/renderer/components/+events/kube-event-details.tsx b/src/renderer/components/+events/kube-event-details.tsx index aef3bf7b10..80c6938630 100644 --- a/src/renderer/components/+events/kube-event-details.tsx +++ b/src/renderer/components/+events/kube-event-details.tsx @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import "./kube-event-details.scss"; +import styles from "./kube-event-details.module.scss"; import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; @@ -57,14 +57,14 @@ class NonInjectedKubeEventDetails extends React.Component - + Events {events.length > 0 && ( -
+
{events.map(event => ( -
-
+
+
{event.message}
@@ -85,6 +85,11 @@ class NonInjectedKubeEventDetails extends React.Component )} + {events.length === 0 && ( +
+ No events found +
+ )}
); } diff --git a/src/renderer/components/+helm-releases/releases.scss b/src/renderer/components/+helm-releases/releases.scss index 04955a60eb..1cce1c5358 100644 --- a/src/renderer/components/+helm-releases/releases.scss +++ b/src/renderer/components/+helm-releases/releases.scss @@ -21,8 +21,6 @@ } } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+helm-releases/releases.tsx b/src/renderer/components/+helm-releases/releases.tsx index 5714c92fd1..1a0aded7b0 100644 --- a/src/renderer/components/+helm-releases/releases.tsx +++ b/src/renderer/components/+helm-releases/releases.tsx @@ -23,9 +23,7 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import helmReleasesRouteParametersInjectable from "./helm-releases-route-parameters.injectable"; import type { NavigateToHelmReleases } from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; import navigateToHelmReleasesInjectable from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -43,19 +41,9 @@ interface Dependencies { releasesArePending: IComputedValue; namespace: IComputedValue; navigateToHelmReleases: NavigateToHelmReleases; - filterByNamespace: FilterByNamespace; } class NonInjectedHelmReleases extends Component { - // TODO: This side-effect in mount must go. - componentDidMount() { - const namespace = this.props.namespace.get(); - - if (namespace) { - this.props.filterByNamespace(namespace); - } - } - onDetails = (item: HelmRelease) => { this.showDetails(item); }; @@ -188,13 +176,10 @@ class NonInjectedHelmReleases extends Component { ]} renderTableContents={release => [ release.getName(), - this.props.filterByNamespace(release.getNs()))} - > - {release.getNs()} - , + namespace={release.getNs()} + />, release.getChart(), release.getRevision(), release.getVersion(), @@ -226,7 +211,6 @@ export const HelmReleases = withInjectables(NonInjectedHelmRelease releases: di.inject(removableReleasesInjectable), releasesArePending: di.inject(releasesInjectable).pending, navigateToHelmReleases: di.inject(navigateToHelmReleasesInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), ...di.inject(helmReleasesRouteParametersInjectable), }), }); diff --git a/src/renderer/components/+namespaces/namespace-select-badge.module.scss b/src/renderer/components/+namespaces/namespace-select-badge.module.scss new file mode 100644 index 0000000000..75bb18bf40 --- /dev/null +++ b/src/renderer/components/+namespaces/namespace-select-badge.module.scss @@ -0,0 +1,9 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +.NamespaceSelectBadge { + @include pseudo-link; + border-bottom: unset; +} \ No newline at end of file diff --git a/src/renderer/components/+namespaces/namespace-select-badge.tsx b/src/renderer/components/+namespaces/namespace-select-badge.tsx new file mode 100644 index 0000000000..9ae46b0342 --- /dev/null +++ b/src/renderer/components/+namespaces/namespace-select-badge.tsx @@ -0,0 +1,58 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import styles from "./namespace-select-badge.module.scss"; +import React from "react"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import type { BadgeProps } from "../badge"; +import { Badge } from "../badge"; +import type { + FilterByNamespace, +} from "./namespace-select-filter-model/filter-by-namespace.injectable"; +import filterByNamespaceInjectable + from "./namespace-select-filter-model/filter-by-namespace.injectable"; +import { prevDefault, cssNames } from "../../utils"; + +export interface NamespaceSelectBadgeProps extends BadgeProps { + namespace: string; +} + +export interface Dependencies { + filterByNamespace: FilterByNamespace; +} + +export function NamespaceSelectBadgeNonInjected( + { + namespace, + label, + filterByNamespace, + ...props + }: NamespaceSelectBadgeProps & Dependencies) { + return ( + + Set global namespace filter to: + {namespace} + + )} + className={cssNames(styles.NamespaceSelectBadge, props.className)} + onClick={prevDefault(() => filterByNamespace(namespace))} + /> + ); +} + +export const NamespaceSelectBadge = withInjectables(NamespaceSelectBadgeNonInjected, { + getProps(di, props) { + return { + ...props, + filterByNamespace: di.inject(filterByNamespaceInjectable), + }; + }, +}); diff --git a/src/renderer/components/+network-endpoints/endpoints.scss b/src/renderer/components/+network-endpoints/endpoints.scss index a79d36ff17..3e4ea7a85c 100644 --- a/src/renderer/components/+network-endpoints/endpoints.scss +++ b/src/renderer/components/+network-endpoints/endpoints.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+network-endpoints/endpoints.tsx b/src/renderer/components/+network-endpoints/endpoints.tsx index 4358906a67..55d1551860 100644 --- a/src/renderer/components/+network-endpoints/endpoints.tsx +++ b/src/renderer/components/+network-endpoints/endpoints.tsx @@ -11,12 +11,10 @@ import { KubeObjectListLayout } from "../kube-object-list-layout"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; import type { EndpointsStore } from "./store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import endpointsStoreInjectable from "./store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -27,7 +25,6 @@ enum columnId { interface Dependencies { endpointsStore: EndpointsStore; - filterByNamespace: FilterByNamespace; } @observer @@ -59,13 +56,10 @@ class NonInjectedEndpoints extends React.Component { renderTableContents={endpoint => [ endpoint.getName(), , - this.props.filterByNamespace(endpoint.getNs()))} - > - {endpoint.getNs()} - , + namespace={endpoint.getNs()} + />, endpoint.toString(), , ]} @@ -86,6 +80,5 @@ export const Endpoints = withInjectables(NonInjectedEndpoints, { getProps: (di, props) => ({ ...props, endpointsStore: di.inject(endpointsStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/src/renderer/components/+network-ingresses/ingress-details.tsx b/src/renderer/components/+network-ingresses/ingress-details.tsx index d49d1e49a5..a01ced5b7f 100644 --- a/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -37,7 +37,7 @@ class NonInjectedIngressDetails extends React.Component - + Path Link Backends diff --git a/src/renderer/components/+network-ingresses/ingresses.scss b/src/renderer/components/+network-ingresses/ingresses.scss index fdf0bda6b8..4c6d5a75c1 100644 --- a/src/renderer/components/+network-ingresses/ingresses.scss +++ b/src/renderer/components/+network-ingresses/ingresses.scss @@ -32,8 +32,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+network-ingresses/ingresses.tsx b/src/renderer/components/+network-ingresses/ingresses.tsx index e8c8745926..6817d967fb 100644 --- a/src/renderer/components/+network-ingresses/ingresses.tsx +++ b/src/renderer/components/+network-ingresses/ingresses.tsx @@ -12,12 +12,10 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import { computeRouteDeclarations } from "../../../common/k8s-api/endpoints"; -import { prevDefault } from "../../utils"; import type { IngressStore } from "./ingress-store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import ingressStoreInjectable from "./ingress-store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -29,13 +27,11 @@ enum columnId { interface Dependencies { ingressStore: IngressStore; - filterByNamespace: FilterByNamespace; } const NonInjectedIngresses = observer((props: Dependencies) => { const { ingressStore, - filterByNamespace, } = props; return ( @@ -66,13 +62,7 @@ const NonInjectedIngresses = observer((props: Dependencies) => { renderTableContents={ ingress => [ ingress.getName(), , - filterByNamespace(ingress.getNs()))} - > - {ingress.getNs()} - , + , ingress.getLoadBalancers().map(lb =>

{ lb }

), computeRouteDeclarations(ingress).map(decl => ( decl.displayAsLink @@ -112,6 +102,5 @@ export const Ingresses = withInjectables(NonInjectedIngresses, { getProps: (di, props) => ({ ...props, ingressStore: di.inject(ingressStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/src/renderer/components/+network-policies/network-policies.scss b/src/renderer/components/+network-policies/network-policies.scss index d9170a4cb4..38e6cd3d75 100644 --- a/src/renderer/components/+network-policies/network-policies.scss +++ b/src/renderer/components/+network-policies/network-policies.scss @@ -9,8 +9,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+network-policies/network-policies.tsx b/src/renderer/components/+network-policies/network-policies.tsx index a4aeac21f7..47f8e52776 100644 --- a/src/renderer/components/+network-policies/network-policies.tsx +++ b/src/renderer/components/+network-policies/network-policies.tsx @@ -12,11 +12,9 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { NetworkPolicyStore } from "./store"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import networkPolicyStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -27,7 +25,6 @@ enum columnId { interface Dependencies { networkPolicyStore: NetworkPolicyStore; - filterByNamespace: FilterByNamespace; } @observer @@ -59,13 +56,10 @@ class NonInjectedNetworkPolicies extends React.Component { renderTableContents={networkPolicy => [ networkPolicy.getName(), , - this.props.filterByNamespace(networkPolicy.getNs()))} - > - {networkPolicy.getNs()} - , + namespace={networkPolicy.getNs()} + />, networkPolicy.getTypes().join(", "), , ]} @@ -78,7 +72,6 @@ class NonInjectedNetworkPolicies extends React.Component { export const NetworkPolicies = withInjectables(NonInjectedNetworkPolicies, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), networkPolicyStore: di.inject(networkPolicyStoreInjectable), }), }); diff --git a/src/renderer/components/+network-port-forwards/port-forwards.scss b/src/renderer/components/+network-port-forwards/port-forwards.scss index ede9873736..0da7b0e002 100644 --- a/src/renderer/components/+network-port-forwards/port-forwards.scss +++ b/src/renderer/components/+network-port-forwards/port-forwards.scss @@ -14,8 +14,6 @@ flex: 0.6; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+network-port-forwards/port-forwards.tsx b/src/renderer/components/+network-port-forwards/port-forwards.tsx index 8010bf9545..97ab37cdd6 100644 --- a/src/renderer/components/+network-port-forwards/port-forwards.tsx +++ b/src/renderer/components/+network-port-forwards/port-forwards.tsx @@ -19,9 +19,7 @@ import { computed, makeObservable } from "mobx"; import portForwardsRouteParametersInjectable from "./port-forwards-route-parameters.injectable"; import type { NavigateToPortForwards } from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; import navigateToPortForwardsInjectable from "../../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -37,7 +35,6 @@ interface Dependencies { portForwardStore: PortForwardStore; forwardport: IComputedValue; navigateToPortForwards: NavigateToPortForwards; - filterByNamespace: FilterByNamespace; } @observer @@ -132,13 +129,10 @@ class NonInjectedPortForwards extends React.Component { ]} renderTableContents={item => [ item.getName(), - this.props.filterByNamespace(item.getNs()))} - > - {item.getNs()} - , + namespace={item.getNs()} + />, item.getKind(), item.getPort(), item.getForwardPort(), @@ -173,7 +167,6 @@ export const PortForwards = withInjectables(NonInjectedPortForward portForwardStore: di.inject(portForwardStoreInjectable), ...di.inject(portForwardsRouteParametersInjectable), navigateToPortForwards: di.inject(navigateToPortForwardsInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/src/renderer/components/+network-services/service-details-endpoint.tsx b/src/renderer/components/+network-services/service-details-endpoint.tsx index f7dec5077a..7e3eaaf34b 100644 --- a/src/renderer/components/+network-services/service-details-endpoint.tsx +++ b/src/renderer/components/+network-services/service-details-endpoint.tsx @@ -46,7 +46,7 @@ class NonInjectedServiceDetailsEndpoint extends React.Component - + Name Endpoints diff --git a/src/renderer/components/+network-services/services.scss b/src/renderer/components/+network-services/services.scss index 5136582cf0..dcc8ed9d1d 100644 --- a/src/renderer/components/+network-services/services.scss +++ b/src/renderer/components/+network-services/services.scss @@ -26,8 +26,6 @@ flex: 0.6; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+network-services/services.tsx b/src/renderer/components/+network-services/services.tsx index 17295b0af8..7d9a7ba7f4 100644 --- a/src/renderer/components/+network-services/services.tsx +++ b/src/renderer/components/+network-services/services.tsx @@ -12,13 +12,11 @@ import { Badge } from "../badge"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; -import { prevDefault } from "../../utils"; import type { ServiceStore } from "./store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import type { Service } from "../../../common/k8s-api/endpoints"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import serviceStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -48,7 +46,6 @@ const formatExternalIps = (service: Service) => { interface Dependencies { serviceStore: ServiceStore; - filterByNamespace: FilterByNamespace; } @observer @@ -92,13 +89,10 @@ class NonInjectedServices extends React.Component { renderTableContents={service => [ service.getName(), , - this.props.filterByNamespace(service.getNs())) } - > - { service.getNs() } - , + namespace={service.getNs()} + />, service.getType(), service.getClusterIp(), service.getPorts().join(", "), @@ -116,7 +110,6 @@ class NonInjectedServices extends React.Component { export const Services = withInjectables(NonInjectedServices, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), serviceStore: di.inject(serviceStoreInjectable), }), }); diff --git a/src/renderer/components/+nodes/details-resources.tsx b/src/renderer/components/+nodes/details-resources.tsx index b8cb2663a1..0ea4e37019 100644 --- a/src/renderer/components/+nodes/details-resources.tsx +++ b/src/renderer/components/+nodes/details-resources.tsx @@ -38,7 +38,7 @@ export function NodeDetailsResources({ type, node: { status = {}}}: NodeDetailsR selectable scrollable={false} > - + CPU Memory Ephemeral Storage diff --git a/src/renderer/components/+storage-volume-claims/volume-claims.scss b/src/renderer/components/+storage-volume-claims/volume-claims.scss index ac476c595c..f34b575bb3 100644 --- a/src/renderer/components/+storage-volume-claims/volume-claims.scss +++ b/src/renderer/components/+storage-volume-claims/volume-claims.scss @@ -39,8 +39,6 @@ flex: 0.4; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+storage-volume-claims/volume-claims.tsx b/src/renderer/components/+storage-volume-claims/volume-claims.tsx index 31ebee4bc4..39ec81f8de 100644 --- a/src/renderer/components/+storage-volume-claims/volume-claims.tsx +++ b/src/renderer/components/+storage-volume-claims/volume-claims.tsx @@ -10,7 +10,7 @@ import { observer } from "mobx-react"; import { Link } from "react-router-dom"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import { unitsToBytes } from "../../../common/utils/convertMemory"; -import { prevDefault, stopPropagation } from "../../utils"; +import { stopPropagation } from "../../utils"; import type { StorageClassApi } from "../../../common/k8s-api/endpoints"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; @@ -18,13 +18,12 @@ import { KubeObjectAge } from "../kube-object/age"; import type { PersistentVolumeClaimStore } from "./store"; import type { PodStore } from "../+workloads-pods/store"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; import persistentVolumeClaimStoreInjectable from "./store.injectable"; import podStoreInjectable from "../+workloads-pods/store.injectable"; import storageClassApiInjectable from "../../../common/k8s-api/endpoints/storage-class.api.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -41,7 +40,6 @@ interface Dependencies { storageClassApi: StorageClassApi; podStore: PodStore; getDetailsUrl: GetDetailsUrl; - filterByNamespace: FilterByNamespace; } @observer @@ -49,7 +47,6 @@ class NonInjectedPersistentVolumeClaims extends React.Component { render() { const { persistentVolumeClaimStore, - filterByNamespace, getDetailsUrl, podStore, storageClassApi, @@ -97,13 +94,10 @@ class NonInjectedPersistentVolumeClaims extends React.Component { return [ pvc.getName(), , - filterByNamespace(pvc.getNs()))} - > - {pvc.getNs()} - , + namespace={pvc.getNs()} + />, { export const PersistentVolumeClaims = withInjectables(NonInjectedPersistentVolumeClaims, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), getDetailsUrl: di.inject(getDetailsUrlInjectable), persistentVolumeClaimStore: di.inject(persistentVolumeClaimStoreInjectable), podStore: di.inject(podStoreInjectable), diff --git a/src/renderer/components/+user-management/+role-bindings/view.scss b/src/renderer/components/+user-management/+role-bindings/view.scss index d57c5679c3..3c72d3f115 100644 --- a/src/renderer/components/+user-management/+role-bindings/view.scss +++ b/src/renderer/components/+user-management/+role-bindings/view.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+user-management/+role-bindings/view.tsx b/src/renderer/components/+user-management/+role-bindings/view.tsx index 3f5e458453..2489d9cfa3 100644 --- a/src/renderer/components/+user-management/+role-bindings/view.tsx +++ b/src/renderer/components/+user-management/+role-bindings/view.tsx @@ -14,17 +14,15 @@ import { KubeObjectAge } from "../../kube-object/age"; import type { RoleStore } from "../+roles/store"; import type { ServiceAccountStore } from "../+service-accounts/store"; import type { RoleBindingStore } from "./store"; -import { prevDefault } from "../../../utils"; import type { ClusterRoleStore } from "../+cluster-roles/store"; -import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import clusterRoleStoreInjectable from "../+cluster-roles/store.injectable"; -import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import roleBindingStoreInjectable from "./store.injectable"; import roleStoreInjectable from "../+roles/store.injectable"; import serviceAccountStoreInjectable from "../+service-accounts/store.injectable"; import type { OpenRoleBindingDialog } from "./dialog/open.injectable"; import openRoleBindingDialogInjectable from "./dialog/open.injectable"; +import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -38,7 +36,6 @@ interface Dependencies { roleStore: RoleStore; clusterRoleStore: ClusterRoleStore; serviceAccountStore: ServiceAccountStore; - filterByNamespace: FilterByNamespace; openRoleBindingDialog: OpenRoleBindingDialog; } @@ -50,7 +47,6 @@ class NonInjectedRoleBindings extends React.Component { roleBindingStore, roleStore, serviceAccountStore, - filterByNamespace, openRoleBindingDialog, } = this.props; @@ -83,13 +79,10 @@ class NonInjectedRoleBindings extends React.Component { renderTableContents={binding => [ binding.getName(), , - filterByNamespace(binding.getNs()))} - > - {binding.getNs()} - , + namespace={binding.getNs()} + />, binding.getSubjectNames(), , ]} @@ -108,7 +101,6 @@ export const RoleBindings = withInjectables(NonInjectedRoleBinding getProps: (di, props) => ({ ...props, clusterRoleStore: di.inject(clusterRoleStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), roleBindingStore: di.inject(roleBindingStoreInjectable), roleStore: di.inject(roleStoreInjectable), serviceAccountStore: di.inject(serviceAccountStoreInjectable), diff --git a/src/renderer/components/+user-management/+roles/view.scss b/src/renderer/components/+user-management/+roles/view.scss index 7ed72f8cc2..6fae603fd3 100644 --- a/src/renderer/components/+user-management/+roles/view.scss +++ b/src/renderer/components/+user-management/+roles/view.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+user-management/+roles/view.tsx b/src/renderer/components/+user-management/+roles/view.tsx index bf308b38af..a299ac1085 100644 --- a/src/renderer/components/+user-management/+roles/view.tsx +++ b/src/renderer/components/+user-management/+roles/view.tsx @@ -13,12 +13,10 @@ import { AddRoleDialog } from "./add-dialog/view"; import { SiblingsInTabLayout } from "../../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../../kube-object/age"; import type { RoleStore } from "./store"; -import { prevDefault } from "../../../utils"; -import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import roleStoreInjectable from "./store.injectable"; import openAddRoleDialogInjectable from "./add-dialog/open.injectable"; +import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -28,7 +26,6 @@ enum columnId { interface Dependencies { roleStore: RoleStore; - filterByNamespace: FilterByNamespace; openAddRoleDialog: () => void; } @@ -36,7 +33,6 @@ interface Dependencies { class NonInjectedRoles extends React.Component { render() { const { - filterByNamespace, roleStore, openAddRoleDialog, } = this.props; @@ -66,13 +62,10 @@ class NonInjectedRoles extends React.Component { renderTableContents={role => [ role.getName(), , - filterByNamespace(role.getNs()))} - > - {role.getNs()} - , + namespace={role.getNs()} + />, , ]} addRemoveButtons={{ @@ -89,7 +82,6 @@ class NonInjectedRoles extends React.Component { export const Roles = withInjectables(NonInjectedRoles, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), roleStore: di.inject(roleStoreInjectable), openAddRoleDialog: di.inject(openAddRoleDialogInjectable), }), diff --git a/src/renderer/components/+user-management/+service-accounts/view.scss b/src/renderer/components/+user-management/+service-accounts/view.scss index e1fa133b5e..4cc730d949 100644 --- a/src/renderer/components/+user-management/+service-accounts/view.scss +++ b/src/renderer/components/+user-management/+service-accounts/view.scss @@ -9,8 +9,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+user-management/+service-accounts/view.tsx b/src/renderer/components/+user-management/+service-accounts/view.tsx index 1043250d73..ce7eb4988e 100644 --- a/src/renderer/components/+user-management/+service-accounts/view.tsx +++ b/src/renderer/components/+user-management/+service-accounts/view.tsx @@ -12,14 +12,12 @@ import { KubeObjectStatusIcon } from "../../kube-object-status-icon"; import { CreateServiceAccountDialog } from "./create-dialog/view"; import { SiblingsInTabLayout } from "../../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../../kube-object/age"; -import { prevDefault } from "../../../utils"; import type { ServiceAccountStore } from "./store"; -import type { FilterByNamespace } from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import filterByNamespaceInjectable from "../../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import serviceAccountStoreInjectable from "./store.injectable"; import type { OpenCreateServiceAccountDialog } from "./create-dialog/open.injectable"; import openCreateServiceAccountDialogInjectable from "./create-dialog/open.injectable"; +import { NamespaceSelectBadge } from "../../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -29,7 +27,6 @@ enum columnId { interface Dependencies { serviceAccountStore: ServiceAccountStore; - filterByNamespace: FilterByNamespace; openCreateServiceAccountDialog: OpenCreateServiceAccountDialog; } @@ -37,7 +34,6 @@ interface Dependencies { class NonInjectedServiceAccounts extends React.Component { render() { const { - filterByNamespace, serviceAccountStore, openCreateServiceAccountDialog, } = this.props; @@ -67,13 +63,10 @@ class NonInjectedServiceAccounts extends React.Component { renderTableContents={account => [ account.getName(), , - filterByNamespace(account.getNs()))} - > - {account.getNs()} - , + namespace={account.getNs()} + />, , ]} addRemoveButtons={{ @@ -90,7 +83,6 @@ class NonInjectedServiceAccounts extends React.Component { export const ServiceAccounts = withInjectables(NonInjectedServiceAccounts, { getProps: (di, props) => ({ ...props, - filterByNamespace: di.inject(filterByNamespaceInjectable), serviceAccountStore: di.inject(serviceAccountStoreInjectable), openCreateServiceAccountDialog: di.inject(openCreateServiceAccountDialogInjectable), }), diff --git a/src/renderer/components/+workloads-cronjobs/cronjobs.scss b/src/renderer/components/+workloads-cronjobs/cronjobs.scss index 29b9fb18c1..9fc51383b7 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjobs.scss +++ b/src/renderer/components/+workloads-cronjobs/cronjobs.scss @@ -9,8 +9,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx index 1dba28c478..365c469917 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx +++ b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx @@ -17,9 +17,7 @@ import type { EventStore } from "../+events/store"; import { withInjectables } from "@ogre-tools/injectable-react"; import cronJobStoreInjectable from "./store.injectable"; import eventStoreInjectable from "../+events/store.injectable"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -34,14 +32,12 @@ enum columnId { interface Dependencies { cronJobStore: CronJobStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedCronJobs = observer((props: Dependencies) => { const { cronJobStore, eventStore, - filterByNamespace, } = props; return ( @@ -82,13 +78,10 @@ const NonInjectedCronJobs = observer((props: Dependencies) => { renderTableContents={cronJob => [ cronJob.getName(), , - filterByNamespace(cronJob.getNs()))} - > - {cronJob.getNs()} - , + namespace={cronJob.getNs()} + />, cronJob.isNeverRun() ? "never" : cronJob.getSchedule(), cronJob.getSuspendFlag(), cronJobStore.getActiveJobsNum(cronJob), @@ -105,6 +98,5 @@ export const CronJobs = withInjectables(NonInjectedCronJobs, { ...props, cronJobStore: di.inject(cronJobStoreInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/src/renderer/components/+workloads-daemonsets/daemonsets.scss b/src/renderer/components/+workloads-daemonsets/daemonsets.scss index 1500c74d78..a5ea8e74be 100644 --- a/src/renderer/components/+workloads-daemonsets/daemonsets.scss +++ b/src/renderer/components/+workloads-daemonsets/daemonsets.scss @@ -22,8 +22,6 @@ @include table-cell-labels-offsets; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+workloads-daemonsets/daemonsets.tsx b/src/renderer/components/+workloads-daemonsets/daemonsets.tsx index 5fc4ac6bc8..9760cd2457 100644 --- a/src/renderer/components/+workloads-daemonsets/daemonsets.tsx +++ b/src/renderer/components/+workloads-daemonsets/daemonsets.tsx @@ -15,12 +15,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { DaemonSetStore } from "./store"; import type { EventStore } from "../+events/store"; -import { prevDefault } from "../../utils"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import daemonSetStoreInjectable from "./store.injectable"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -33,14 +31,12 @@ enum columnId { interface Dependencies { daemonSetStore: DaemonSetStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedDaemonSets = observer((props: Dependencies) => { const { daemonSetStore, eventStore, - filterByNamespace, } = props; const getPodsLength = (daemonSet: DaemonSet) => daemonSetStore.getChildPods(daemonSet).length; @@ -66,7 +62,12 @@ const NonInjectedDaemonSets = observer((props: Dependencies) => { renderHeaderTitle="Daemon Sets" renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, { title: "Pods", className: "pods", sortBy: columnId.pods, id: columnId.pods }, { className: "warning", showWithColumn: columnId.pods }, { title: "Node Selector", className: "labels scrollable", id: columnId.labels }, @@ -74,13 +75,10 @@ const NonInjectedDaemonSets = observer((props: Dependencies) => { ]} renderTableContents={daemonSet => [ daemonSet.getName(), - filterByNamespace(daemonSet.getNs()))} - > - {daemonSet.getNs()} - , + namespace={daemonSet.getNs()} + />, getPodsLength(daemonSet), , daemonSet.getNodeSelectors().map(selector => ( @@ -102,6 +100,5 @@ export const DaemonSets = withInjectables(NonInjectedDaemonSets, { ...props, daemonSetStore: di.inject(daemonSetStoreInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx b/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx index d46e3e7f31..fc334f87f0 100644 --- a/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx +++ b/src/renderer/components/+workloads-deployments/deployment-replicasets.tsx @@ -78,7 +78,7 @@ class NonInjectedDeploymentReplicaSets extends React.Component - + Name Namespace diff --git a/src/renderer/components/+workloads-deployments/deployments.scss b/src/renderer/components/+workloads-deployments/deployments.scss index 322faa6d8d..5d9ed72c03 100644 --- a/src/renderer/components/+workloads-deployments/deployments.scss +++ b/src/renderer/components/+workloads-deployments/deployments.scss @@ -43,8 +43,6 @@ } } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+workloads-deployments/deployments.tsx b/src/renderer/components/+workloads-deployments/deployments.tsx index d069cd73c1..6fa9fff211 100644 --- a/src/renderer/components/+workloads-deployments/deployments.tsx +++ b/src/renderer/components/+workloads-deployments/deployments.tsx @@ -9,7 +9,7 @@ import React from "react"; import { observer } from "mobx-react"; import type { Deployment } from "../../../common/k8s-api/endpoints"; import { KubeObjectListLayout } from "../kube-object-list-layout"; -import { cssNames, prevDefault } from "../../utils"; +import { cssNames } from "../../utils"; import kebabCase from "lodash/kebabCase"; import orderBy from "lodash/orderBy"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; @@ -17,11 +17,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { DeploymentStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import deploymentStoreInjectable from "./store.injectable"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -35,7 +34,6 @@ enum columnId { interface Dependencies { deploymentStore: DeploymentStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } @observer @@ -64,7 +62,6 @@ class NonInjectedDeployments extends React.Component { const { deploymentStore, eventStore, - filterByNamespace, } = this.props; return ( @@ -90,22 +87,34 @@ class NonInjectedDeployments extends React.Component { renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, { className: "warning", showWithColumn: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, { title: "Pods", className: "pods", id: columnId.pods }, - { title: "Replicas", className: "replicas", sortBy: columnId.replicas, id: columnId.replicas }, + { + title: "Replicas", + className: "replicas", + sortBy: columnId.replicas, + id: columnId.replicas, + }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, - { title: "Conditions", className: "conditions", sortBy: columnId.condition, id: columnId.condition }, + { + title: "Conditions", + className: "conditions", + sortBy: columnId.condition, + id: columnId.condition, + }, ]} renderTableContents={deployment => [ deployment.getName(), , - filterByNamespace(deployment.getNs()))} - > - {deployment.getNs()} - , + namespace={deployment.getNs()} + />, this.renderPods(deployment), deployment.getReplicas(), , @@ -122,6 +131,5 @@ export const Deployments = withInjectables(NonInjectedDeployments, ...props, deploymentStore: di.inject(deploymentStoreInjectable), eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/src/renderer/components/+workloads-jobs/jobs.scss b/src/renderer/components/+workloads-jobs/jobs.scss index a24cfc7b06..f293ba5b38 100644 --- a/src/renderer/components/+workloads-jobs/jobs.scss +++ b/src/renderer/components/+workloads-jobs/jobs.scss @@ -19,8 +19,6 @@ @include job-condition-colors; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+workloads-jobs/jobs.tsx b/src/renderer/components/+workloads-jobs/jobs.tsx index c0bc9e2d66..5893a27708 100644 --- a/src/renderer/components/+workloads-jobs/jobs.tsx +++ b/src/renderer/components/+workloads-jobs/jobs.tsx @@ -14,12 +14,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { JobStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import { prevDefault } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import jobStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -32,13 +30,11 @@ enum columnId { interface Dependencies { jobStore: JobStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedJobs = observer((props: Dependencies) => { const { eventStore, - filterByNamespace, jobStore, } = props; @@ -73,13 +69,10 @@ const NonInjectedJobs = observer((props: Dependencies) => { return [ job.getName(), - filterByNamespace(job.getNs()))} - > - {job.getNs()} - , + namespace={job.getNs()} + />, `${job.getCompletions()} / ${job.getDesiredCompletions()}`, , , @@ -98,7 +91,6 @@ export const Jobs = withInjectables(NonInjectedJobs, { getProps: (di, props) => ({ ...props, eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), jobStore: di.inject(jobStoreInjectable), }), }); diff --git a/src/renderer/components/+workloads-pods/pod-details-list.tsx b/src/renderer/components/+workloads-pods/pod-details-list.tsx index 37e8dab23f..83e15f794e 100644 --- a/src/renderer/components/+workloads-pods/pod-details-list.tsx +++ b/src/renderer/components/+workloads-pods/pod-details-list.tsx @@ -190,7 +190,7 @@ class NonInjectedPodDetailsList extends React.Component - + Name Node diff --git a/src/renderer/components/+workloads-pods/pods.scss b/src/renderer/components/+workloads-pods/pods.scss index ee606bc762..3555c54701 100644 --- a/src/renderer/components/+workloads-pods/pods.scss +++ b/src/renderer/components/+workloads-pods/pods.scss @@ -38,8 +38,6 @@ flex-grow: 0.7; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+workloads-pods/pods.tsx b/src/renderer/components/+workloads-pods/pods.tsx index 2e55562154..ab793359b0 100644 --- a/src/renderer/components/+workloads-pods/pods.tsx +++ b/src/renderer/components/+workloads-pods/pods.tsx @@ -11,7 +11,7 @@ import { Link } from "react-router-dom"; import { KubeObjectListLayout } from "../kube-object-list-layout"; import type { NodeApi, Pod } from "../../../common/k8s-api/endpoints"; import { StatusBrick } from "../status-brick"; -import { cssNames, getConvertedParts, object, prevDefault, stopPropagation } from "../../utils"; +import { cssNames, getConvertedParts, object, stopPropagation } from "../../utils"; import startCase from "lodash/startCase"; import kebabCase from "lodash/kebabCase"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; @@ -28,8 +28,7 @@ import type { PodStore } from "./store"; import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable"; import eventStoreInjectable from "../+events/store.injectable"; import podStoreInjectable from "./store.injectable"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -45,7 +44,6 @@ enum columnId { interface Dependencies { getDetailsUrl: GetDetailsUrl; - filterByNamespace: FilterByNamespace; apiManager: ApiManager; eventStore: EventStore; podStore: PodStore; @@ -111,7 +109,7 @@ class NonInjectedPods extends React.Component { className="Pods" store={podStore} dependentStores={[eventStore]} // status icon component uses event store - tableId = "workloads_pods" + tableId="workloads_pods" isConfigurable sortingCallbacks={{ [columnId.name]: pod => getConvertedParts(pod.getName()), @@ -134,10 +132,30 @@ class NonInjectedPods extends React.Component { renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, { className: "warning", showWithColumn: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, - { title: "Containers", className: "containers", sortBy: columnId.containers, id: columnId.containers }, - { title: "Restarts", className: "restarts", sortBy: columnId.restarts, id: columnId.restarts }, - { title: "Controlled By", className: "owners", sortBy: columnId.owners, id: columnId.owners }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, + { + title: "Containers", + className: "containers", + sortBy: columnId.containers, + id: columnId.containers, + }, + { + title: "Restarts", + className: "restarts", + sortBy: columnId.restarts, + id: columnId.restarts, + }, + { + title: "Controlled By", + className: "owners", + sortBy: columnId.owners, + id: columnId.owners, + }, { title: "Node", className: "node", sortBy: columnId.node, id: columnId.node }, { title: "QoS", className: "qos", sortBy: columnId.qos, id: columnId.qos }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, @@ -152,13 +170,10 @@ class NonInjectedPods extends React.Component { expandable={false} />, , - this.props.filterByNamespace(pod.getNs()))} - > - {pod.getNs()} - , + namespace={pod.getNs()} + />, this.renderContainersStatus(pod), pod.getRestartsCount(), pod.getOwnerRefs().map(ref => { @@ -186,7 +201,9 @@ class NonInjectedPods extends React.Component { tooltip={pod.getNodeName()} expandable={false} > - + {pod.getNodeName()} @@ -210,6 +227,5 @@ export const Pods = withInjectables(NonInjectedPods, { nodeApi: di.inject(nodeApiInjectable), eventStore: di.inject(eventStoreInjectable), podStore: di.inject(podStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), }), }); diff --git a/src/renderer/components/+workloads-replicasets/replicasets.scss b/src/renderer/components/+workloads-replicasets/replicasets.scss index 07e70c53c1..15274677e2 100644 --- a/src/renderer/components/+workloads-replicasets/replicasets.scss +++ b/src/renderer/components/+workloads-replicasets/replicasets.scss @@ -13,8 +13,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+workloads-replicasets/replicasets.tsx b/src/renderer/components/+workloads-replicasets/replicasets.tsx index 685315551c..92eb0c45ac 100644 --- a/src/renderer/components/+workloads-replicasets/replicasets.tsx +++ b/src/renderer/components/+workloads-replicasets/replicasets.tsx @@ -13,12 +13,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { ReplicaSetStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; -import { prevDefault } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import replicaSetStoreInjectable from "./store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -32,13 +30,11 @@ enum columnId { interface Dependencies { replicaSetStore: ReplicaSetStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const NonInjectedReplicaSets = observer((props: Dependencies) => { const { eventStore, - filterByNamespace, replicaSetStore, } = props; @@ -65,22 +61,34 @@ const NonInjectedReplicaSets = observer((props: Dependencies) => { renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, { className: "warning", showWithColumn: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, - { title: "Desired", className: "desired", sortBy: columnId.desired, id: columnId.desired }, - { title: "Current", className: "current", sortBy: columnId.current, id: columnId.current }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, + { + title: "Desired", + className: "desired", + sortBy: columnId.desired, + id: columnId.desired, + }, + { + title: "Current", + className: "current", + sortBy: columnId.current, + id: columnId.current, + }, { title: "Ready", className: "ready", sortBy: columnId.ready, id: columnId.ready }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, ]} renderTableContents={replicaSet => [ replicaSet.getName(), , - filterByNamespace(replicaSet.getNs()))} - > - {replicaSet.getNs()} - , + namespace={replicaSet.getNs()} + />, replicaSet.getDesired(), replicaSet.getCurrent(), replicaSet.getReady(), @@ -95,7 +103,6 @@ export const ReplicaSets = withInjectables(NonInjectedReplicaSets, getProps: (di, props) => ({ ...props, eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), replicaSetStore: di.inject(replicaSetStoreInjectable), }), }); diff --git a/src/renderer/components/+workloads-statefulsets/statefulsets.scss b/src/renderer/components/+workloads-statefulsets/statefulsets.scss index 23b4da9242..ce9277c6bb 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulsets.scss +++ b/src/renderer/components/+workloads-statefulsets/statefulsets.scss @@ -17,8 +17,6 @@ @include table-cell-warning; } - a.filterNamespace { - border-bottom: unset; - } + } } diff --git a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx index 30a3970c69..0e35cd6584 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulsets.tsx +++ b/src/renderer/components/+workloads-statefulsets/statefulsets.tsx @@ -14,12 +14,10 @@ import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import { KubeObjectAge } from "../kube-object/age"; import type { StatefulSetStore } from "./store"; import type { EventStore } from "../+events/store"; -import type { FilterByNamespace } from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import eventStoreInjectable from "../+events/store.injectable"; -import filterByNamespaceInjectable from "../+namespaces/namespace-select-filter-model/filter-by-namespace.injectable"; import statefulSetStoreInjectable from "./store.injectable"; -import { prevDefault } from "../../utils"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; enum columnId { name = "name", @@ -32,7 +30,6 @@ enum columnId { interface Dependencies { statefulSetStore: StatefulSetStore; eventStore: EventStore; - filterByNamespace: FilterByNamespace; } const renderPodCounts = (statefulSet: StatefulSet) => { @@ -44,7 +41,6 @@ const renderPodCounts = (statefulSet: StatefulSet) => { const NonInjectedStatefulSets = observer((props: Dependencies) => { const { eventStore, - filterByNamespace, statefulSetStore, } = props; @@ -68,21 +64,28 @@ const NonInjectedStatefulSets = observer((props: Dependencies) => { renderHeaderTitle="Stateful Sets" renderTableHeader={[ { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, - { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, { title: "Pods", className: "pods", id: columnId.pods }, - { title: "Replicas", className: "replicas", sortBy: columnId.replicas, id: columnId.replicas }, + { + title: "Replicas", + className: "replicas", + sortBy: columnId.replicas, + id: columnId.replicas, + }, { className: "warning", showWithColumn: columnId.replicas }, { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, ]} renderTableContents={statefulSet => [ statefulSet.getName(), - filterByNamespace(statefulSet.getNs()))} - > - {statefulSet.getNs()} - , + namespace={statefulSet.getNs()} + />, renderPodCounts(statefulSet), statefulSet.getReplicas(), , @@ -97,7 +100,6 @@ export const StatefulSets = withInjectables(NonInjectedStatefulSet getProps: (di, props) => ({ ...props, eventStore: di.inject(eventStoreInjectable), - filterByNamespace: di.inject(filterByNamespaceInjectable), statefulSetStore: di.inject(statefulSetStoreInjectable), }), }); diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss index f44d1ee165..b8dd5007b1 100755 --- a/src/renderer/components/app.scss +++ b/src/renderer/components/app.scss @@ -232,22 +232,6 @@ iframe { } } -#fonts-preloading { - > span { - position: absolute; - visibility: hidden; - height: 0; - - &:before { - width: 0; - display: block; - overflow: hidden; - content: "text-example"; // some text required to start applying/rendering font in document - font-family: inherit; // font-family must be specified via style="" (see: template.html) - } - } -} - // app's common loading indicator, displaying on the route transitions #loading { position: absolute; diff --git a/src/renderer/components/cluster-manager/cluster-frame-handler.ts b/src/renderer/components/cluster-manager/cluster-frame-handler.ts index cc980eb91d..f1b169915f 100644 --- a/src/renderer/components/cluster-manager/cluster-frame-handler.ts +++ b/src/renderer/components/cluster-manager/cluster-frame-handler.ts @@ -88,7 +88,15 @@ export class ClusterFrameHandler { () => { this.dependencies.logger.info(`[LENS-VIEW]: remove dashboard, clusterId=${clusterId}`); this.views.delete(clusterId); - parentElem.removeChild(iframe); + + // Must only remove iframe from DOM after it unloads old code. Else it crashes + iframe.addEventListener("load", () => parentElem.removeChild(iframe), { + once: true, + }); + + // This causes the old code to be unloaded. + iframe.setAttribute("src", ""); + dispose(); }, ); diff --git a/src/renderer/components/command-palette/command-dialog.tsx b/src/renderer/components/command-palette/command-dialog.tsx index db33bde1cd..ba4036f4c5 100644 --- a/src/renderer/components/command-palette/command-dialog.tsx +++ b/src/renderer/components/command-palette/command-dialog.tsx @@ -11,7 +11,7 @@ import React, { useState } from "react"; import commandOverlayInjectable from "./command-overlay.injectable"; import type { CatalogEntity } from "../../../common/catalog"; import { broadcastMessage } from "../../../common/ipc"; -import { IpcRendererNavigationEvents } from "../../navigation/events"; +import { IpcRendererNavigationEvents } from "../../../common/ipc/navigation-events"; import type { RegisteredCommand } from "./registered-commands/commands"; import { iter } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; diff --git a/src/renderer/components/dock/terminal/create-terminal.injectable.ts b/src/renderer/components/dock/terminal/create-terminal.injectable.ts index 27c7c0664a..2ff82e2c17 100644 --- a/src/renderer/components/dock/terminal/create-terminal.injectable.ts +++ b/src/renderer/components/dock/terminal/create-terminal.injectable.ts @@ -9,7 +9,8 @@ import type { TabId } from "../dock/store"; import type { TerminalApi } from "../../../api/terminal-api"; import terminalSpawningPoolInjectable from "./terminal-spawning-pool.injectable"; import terminalConfigInjectable from "../../../../common/user-store/terminal-config.injectable"; -import terminalCopyOnSelectInjectable from "../../../../common/user-store/terminal-copy-on-select.injectable"; +import terminalCopyOnSelectInjectable + from "../../../../common/user-store/terminal-copy-on-select.injectable"; import isMacInjectable from "../../../../common/vars/is-mac.injectable"; import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-browser.injectable"; import xtermColorThemeInjectable from "../../../themes/terminal-colors.injectable"; diff --git a/src/renderer/components/drawer/drawer.scss b/src/renderer/components/drawer/drawer.scss index 2ef81a82dc..58bb056f51 100644 --- a/src/renderer/components/drawer/drawer.scss +++ b/src/renderer/components/drawer/drawer.scss @@ -86,9 +86,5 @@ .drawer-content { overflow: auto; padding: var(--spacing); - - .Table .TableHead { - border-bottom: 1px solid var(--borderFaintColor); - } } } diff --git a/src/renderer/components/fonts.scss b/src/renderer/components/fonts.scss index 40f9e9625b..ebbe2894dc 100644 --- a/src/renderer/components/fonts.scss +++ b/src/renderer/components/fonts.scss @@ -44,58 +44,3 @@ font-display: block; src: url("../fonts/MaterialIcons-Regular.ttf") format("truetype"); } - - -// Terminal fonts (monospaced) -// Source: https://fonts.google.com/?category=Monospace -@font-face { - font-family: "Anonymous Pro"; - src: local("Anonymous Pro"), url("../fonts/AnonymousPro-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "IBM Plex Mono"; - src: local("IBM Plex Mono"), url("../fonts/IBMPlexMono-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "JetBrains Mono"; - src: local("JetBrains Mono"), url("../fonts/JetBrainsMono-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "Red Hat Mono"; - src: local("Red Hat Mono"), url("../fonts/RedHatMono-Regular.ttf") format("truetype"); - font-display: block; -} - - -@font-face { - font-family: "Source Code Pro"; - src: local("Source Code Pro"), url("../fonts/SourceCodePro-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "Space Mono"; - src: local("Space Mono"), url("../fonts/SpaceMono-Regular.ttf") format("truetype"); - font-display: block; -} - -@font-face { - font-family: "Ubuntu Mono"; - src: local("Ubuntu Mono"), url("../fonts/UbuntuMono-Regular.ttf") format("truetype"); - font-display: block; -} - -// Patched RobotoMono font with icons -// RobotoMono Windows Compatible for using in terminal -// https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/RobotoMono -@font-face { - font-family: "RobotoMono"; - src: local("RobotoMono"), url("../fonts/Roboto-Mono-nerd.ttf") format("truetype"); - font-display: block; -} diff --git a/src/renderer/components/kube-object-meta/kube-object-meta.tsx b/src/renderer/components/kube-object-meta/kube-object-meta.tsx index 593f2cb2ae..a61ee7dd60 100644 --- a/src/renderer/components/kube-object-meta/kube-object-meta.tsx +++ b/src/renderer/components/kube-object-meta/kube-object-meta.tsx @@ -62,7 +62,7 @@ const NonInjectedKubeObjectMeta = observer(({ return ( <> -