diff --git a/src/common/__tests__/catalog-entity.test.ts b/src/common/__tests__/catalog-entity.test.tsx
similarity index 52%
rename from src/common/__tests__/catalog-entity.test.ts
rename to src/common/__tests__/catalog-entity.test.tsx
index 3785ed1d49..e6d2e939c7 100644
--- a/src/common/__tests__/catalog-entity.test.ts
+++ b/src/common/__tests__/catalog-entity.test.tsx
@@ -3,15 +3,18 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
+import React from "react";
import { CatalogCategory, CatalogCategorySpec } from "../catalog";
-class TestCatalogCategory extends CatalogCategory {
+class TestCatalogCategoryWithoutBadge extends CatalogCategory {
public readonly apiVersion = "catalog.k8slens.dev/v1alpha1";
public readonly kind = "CatalogCategory";
+
public metadata = {
name: "Test Category",
icon: "",
};
+
public spec: CatalogCategorySpec = {
group: "entity.k8slens.dev",
versions: [],
@@ -21,10 +24,28 @@ class TestCatalogCategory extends CatalogCategory {
};
}
+class TestCatalogCategoryWithBadge extends TestCatalogCategoryWithoutBadge {
+ getBadge() {
+ return (Test Badge
);
+ }
+}
+
describe("CatalogCategory", () => {
it("returns name", () => {
- const category = new TestCatalogCategory();
+ const category = new TestCatalogCategoryWithoutBadge();
expect(category.getName()).toEqual("Test Category");
});
+
+ it("doesn't return badge by default", () => {
+ const category = new TestCatalogCategoryWithoutBadge();
+
+ expect(category.getBadge()).toEqual(null);
+ });
+
+ it("returns a badge", () => {
+ const category = new TestCatalogCategoryWithBadge();
+
+ expect(category.getBadge()).toBeTruthy();
+ });
});
diff --git a/src/common/catalog/catalog-entity.ts b/src/common/catalog/catalog-entity.ts
index 2704bed2e0..7bc396d377 100644
--- a/src/common/catalog/catalog-entity.ts
+++ b/src/common/catalog/catalog-entity.ts
@@ -180,6 +180,15 @@ export abstract class CatalogCategory extends (EventEmitter as new () => TypedEm
return this.metadata.name;
}
+ /**
+ * Get the badge of this category.
+ * Defaults to no badge.
+ * The badge is displayed next to the Category name in the Catalog Category menu
+ */
+ public getBadge(): React.ReactNode {
+ return null;
+ }
+
/**
* Add a filter for menu items of catalogAddMenu
* @param fn The function that should return a truthy value if that menu item should be displayed
diff --git a/src/renderer/components/+catalog/__tests__/catalog-category-label.test.tsx b/src/renderer/components/+catalog/__tests__/catalog-category-label.test.tsx
new file mode 100644
index 0000000000..015929b643
--- /dev/null
+++ b/src/renderer/components/+catalog/__tests__/catalog-category-label.test.tsx
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { render, screen } from "@testing-library/react";
+import React from "react";
+import "@testing-library/jest-dom/extend-expect";
+import { CatalogCategory, CatalogCategorySpec } from "../../../../common/catalog";
+import { CatalogCategoryLabel } from "../catalog-category-label";
+
+class CatalogCategoryWithoutBadge extends CatalogCategory {
+ public readonly apiVersion = "catalog.k8slens.dev/v1alpha1";
+ public readonly kind = "CatalogCategory";
+
+ public metadata = {
+ name: "Test Category",
+ icon: "",
+ };
+
+ public spec: CatalogCategorySpec = {
+ group: "entity.k8slens.dev",
+ versions: [],
+ names: {
+ kind: "Test",
+ },
+ };
+}
+
+class CatalogCategoryWithBadge extends CatalogCategoryWithoutBadge {
+ getBadge() {
+ return (Test Badge
);
+ }
+}
+
+describe("CatalogCategoryLabel", () => {
+ it("renders without a badge", async () => {
+ const category = new CatalogCategoryWithoutBadge();
+
+ render();
+
+ expect(await screen.findByText("Test Category")).toBeInTheDocument();
+ });
+
+ it("renders with a badge", async () => {
+ const category = new CatalogCategoryWithBadge();
+
+ render();
+
+ expect(await screen.findByText("Test Category")).toBeInTheDocument();
+ expect(await screen.findByText("Test Badge")).toBeInTheDocument();
+ });
+});
diff --git a/src/renderer/components/+catalog/catalog-category-label.tsx b/src/renderer/components/+catalog/catalog-category-label.tsx
new file mode 100644
index 0000000000..170d8e92b6
--- /dev/null
+++ b/src/renderer/components/+catalog/catalog-category-label.tsx
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import type { CatalogCategory } from "../../../common/catalog/catalog-entity";
+
+interface CatalogCategoryLabelProps {
+ category: CatalogCategory;
+}
+
+/**
+ * Display label for Catalog Category for the Catalog menu
+ */
+export const CatalogCategoryLabel = ({ category }: CatalogCategoryLabelProps) => {
+ const badge = category.getBadge();
+
+ return (
+
+
{category.metadata.name}
+ {badge ? (
{badge}
) : null}
+
-
onArrowClick(hotbarStore.switchToPrevious)}
- />
+
- onArrowClick(hotbarStore.switchToNext)} />
+
`;
diff --git a/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap b/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap
index 86f5688d82..599a0c6489 100644
--- a/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap
+++ b/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap
@@ -16,58 +16,6 @@ exports[`kube-object-status-icon given info and warning statuses are present, wh