Revert "chore: Extract sidebar item injection token into separate pac…

…kage" This reverts commit 8ac6638.
lensapp · May 23, 2023 · 8f4aa49 · 8f4aa49
1 parent cb0e876
commit 8f4aa49
Show file tree

Hide file tree

Showing 113 changed files with 1,680 additions and 5,648 deletions.
diff --git a/open-lens/package.json b/open-lens/package.json
@@ -179,7 +179,6 @@
   "dependencies": {
     "@k8slens/application": "^6.5.0-alpha.8",
     "@k8slens/application-for-electron-main": "^6.5.0-alpha.7",
-    "@k8slens/cluster-sidebar": "^1.0.0-alpha.0",
     "@k8slens/core": "^6.5.0-alpha.13",
     "@k8slens/ensure-binaries": "^6.5.0-alpha.6",
     "@k8slens/event-emitter": "^1.0.0-alpha.5",

diff --git a/open-lens/src/main/index.ts b/open-lens/src/main/index.ts
@@ -25,14 +25,13 @@ runInAction(() => {
   registerLensCore(di, environment);
 
   registerFeature(di,
-    loggerFeature,
+      loggerFeature,
   );
 
-  registerFeature(
-    di,
-    applicationFeature,
-    applicationFeatureForElectronMain,
-    messagingFeatureForMain,
+  registerFeature(di,
+      applicationFeature,
+      applicationFeatureForElectronMain,
+      messagingFeatureForMain,
   );
 
   try {

diff --git a/open-lens/src/renderer/index.ts b/open-lens/src/renderer/index.ts
@@ -25,7 +25,6 @@ import { keyboardShortcutsFeature } from "@k8slens/keyboard-shortcuts";
 import { reactApplicationFeature } from "@k8slens/react-application";
 import { routingFeature } from "@k8slens/routing";
 import { loggerFeature } from "@k8slens/logger";
-import { clusterSidebarFeature } from "@k8slens/cluster-sidebar";
 
 const environment = "renderer";
 
@@ -50,8 +49,7 @@ runInAction(() => {
     keyboardShortcutsFeature,
     reactApplicationFeature,
     routingFeature,
-    metricsFeature,
-    clusterSidebarFeature,
+    metricsFeature
   );
 
   autoRegister({

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cluster-sidebar/.eslintrc.js b/packages/cluster-sidebar/.eslintrc.js
diff --git a/packages/cluster-sidebar/.prettierrc b/packages/cluster-sidebar/.prettierrc
diff --git a/packages/cluster-sidebar/index.ts b/packages/cluster-sidebar/index.ts
diff --git a/packages/cluster-sidebar/jest.config.js b/packages/cluster-sidebar/jest.config.js
diff --git a/packages/cluster-sidebar/package.json b/packages/cluster-sidebar/package.json
diff --git a/packages/cluster-sidebar/src/feature.ts b/packages/cluster-sidebar/src/feature.ts
diff --git a/packages/cluster-sidebar/src/sidebar-items.injectable.ts b/packages/cluster-sidebar/src/sidebar-items.injectable.ts
diff --git a/packages/cluster-sidebar/src/tokens.ts b/packages/cluster-sidebar/src/tokens.ts
diff --git a/packages/cluster-sidebar/tsconfig.json b/packages/cluster-sidebar/tsconfig.json
diff --git a/packages/cluster-sidebar/webpack.config.js b/packages/cluster-sidebar/webpack.config.js
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -290,7 +290,6 @@
     "@k8slens/application-for-electron-main": "^6.5.0-alpha.0",
     "@k8slens/button": "^1.0.0-alpha.5",
     "@k8slens/cluster-settings": "^6.5.0-alpha.1",
-    "@k8slens/cluster-sidebar": "^1.0.0-alpha.0",
     "@k8slens/error-boundary": "^1.0.0-alpha.5",
     "@k8slens/event-emitter": "^1.0.0-alpha.1",
     "@k8slens/kubectl-versions": "^1.0.0-alpha.0",

diff --git a/...n/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts b/...n/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * 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;
diff --git a/...custom-resource-definitions.injectable.ts → ...d-list/navigate-to-crd-list.injectable.ts b/...custom-resource-definitions.injectable.ts → ...d-list/navigate-to-crd-list.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 { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
-import crdListRouteInjectable from "./custom-resource-definitions.injectable";
+import crdListRouteInjectable from "./crd-list-route.injectable";
+import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token";
 
 const navigateToCrdListInjectable = getInjectable({
   id: "navigate-to-crd-list",

diff --git a/...ont-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts b/...ont-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts
diff --git a/...rces/custom-resources-route.injectable.ts → ...rces/custom-resources-route.injectable.ts b/...rces/custom-resources-route.injectable.ts → ...rces/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;

diff --git a/...avigate-to-custom-resources.injectable.ts → ...avigate-to-custom-resources.injectable.ts b/...avigate-to-custom-resources.injectable.ts → ...avigate-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,7 +14,8 @@ 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 });
   },
 });