Turn on strict mode in tsconfig.json, some helpful lints, and required cleanup where strictness necessitates it (#5195)

* Turn on strict mode in tsconfig.json - Add route, clusterRoute, and payloadValidatedClusterRoute helper functions to improve types with backend routes - Turn on the following new lints: - react/jsx-first-prop-new-line - react/jsx-wrap-multilines - react/jsx-one-expression-per-line - react/jsx-max-props-per-line - react/jsx-indent - react/jsx-indent-props Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace KubeObject scope strings with enum Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert package.json version changes Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move hostedCluster(Id) Signed-off-by: Sebastian Malton <sebastian@malton.name> * change some type param names to be not single letters Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove copy-extension-themes Signed-off-by: Sebastian Malton <sebastian@malton.name> * add new make clean action Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build to not use webpack for generating types Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move fileNameMigration to index Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix ref logic error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts test by overriding createStorage to not touch file system Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster.test.ts tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube=api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixed hotbar-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kubeconfig-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix daemonset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicaset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulsets/dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicasets/scale-dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments/scale/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cronjob.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stateful-set.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployment.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix job.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix scroll-spy.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix welcome.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix verify-that-all-routes-have-route-component.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pod-tolerations.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * better fix for previous 3 fixes, plus also select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix app-paths.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix isReactNode typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sub-title.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix drawer.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix list-layout.tsx and header.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix error-boundary.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix upgrade-chart/store.ts and dock-tab.store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix install-chart/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix edit-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix create-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select-filter.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crd-list.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix wrong types for extensions Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency on catalogCategoryRegistry Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-kube Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors, most <Select /> errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixing more type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * some more fixing type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeApis to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * factor out into a common file all the exports Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeObjectStores to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unused legacy KubeApi globals Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bad previous commit Signed-off-by: Sebastian Malton <sebastian@malton.name> * more crash fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * try and fix behavioural tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-core.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make ThemeStore non-singleton and fix navigation-to-terminal-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-kubernetes-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-application-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-extension-specific-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-telemetry-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix closing-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts - Fix other type errors too Signed-off-by: Sebastian Malton <sebastian@malton.name> * final tweaks Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add more tsconfig files, fix bug in <Catalog> - Make all of history, navigation injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all of kube-details-params/ and navigate/ to injectable - This fixes a runtime error that was encountered during testing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix runtime errors on renderer - remove all static uses of `createPageParam` (and then removed the legacy global) - Made LensRendererExtension and LensMainExtension just used dependencies and not the getLegacyDi - Fixed circular dep in extension-loader Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move registerStore calls to after injectMany Signed-off-by: Sebastian Malton <sebastian@malton.name> * replace all the rest of the legacy uses of apiManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stack overflow and cycles in DI Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix NamespaceSelectFilter not opening Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix WizardStep and AddNamespaceDialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix KubeApi's not being registered Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup WindowManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * Proper fix for Wizard, fix NamespaceStore.subscribe Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rewrite withTooltip to be more type correct - Fixes mobx related "too many recursive actions" error - Change all the uses of withTooltips to be functional components Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add e2e test to cover kube api registration Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup internal-commands Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove cast in <Animate> Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix command-palette e2e test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type error after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix test name Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix code to help CodeQL scanner Signed-off-by: Sebastian Malton <sebastian@malton.name> * update intree extension lock files Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix build-extensions picking wrong @types/react Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix tests from rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make KubeconfigSyncManager more injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crash in test mode for Dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * make Select snapshots deterministic Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix new type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object.store.test.ts typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix merge build issues Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix snapshots after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * reexport BaseKubeJsonApiObjectMetadata Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo in terminalSpawningPool Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove duplicate license header Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo to waitUntilDefined Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove iter use from getLegacyGlobalDiForExtensionApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove complex createStorage override Signed-off-by: Sebastian Malton <sebastian@malton.name> * override logger with mocks only when needed for tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove specialized overrideStore flags for getDiForUnitTesting Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary | undefined types from the exactOptionalFieldTypes experiment Signed-off-by: Sebastian Malton <sebastian@malton.name> * use more descriptive name for local test mocks Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary addition to 'make clean' target Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove oddity of KubeObjectStore.getById(undefined) being allowed Signed-off-by: Sebastian Malton <sebastian@malton.name> * rename KubeObject.getDescriptor in favour of name without fundemental JS meaning Signed-off-by: Sebastian Malton <sebastian@malton.name> * Simplify legacyRegisterApi when working in behaviour unit tests - Don't emit within main environment as there should be no auto registering there Signed-off-by: Sebastian Malton <sebastian@malton.name> * change confusing variable name in ReactiveDuration Signed-off-by: Sebastian Malton <sebastian@malton.name> * make visitor pattern more explicit for Entity contextMenuOpen Signed-off-by: Sebastian Malton <sebastian@malton.name> * toggleDetails -> toggleKubeDetailsPane is more specific Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove outdated comment Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bug where LensExtension dependencies are not set Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests from the revert of react 18 Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix more tests from merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typings with new is-compatible-extension tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * more type fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert in-tree extension versions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve name of guarding injectable for stores and apis - New name better implies that it is just a guard state and does not do anything Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add helper for <Select>.isMulti for storing in a Set<Value> Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix is-compatible-extension.test.ts types Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2022-05-16 07:17:57 -04:00
1 parent 381d77c633
commit dfcb7c3330
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { ReactiveDuration } from "../duration/reactive-duration";
+import { LocaleDate } from "../locale-date";
+
+export interface DurationAbsoluteTimestampProps {
+  timestamp: string | undefined;
+}
+
+export const DurationAbsoluteTimestamp = ({ timestamp  }: DurationAbsoluteTimestampProps) => {
+  if (!timestamp) {
+    return <>{"<unknown>"}</>;
+  }
+
+  return (
+    <>
+      <ReactiveDuration timestamp={timestamp} />
+      {" ago "}
+      (
+      <LocaleDate date={timestamp} />
+      )
+    </>
+  );
+};
@@ -14,83 +14,95 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { KubeEvent } from "../../../common/k8s-api/endpoints/events.api";
 import { KubeObjectMeta } from "../kube-object-meta";
 import { Table, TableCell, TableHead, TableRow } from "../table";
-import { LocaleDate } from "../locale-date";
-import { getDetailsUrl } from "../kube-detail-params";
-import { apiManager } from "../../../common/k8s-api/api-manager";
+import type { ApiManager } from "../../../common/k8s-api/api-manager";
 import logger from "../../../common/logger";
-import { ReactiveDuration } from "../duration/reactive-duration";
+import { DurationAbsoluteTimestamp } from "./duration-absolute";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
+import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
+import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
+import { cssNames } from "../../utils";

 export interface EventDetailsProps extends KubeObjectDetailsProps<KubeEvent> {
 }

-@observer
-export class EventDetails extends React.Component<EventDetailsProps> {
-  render() {
-    const { object: event } = this.props;
-
-    if (!event) {
-      return null;
-    }
-
-    if (!(event instanceof KubeEvent)) {
-      logger.error("[EventDetails]: passed object that is not an instanceof KubeEvent", event);
-
-      return null;
-    }
-
-    const { message, reason, count, type, involvedObject } = event;
-    const { kind, name, namespace, fieldPath } = involvedObject;
-
-    return (
-      <div className="EventDetails">
-        <KubeObjectMeta object={event}/>
-
-        <DrawerItem name="Message">
-          {message}
-        </DrawerItem>
-        <DrawerItem name="Reason">
-          {reason}
-        </DrawerItem>
-        <DrawerItem name="Source">
-          {event.getSource()}
-        </DrawerItem>
-        <DrawerItem name="First seen">
-          <ReactiveDuration timestamp={event.firstTimestamp} />
-          {" ago "}
-          (<LocaleDate date={event.firstTimestamp} />)
-        </DrawerItem>
-        <DrawerItem name="Last seen">
-          <ReactiveDuration timestamp={event.lastTimestamp} />
-          {" ago "}
-          (<LocaleDate date={event.lastTimestamp} />)
-        </DrawerItem>
-        <DrawerItem name="Count">
-          {count}
-        </DrawerItem>
-        <DrawerItem name="Type" className="type">
-          <span className={kebabCase(type)}>{type}</span>
-        </DrawerItem>
-
-        <DrawerTitle>Involved object</DrawerTitle>
-        <Table>
-          <TableHead>
-            <TableCell>Name</TableCell>
-            <TableCell>Namespace</TableCell>
-            <TableCell>Kind</TableCell>
-            <TableCell>Field Path</TableCell>
-          </TableHead>
-          <TableRow>
-            <TableCell>
-              <Link to={getDetailsUrl(apiManager.lookupApiLink(involvedObject, event))}>
-                {name}
-              </Link>
-            </TableCell>
-            <TableCell>{namespace}</TableCell>
-            <TableCell>{kind}</TableCell>
-            <TableCell>{fieldPath}</TableCell>
-          </TableRow>
-        </Table>
-      </div>
-    );
-  }
+interface Dependencies {
+  getDetailsUrl: GetDetailsUrl;
+  apiManager: ApiManager;
 }
+
+const NonInjectedEventDetails = observer(({
+  apiManager,
+  getDetailsUrl,
+  object: event,
+  className,
+}: Dependencies & EventDetailsProps) => {
+  if (!event) {
+    return null;
+  }
+
+  if (!(event instanceof KubeEvent)) {
+    logger.error("[EventDetails]: passed object that is not an instanceof KubeEvent", event);
+
+    return null;
+  }
+
+  const { message, reason, count, type, involvedObject } = event;
+  const { kind, name, namespace, fieldPath } = involvedObject;
+
+  return (
+    <div className={cssNames("EventDetails", className)}>
+      <KubeObjectMeta object={event}/>
+
+      <DrawerItem name="Message">
+        {message}
+      </DrawerItem>
+      <DrawerItem name="Reason">
+        {reason}
+      </DrawerItem>
+      <DrawerItem name="Source">
+        {event.getSource()}
+      </DrawerItem>
+      <DrawerItem name="First seen">
+        <DurationAbsoluteTimestamp timestamp={event.firstTimestamp} />
+      </DrawerItem>
+      <DrawerItem name="Last seen">
+        <DurationAbsoluteTimestamp timestamp={event.lastTimestamp} />
+      </DrawerItem>
+      <DrawerItem name="Count">
+        {count}
+      </DrawerItem>
+      <DrawerItem name="Type" className="type">
+        <span className={kebabCase(type)}>{type}</span>
+      </DrawerItem>
+
+      <DrawerTitle>Involved object</DrawerTitle>
+      <Table>
+        <TableHead>
+          <TableCell>Name</TableCell>
+          <TableCell>Namespace</TableCell>
+          <TableCell>Kind</TableCell>
+          <TableCell>Field Path</TableCell>
+        </TableHead>
+        <TableRow>
+          <TableCell>
+            <Link to={getDetailsUrl(apiManager.lookupApiLink(involvedObject, event))}>
+              {name}
+            </Link>
+          </TableCell>
+          <TableCell>{namespace}</TableCell>
+          <TableCell>{kind}</TableCell>
+          <TableCell>{fieldPath}</TableCell>
+        </TableRow>
+      </Table>
+    </div>
+  );
+});
+
+export const EventDetails = withInjectables<Dependencies, EventDetailsProps>(NonInjectedEventDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    apiManager: di.inject(apiManagerInjectable),
+    getDetailsUrl: di.inject(getDetailsUrlInjectable),
+  }),
+});
@@ -5,16 +5,15 @@

 import "./events.scss";

