hendrik/lens
1
0 Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mobx-6.2

Browse Source 
# Conflicts:
#	src/common/catalog-entities/kubernetes-cluster.ts
#	src/common/catalog-entities/web-link.ts
#	src/common/catalog/catalog-category-registry.ts
#	src/extensions/core-api/catalog.ts
#	src/main/cluster-manager.ts
#	src/renderer/api/catalog-entity-registry.ts
#	src/renderer/components/+catalog/catalog-entity.store.ts
This commit is contained in:
Roman committed 2021-04-25 20:55:20 +03:00
2 parents 484ab443a2 339502cf4f
commit c19be88691
28 files changed
+241 -210
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/catalog-pusher.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { autorun, toJS } from "mobx";
import { broadcastMessage, subscribeToBroadcast, unsubscribeFromBroadcast } from "../common/ipc";
import { CatalogEntityRegistry} from "../common/catalog-entity-registry";
import { CatalogEntityRegistry} from "../common/catalog";
import "../common/catalog-entities/kubernetes-cluster";
export class CatalogPusher {
src/main/cluster-manager.ts
+2 -2
View File
@@ -6,10 +6,10 @@ import { ClusterStore, getClusterIdFromHost } from "../common/cluster-store";
import { Cluster } from "./cluster";
import logger from "./logger";
import { apiKubePrefix } from "../common/vars";
import { cloneJson, Singleton } from "../common/utils";
import { CatalogEntity, catalogEntityRegistry } from "../common/catalog";
import { CatalogEntity, CatalogEntityData } from "../common/catalog-entity";
import { cloneJson, Singleton } from "../common/utils";
import { KubernetesCluster } from "../common/catalog-entities/kubernetes-cluster";
import { catalogEntityRegistry } from "../common/catalog-entity-registry";
const clusterOwnerRef = "ClusterManager";
src/main/index.ts
+1 -1
View File
@@ -31,7 +31,7 @@ import { bindBroadcastHandlers } from "../common/ipc";
import { startUpdateChecking } from "./app-updater";
import { IpcRendererNavigationEvents } from "../renderer/navigation/events";
import { CatalogPusher } from "./catalog-pusher";
import { catalogEntityRegistry } from "../common/catalog-entity-registry";
import { catalogEntityRegistry } from "../common/catalog";
import { HotbarStore } from "../common/hotbar-store";
import { HelmRepoManager } from "./helm/helm-repo-manager";