chore: Extract sidebar item injection token into separate package

- Add unit tests to cover custom resources sidebar items

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts

@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
-
-const crdListRouteInjectable = getInjectable({
-  id: "crd-list-route",
-
-  instantiate: () => ({
-    path: "/crd/definitions",
-    clusterFrame: true,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-export default crdListRouteInjectable;

packages/core/src/common/front-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { shouldShowResourceInjectionToken } from "../../../../../features/cluster/showing-kube-resources/common/allowed-resources-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
+
+const customResourceDefinitionsRouteInjectable = getInjectable({
+  id: "custom-resource-definitions-route",
+
+  instantiate: (di) => ({
+    path: "/crd/definitions",
+    clusterFrame: true,
+    isEnabled: di.inject(shouldShowResourceInjectionToken, {
+      group: "apiextensions.k8s.io",
+      apiName: "customresourcedefinitions",
+    }),
+  }),
+
+  injectionToken: frontEndRouteInjectionToken,
+});
+
+export default customResourceDefinitionsRouteInjectable;

packages/core/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources-route.injectable.ts

@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../../../front-end-route-injection-token";
-import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
+import type { Route } from "../../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 export interface CustomResourcesPathParameters {
   group?: string;

packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resource-definitions.injectable.ts

@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import crdListRouteInjectable from "./crd-list-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token";
+import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import crdListRouteInjectable from "./custom-resource-definitions.injectable";
 
 const navigateToCrdListInjectable = getInjectable({
   id: "navigate-to-crd-list",

packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resources.injectable.ts

@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
 import type { CustomResourcesPathParameters } from "./custom-resources-route.injectable";
 import customResourcesRouteInjectable from "./custom-resources-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token";
 
 const navigateToCustomResourcesInjectable = getInjectable({
   id: "navigate-to-custom-resources",
@@ -14,8 +14,7 @@ const navigateToCustomResourcesInjectable = getInjectable({
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
     const route = di.inject(customResourcesRouteInjectable);
 
-    return (parameters?: CustomResourcesPathParameters) =>
-      navigateToRoute(route, { parameters });
+    return (parameters?: CustomResourcesPathParameters) => navigateToRoute(route, { parameters });
   },
 });
 

packages/core/src/common/front-end-routing/routes/cluster/network/ingress-class/ingress-classes-route.injectable.ts

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
+import { shouldShowResourceInjectionToken } from "../../../../../../features/cluster/showing-kube-resources/common/allowed-resources-injection-token";
+
+const ingressClassesRouteInjectable = getInjectable({
+  id: "ingress-classes-route",
+
+  instantiate: (di) => ({
+    path: "/ingress-classes",
+    clusterFrame: true,
+    isEnabled: di.inject(shouldShowResourceInjectionToken, {
+      apiName: "ingressclasses",
+      group: "networking.k8s.io",
+    }),
+  }),
+
+  injectionToken: frontEndRouteInjectionToken,
+});
+
+export default ingressClassesRouteInjectable;

packages/core/src/common/front-end-routing/routes/cluster/network/ingress-class/ingress-classeses-route.injectable.ts

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
-import {
-  shouldShowResourceInjectionToken,
-} from "../../../../../../features/cluster/showing-kube-resources/common/allowed-resources-injection-token";
-
-const ingressClassesesRouteInjectable = getInjectable({
-  id: "ingress-classes-route",
-
-  instantiate: (di) => {
-    const isEnabled = di.inject(shouldShowResourceInjectionToken, {
-      apiName: "ingressclasses",
-      group: "networking.k8s.io",
-    });
-
-    return {
-      path: "/ingress-classes",
-      clusterFrame: true,
-      isEnabled,
-    };
-  },
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-export default ingressClassesesRouteInjectable;

packages/core/src/common/front-end-routing/routes/cluster/network/ingress-class/navigate-to-ingress-classes.injectable.ts

@@ -4,14 +4,14 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token";
-import ingressClassesesRouteInjectable from "./ingress-classeses-route.injectable";
+import ingressClassesRouteInjectable from "./ingress-classes-route.injectable";
 
 const navigateToIngressesInjectable = getInjectable({
   id: "navigate-to-ingress-classes",
 
   instantiate: (di) => {
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(ingressClassesesRouteInjectable);
+    const route = di.inject(ingressClassesRouteInjectable);
 
     return () => navigateToRoute(route);
   },

packages/core/src/common/utils/composable-responsibilities/orderable/orderable.ts

@@ -1,25 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { sortBy } from "lodash/fp";
-
-export interface Orderable {
-  readonly orderNumber: number;
-}
-
-export type MaybeOrderable = Orderable | object;
-
-export const orderByOrderNumber = <T extends MaybeOrderable>(maybeOrderables: T[]) =>
-  sortBy(
-    (orderable) =>
-      "orderNumber" in orderable
-        ? orderable.orderNumber
-        : Number.MAX_SAFE_INTEGER,
-    maybeOrderables,
-  );
-
-export const byOrderNumber = <T extends Orderable>(left: T, right: T) => (
-  left.orderNumber - right.orderNumber
-);