Refactor CatalogEntityRegistry from common to main (#2824)

* refactor CatalogEntityRegistry from common to main

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* test fix

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/common/catalog/catalog-category-registry.ts

@@ -25,24 +25,22 @@ import { CatalogCategory, CatalogEntityData, CatalogEntityKindData } from "./cat
 
 export class CatalogCategoryRegistry {
   protected categories = observable.set<CatalogCategory>();
+  protected groupKinds = new ExtendedMap<string, ExtendedMap<string, CatalogCategory>>();
 
   @action add(category: CatalogCategory): Disposer {
     this.categories.add(category);
+    this.updateGroupKinds(category);
 
-    return () => this.categories.delete(category);
+    return () => {
+      this.categories.delete(category);
+      this.groupKinds.clear();
+    };
   }
 
-  @computed private get groupKindLookup(): Map<string, Map<string, CatalogCategory>> {
-    // ExtendedMap has the convenience methods `getOrInsert` and `strictSet`
-    const res = new ExtendedMap<string, ExtendedMap<string, CatalogCategory>>();
-
-    for (const category of this.categories) {
-      res
-        .getOrInsert(category.spec.group, ExtendedMap.new)
-        .strictSet(category.spec.names.kind, category);
-    }
-
-    return res;
+  private updateGroupKinds(category: CatalogCategory) {
+    this.groupKinds
+      .getOrInsert(category.spec.group, ExtendedMap.new)
+      .strictSet(category.spec.names.kind, category);
   }
 
   @computed get items() {
@@ -50,7 +48,7 @@ export class CatalogCategoryRegistry {
   }
 
   getForGroupKind<T extends CatalogCategory>(group: string, kind: string): T | undefined {
-    return this.groupKindLookup.get(group)?.get(kind) as T;
+    return this.groupKinds.get(group)?.get(kind) as T;
   }
 
   getEntityForData(data: CatalogEntityData & CatalogEntityKindData) {

src/common/catalog/catalog-entity-registry.ts

@@ -1,52 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-import { action, computed, observable, IComputedValue, IObservableArray } from "mobx";
-import type { CatalogEntity } from "./catalog-entity";
-import { iter } from "../utils";
-
-export class CatalogEntityRegistry {
-  protected sources = observable.map<string, IComputedValue<CatalogEntity[]>>([], { deep: true });
-
-  @action addObservableSource(id: string, source: IObservableArray<CatalogEntity>) {
-    this.sources.set(id, computed(() => source));
-  }
-
-  @action addComputedSource(id: string, source: IComputedValue<CatalogEntity[]>) {
-    this.sources.set(id, source);
-  }
-
-  @action removeSource(id: string) {
-    this.sources.delete(id);
-  }
-
-  @computed get items(): CatalogEntity[] {
-    return Array.from(iter.flatMap(this.sources.values(), source => source.get()));
-  }
-
-  getItemsForApiKind<T extends CatalogEntity>(apiVersion: string, kind: string): T[] {
-    const items = this.items.filter((item) => item.apiVersion === apiVersion && item.kind === kind);
-
-    return items as T[];
-  }
-}
-
-export const catalogEntityRegistry = new CatalogEntityRegistry();

src/common/catalog/index.ts

@@ -21,4 +21,3 @@
 
 export * from "./catalog-category-registry";
 export * from "./catalog-entity";
-export * from "./catalog-entity-registry";