From 2684b4c1309623c0fb9707d790298143b688995f Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 21 Apr 2022 12:54:19 -0400
Subject: [PATCH] fix catalog-entity-registry.test.ts

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/extensions/main-api/catalog.ts                   |  9 ++++++---
 src/extensions/renderer-api/catalog.ts               |  5 ++++-
 .../api/__tests__/catalog-entity-registry.test.ts    | 12 +++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/extensions/main-api/catalog.ts b/src/extensions/main-api/catalog.ts
index d2b447f2b4..07adbe9d4b 100644
--- a/src/extensions/main-api/catalog.ts
+++ b/src/extensions/main-api/catalog.ts
@@ -4,9 +4,12 @@
  */
 
 import type { CatalogEntity } from "../../common/catalog";
-import { catalogEntityRegistry as registry } from "../../main/catalog";
+import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+import catalogCategoryRegistryInjectable from "../../common/catalog/category-registry.injectable";
+import catalogEntityRegistryInjectable from "../../main/catalog/entity-registry.injectable";
 
-export { catalogCategoryRegistry as catalogCategories } from "../../common/catalog/catalog-category-registry";
+export const catalogCategories = asLegacyGlobalForExtensionApi(catalogCategoryRegistryInjectable);
+const catalogEntityRegistry = asLegacyGlobalForExtensionApi(catalogEntityRegistryInjectable);
 
 export interface CatalogEntityRegistry {
   getItemsForApiKind(apiVersion: string, kind: string): CatalogEntity[];
@@ -18,6 +21,6 @@ export interface CatalogEntityRegistry {
 
 export const catalogEntities: CatalogEntityRegistry = {
   getItemsForApiKind(apiVersion: string, kind: string) {
-    return registry.filterItemsForApiKind(apiVersion, kind);
+    return catalogEntityRegistry.filterItemsForApiKind(apiVersion, kind);
   },
 };
diff --git a/src/extensions/renderer-api/catalog.ts b/src/extensions/renderer-api/catalog.ts
index 34f6fcd0bb..64ee38a20f 100644
--- a/src/extensions/renderer-api/catalog.ts
+++ b/src/extensions/renderer-api/catalog.ts
@@ -8,7 +8,10 @@ import type { CatalogCategory, CatalogEntity } from "../../common/catalog";
 import { catalogEntityRegistry as registry } from "../../renderer/api/catalog-entity-registry";
 import type { CatalogEntityOnBeforeRun } from "../../renderer/api/catalog-entity-registry";
 import type { Disposer } from "../../common/utils";
-export { catalogCategoryRegistry as catalogCategories } from "../../common/catalog/catalog-category-registry";
+import catalogCategoryRegistryInjectable from "../../common/catalog/category-registry.injectable";
+import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+
+export const catalogCategories = asLegacyGlobalForExtensionApi(catalogCategoryRegistryInjectable);
 
 export class CatalogEntityRegistry {
   /**
diff --git a/src/renderer/api/__tests__/catalog-entity-registry.test.ts b/src/renderer/api/__tests__/catalog-entity-registry.test.ts
index fc7826da3f..878f4328ca 100644
--- a/src/renderer/api/__tests__/catalog-entity-registry.test.ts
+++ b/src/renderer/api/__tests__/catalog-entity-registry.test.ts
@@ -4,12 +4,14 @@
  */
 
 import { CatalogEntityRegistry } from "../catalog-entity-registry";
-import { catalogCategoryRegistry } from "../../../common/catalog/catalog-category-registry";
 import type { CatalogEntityData, CatalogEntityKindData } from "../catalog-entity";
 import { CatalogCategory } from "../catalog-entity";
 import { KubernetesCluster, WebLink } from "../../../common/catalog-entities";
 import { observable } from "mobx";
+import type { CatalogCategoryRegistry } from "../../../common/catalog";
 import { categoryVersion } from "../../../common/catalog";
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import catalogCategoryRegistryInjectable from "../../../common/catalog/category-registry.injectable";
 
 class TestCatalogEntityRegistry extends CatalogEntityRegistry {
   replaceItems(items: Array<CatalogEntityData & CatalogEntityKindData>) {
@@ -79,6 +81,14 @@ const entitykc = new KubernetesCluster({
 });
 
 describe("CatalogEntityRegistry", () => {
+  let catalogCategoryRegistry: CatalogCategoryRegistry;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting();
+
+    catalogCategoryRegistry = di.inject(catalogCategoryRegistryInjectable);
+  });
+
   describe("updateItems", () => {
     it("adds new catalog item", () => {
       const catalog = new TestCatalogEntityRegistry(catalogCategoryRegistry);