-import React, { Fragment } from "react";
+import React from "react";
 import { computed, observable, makeObservable } from "mobx";
 import { observer } from "mobx-react";
 import { orderBy } from "lodash";
 import { TabLayout } from "../layout/tab-layout-2";
-import type { EventStore } from "./event.store";
-import { eventStore } from "./event.store";
+import type { EventStore } from "./store";
 import type { KubeObjectListLayoutProps } from "../kube-object-list-layout";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
-import type { KubeEvent } from "../../../common/k8s-api/endpoints/events.api";
+import type { KubeEvent, KubeEventApi, KubeEventData } from "../../../common/k8s-api/endpoints/events.api";
 import type { TableSortCallbacks, TableSortParams } from "../table";
 import type { HeaderCustomizer } from "../item-object-list";
 import { Tooltip } from "../tooltip";
@@ -23,11 +22,13 @@ import type { IClassName } from "../../utils";
 import { cssNames, stopPropagation } from "../../utils";
 import { Icon } from "../icon";
 import { getDetailsUrl } from "../kube-detail-params";
-import { apiManager } from "../../../common/k8s-api/api-manager";
+import type { ApiManager } from "../../../common/k8s-api/api-manager";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import navigateToEventsInjectable  from "../../../common/front-end-routing/routes/cluster/events/navigate-to-events.injectable";
 import { KubeObjectAge } from "../kube-object/age";
 import { ReactiveDuration } from "../duration/reactive-duration";
