From ac0a399eaaf58955574dbe4442241555619bcb9c Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Thu, 27 May 2021 14:00:51 +0300 Subject: [PATCH] expose more catalog apis to renderer Signed-off-by: Jari Kolehmainen --- src/extensions/common-api/index.ts | 2 - .../{common-api => main-api}/catalog.ts | 1 - src/extensions/main-api/index.ts | 2 + src/extensions/renderer-api/catalog.ts | 55 +++++++++++++++++++ src/extensions/renderer-api/index.ts | 2 + 5 files changed, 59 insertions(+), 3 deletions(-) rename src/extensions/{common-api => main-api}/catalog.ts (99%) create mode 100644 src/extensions/renderer-api/catalog.ts diff --git a/src/extensions/common-api/index.ts b/src/extensions/common-api/index.ts index dac4cc1d8c..04f68b1afc 100644 --- a/src/extensions/common-api/index.ts +++ b/src/extensions/common-api/index.ts @@ -25,13 +25,11 @@ import * as EventBus from "./event-bus"; import * as Store from "./stores"; import * as Util from "./utils"; import * as Registrations from "./registrations"; -import * as Catalog from "./catalog"; import * as Types from "./types"; export { App, EventBus, - Catalog, Registrations, Store, Types, diff --git a/src/extensions/common-api/catalog.ts b/src/extensions/main-api/catalog.ts similarity index 99% rename from src/extensions/common-api/catalog.ts rename to src/extensions/main-api/catalog.ts index 1e4631af22..3ffa24418b 100644 --- a/src/extensions/common-api/catalog.ts +++ b/src/extensions/main-api/catalog.ts @@ -19,7 +19,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - import type { CatalogEntity } from "../../common/catalog"; import { catalogEntityRegistry as registry } from "../../main/catalog"; diff --git a/src/extensions/main-api/index.ts b/src/extensions/main-api/index.ts index 95533751cc..72102ebc24 100644 --- a/src/extensions/main-api/index.ts +++ b/src/extensions/main-api/index.ts @@ -19,10 +19,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +import * as Catalog from "./catalog"; import { IpcMain as Ipc } from "../ipc/ipc-main"; import { LensMainExtension as LensExtension } from "../lens-main-extension"; export { + Catalog, Ipc, LensExtension, }; diff --git a/src/extensions/renderer-api/catalog.ts b/src/extensions/renderer-api/catalog.ts new file mode 100644 index 0000000000..bd930ee5f2 --- /dev/null +++ b/src/extensions/renderer-api/catalog.ts @@ -0,0 +1,55 @@ +/** + * 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 type { CatalogCategory, CatalogEntity } from "../../common/catalog"; +import { catalogEntityRegistry as registry } from "../../renderer/api/catalog-entity-registry"; + +export { catalogCategoryRegistry as catalogCategories } from "../../common/catalog/catalog-category-registry"; +export * from "../../common/catalog-entities"; +export * from "../../common/catalog/catalog-entity"; + +export class CatalogEntityRegistry { + /** + * Currently active/visible entity + */ + get activeEntity() { + return registry.activeEntity; + } + + get entities(): Map { + return registry.entities; + } + + getById(id: string) { + return this.entities.get(id); + } + + getItemsForApiKind(apiVersion: string, kind: string): T[] { + return registry.getItemsForApiKind(apiVersion, kind); + } + + getItemsForCategory(category: CatalogCategory): T[] { + return registry.getItemsForCategory(category); + } +} + +export const catalogEntities = new CatalogEntityRegistry(); diff --git a/src/extensions/renderer-api/index.ts b/src/extensions/renderer-api/index.ts index 33defb00f6..189756a2fc 100644 --- a/src/extensions/renderer-api/index.ts +++ b/src/extensions/renderer-api/index.ts @@ -22,6 +22,7 @@ // Lens-extensions apis, required in renderer process runtime // APIs +import * as Catalog from "./catalog"; import * as Component from "./components"; import * as K8sApi from "./k8s-api"; import * as Navigation from "./navigation"; @@ -30,6 +31,7 @@ import { IpcRenderer as Ipc } from "../ipc/ipc-renderer"; import { LensRendererExtension as LensExtension } from "../lens-renderer-extension"; export { + Catalog, Component, K8sApi, Navigation,