+import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
+import eventStoreInjectable from "./store.injectable";

 enum columnId {
  message = "message",
@@ -40,7 +41,7 @@ enum columnId {
  lastSeen = "last-seen",
 }

-export interface EventsProps extends Partial<KubeObjectListLayoutProps<KubeEvent>> {
+export interface EventsProps extends Partial<KubeObjectListLayoutProps<KubeEvent, KubeEventApi, KubeEventData>> {
  className?: IClassName;
  compact?: boolean;
  compactLimit?: number;
@@ -52,6 +53,8 @@ const defaultProps: Partial<EventsProps> = {

 interface Dependencies {
  navigateToEvents: () => void;
+  eventStore: EventStore;
+  apiManager: ApiManager;
 }

@observer
@@ -69,7 +72,7 @@ class NonInjectedEvents extends React.Component<Dependencies & EventsProps> {
    [columnId.object]: event => event.involvedObject.name,
    [columnId.count]: event => event.count,
    [columnId.age]: event => -event.getCreationTimestamp(),
-    [columnId.lastSeen]: event => -new Date(event.lastTimestamp).getTime(),
+    [columnId.lastSeen]: event => event.lastTimestamp ? -new Date(event.lastTimestamp).getTime() : 0,
  };

  constructor(props: Dependencies & EventsProps) {
@@ -77,17 +80,13 @@ class NonInjectedEvents extends React.Component<Dependencies & EventsProps> {
    makeObservable(this);
  }

-  get store(): EventStore {
-    return eventStore;
-  }
-
  @computed get items(): KubeEvent[] {
-    const items = this.store.contextItems;
+    const items = this.props.eventStore.contextItems;
    const { sortBy, orderBy: order } = this.sorting;

    // we must sort items before passing to "KubeObjectListLayout -> Table"
    // to make it work with "compact=true" (proper table sorting actions + initial items)
-    return orderBy(items, this.sortingCallbacks[sortBy], order as any);
+    return orderBy(items, this.sortingCallbacks[sortBy], order);
  }

  @computed get visibleItems(): KubeEvent[] {
@@ -101,8 +100,8 @@ class NonInjectedEvents extends React.Component<Dependencies & EventsProps> {
  }

  customizeHeader: HeaderCustomizer = ({ info, title, ...headerPlaceholders }) => {
-    const { compact } = this.props;
-    const { store, items, visibleItems } = this;
+    const { compact, eventStore } = this.props;
+    const { items, visibleItems } = this;
    const allEventsAreShown = visibleItems.length === items.length;

    // handle "compact"-mode header
@@ -113,35 +112,44 @@ class NonInjectedEvents extends React.Component<Dependencies & EventsProps> {

      return {
        title,
-        info: <span> ({visibleItems.length} of <a onClick={this.props.navigateToEvents}>{items.length}</a>)</span>,
+        info: (
+          <span>
+            {"("}
+            {visibleItems.length}
+            {" of "}
+            <a onClick={this.props.navigateToEvents}>{items.length}</a>
+            {")"}
+          </span>
+        ),
      };
    }

    return {
-      info: <>
-        {info}
-        <Icon
-          small
-          material="help_outline"
-          className="help-icon"
-          tooltip={`Limited to ${store.limit}`}
-        />
-      </>,
+      info: (
+        <>
+          {info}
+          <Icon
+            small
+            material="help_outline"
+            className="help-icon"
+            tooltip={`Limited to ${eventStore.limit}`}
+          />
+        </>
+      ),
      title,
      ...headerPlaceholders,
    };
  };

  render() {
-    const { store } = this;
-    const { compact, compactLimit, className, ...layoutProps } = this.props;
+    const { apiManager, eventStore, compact, compactLimit, className, ...layoutProps } = this.props;

    const events = (
      <KubeObjectListLayout
        {...layoutProps}
        isConfigurable
        tableId="events"
-        store={store}
+        store={eventStore}
        className={cssNames("Events", className, { compact })}
        renderHeaderTitle="Events"
        customizeHeader={this.customizeHeader}
@@ -178,19 +186,23 @@ class NonInjectedEvents extends React.Component<Dependencies & EventsProps> {
          return [
            type, // type of event: "Normal" or "Warning"
            {
-              className: { warning: isWarning },
+              className: cssNames({ warning: isWarning }),
              title: (
-                <Fragment>
+                <>
                  <span id={tooltipId}>{message}</span>
                  <Tooltip targetId={tooltipId} formatters={{ narrow: true, warning: isWarning }}>
                    {message}
                  </Tooltip>
-                </Fragment>
+                </>
              ),
            },
            event.getNs(),
-            <Link key="link" to={getDetailsUrl(apiManager.lookupApiLink(involvedObject, event))} onClick={stopPropagation}>
-              {involvedObject.kind}: {involvedObject.name}
+            <Link
+              key="link"
+              to={getDetailsUrl(apiManager.lookupApiLink(involvedObject, event))}
+              onClick={stopPropagation}
+            >
+              {`${involvedObject.kind}: ${involvedObject.name}`}
            </Link>,
            event.getSource(),
            event.count,
@@ -213,13 +225,11 @@ class NonInjectedEvents extends React.Component<Dependencies & EventsProps> {
  }
 }

-export const Events = withInjectables<Dependencies, EventsProps>(
-  NonInjectedEvents,
-
-  {
-    getProps: (di, props) => ({
-      navigateToEvents: di.inject(navigateToEventsInjectable),
-      ...props,
-    }),
-  },
-);
+export const Events = withInjectables<Dependencies, EventsProps>(NonInjectedEvents, {
+  getProps: (di, props) => ({
+    ...props,
+    navigateToEvents: di.inject(navigateToEventsInjectable),
+    apiManager: di.inject(apiManagerInjectable),
+    eventStore: di.inject(eventStoreInjectable),
+  }),
+});
@@ -9,22 +9,23 @@ import React from "react";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { KubeObject } from "../../../common/k8s-api/kube-object";
 import { DrawerItem, DrawerTitle } from "../drawer";
-import type { Disposer } from "../../utils";
 import { cssNames } from "../../utils";
 import { LocaleDate } from "../locale-date";
-import { eventStore } from "./event.store";
+import type { EventStore } from "./store";
 import logger from "../../../common/logger";
-import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import kubeWatchApiInjectable
-  from "../../kube-watch-api/kube-watch-api.injectable";
+
+import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
+import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
+import eventStoreInjectable from "./store.injectable";

 export interface KubeEventDetailsProps {
  object: KubeObject;
 }

 interface Dependencies {
-  subscribeStores: (stores: KubeObjectStore<KubeObject>[]) => Disposer;
+  subscribeStores: SubscribeStores;
+  eventStore: EventStore;
 }

@observer
@@ -32,13 +33,13 @@ class NonInjectedKubeEventDetails extends React.Component<KubeEventDetailsProps
  componentDidMount() {
    disposeOnUnmount(this, [
      this.props.subscribeStores([
-        eventStore,
+        this.props.eventStore,
      ]),
    ]);
  }

  render() {
-    const { object } = this.props;
+    const { object, eventStore } = this.props;

    if (!object) {
      return null;
@@ -73,9 +74,11 @@ class NonInjectedKubeEventDetails extends React.Component<KubeEventDetailsProps
                <DrawerItem name="Sub-object">
                  {event.involvedObject.fieldPath}
                </DrawerItem>
-                <DrawerItem name="Last seen">
-                  <LocaleDate date={event.lastTimestamp} />
-                </DrawerItem>
+                {event.lastTimestamp && (
+                  <DrawerItem name="Last seen">
+                    <LocaleDate date={event.lastTimestamp} />
+                  </DrawerItem>
+                )}
              </div>
            ))}
          </div>
@@ -85,16 +88,13 @@ class NonInjectedKubeEventDetails extends React.Component<KubeEventDetailsProps
  }
 }

-export const KubeEventDetails = withInjectables<Dependencies, KubeEventDetailsProps>(
-  NonInjectedKubeEventDetails,
-
-  {
-    getProps: (di, props) => ({
-      subscribeStores: di.inject(kubeWatchApiInjectable).subscribeStores,
-      ...props,
-    }),
-  },
-);
+export const KubeEventDetails = withInjectables<Dependencies, KubeEventDetailsProps>(NonInjectedKubeEventDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    subscribeStores: di.inject(subscribeStoresInjectable),
+    eventStore: di.inject(eventStoreInjectable),
+  }),
+});



@@ -8,7 +8,7 @@ import "./kube-event-icon.scss";
 import React from "react";
 import { Icon } from "../icon";
 import type { KubeObject } from "../../../common/k8s-api/kube-object";
-import { eventStore } from "./event.store";
+import { eventStore } from "./legacy-store";
 import { cssNames } from "../../utils";
 import type { KubeEvent } from "../../../common/k8s-api/endpoints/events.api";
 import { KubeObjectAge } from "../kube-object/age";
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { asLegacyGlobalForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+import eventStoreInjectable from "./store.injectable";
+
+/**
+ * @deprecated use `di.inject(eventStoreInjectable)` instead
+ */
+export const eventStore = asLegacyGlobalForExtensionApi(eventStoreInjectable);
@@ -0,0 +1,27 @@
+/**
+ * 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 assert from "assert";
+import getPodByIdInjectable from "../+workloads-pods/get-pod-by-id.injectable";
+import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
+import kubeEventApiInjectable from "../../../common/k8s-api/endpoints/events.api.injectable";
+import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
+import { EventStore } from "./store";
+
+const eventStoreInjectable = getInjectable({
+  id: "event-store",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectable), "eventStore is only available in certain environments");
+
+    const api = di.inject(kubeEventApiInjectable);
+
+    return new EventStore({
+      getPodById: di.inject(getPodByIdInjectable),
+    }, api);
+  },
+  injectionToken: kubeObjectStoreInjectionToken,
+});
+
+export default eventStoreInjectable;
@@ -5,22 +5,25 @@

 import groupBy from "lodash/groupBy";
 import compact from "lodash/compact";
+import type { KubeObjectStoreOptions } from "../../../common/k8s-api/kube-object.store";
 import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
 import { autoBind } from "../../utils";
-import type { KubeEvent } from "../../../common/k8s-api/endpoints/events.api";
-import { eventApi } from "../../../common/k8s-api/endpoints/events.api";
+import type { KubeEvent, KubeEventApi } from "../../../common/k8s-api/endpoints/events.api";
 import type { KubeObject } from "../../../common/k8s-api/kube-object";
-import { Pod } from "../../../common/k8s-api/endpoints/pods.api";
-import { podsStore } from "../+workloads-pods/pods.store";
-import { apiManager } from "../../../common/k8s-api/api-manager";
+import { Pod } from "../../../common/k8s-api/endpoints/pod.api";
+import type { GetPodById } from "../+workloads-pods/get-pod-by-id.injectable";

-export class EventStore extends KubeObjectStore<KubeEvent> {
-  api = eventApi;
-  limit = 1000;
-  saveLimit = 50000;
+export interface EventStoreDependencies {
+  getPodById: GetPodById;
+}

-  constructor() {
-    super();
+export class EventStore extends KubeObjectStore<KubeEvent, KubeEventApi> {
+  constructor(
+    protected readonly dependencies: EventStoreDependencies,
+    api: KubeEventApi,
+    opts: KubeObjectStoreOptions = {},
+  ) {
+    super(api, { limit: 1000, ...opts });
    autoBind(this);
  }

@@ -52,9 +55,11 @@ export class EventStore extends KubeObjectStore<KubeEvent> {
      const { kind, uid } = recent.involvedObject;

      if (kind == Pod.kind) {  // Wipe out running pods
-        const pod = podsStore.items.find(pod => pod.getId() == uid);
+        const pod = this.dependencies.getPodById(uid);

-        if (!pod || (!pod.hasIssues() && pod.spec.priority < 500000)) return undefined;
+        if (!pod || (!pod.hasIssues() && (pod.spec?.priority ?? 0) < 500000)) {
+          return undefined;
+        }
      }

      return recent;
@@ -67,6 +72,3 @@ export class EventStore extends KubeObjectStore<KubeEvent> {
    return this.getWarnings().length;
  }
 }
-
-export const eventStore = new EventStore();
-apiManager.registerStore(eventStore);