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
@@ -24,51 +24,73 @@ const NonInjectedCronJobMenu = ({
  object,
  toolbar,
  openConfirmDialog,
-}: Dependencies & CronJobMenuProps) => (
+}: Dependencies & CronJobMenuProps) =>  (
  <>
    <MenuItem onClick={() => CronJobTriggerDialog.open(object)}>
-      <Icon material="play_circle_filled" tooltip="Trigger" interactive={toolbar}/>
+      <Icon
+        material="play_circle_filled"
+        tooltip="Trigger"
+        interactive={toolbar}
+      />
      <span className="title">Trigger</span>
    </MenuItem>

-    {object.isSuspend() ?
-      <MenuItem onClick={() => openConfirmDialog({
-        ok: async () => {
-          try {
-            await cronJobApi.resume({ namespace: object.getNs(), name: object.getName() });
-          } catch (err) {
-            Notifications.error(err);
-          }
-        },
-        labelOk: `Resume`,
-        message: (
-          <p>
-            Resume CronJob <b>{object.getName()}</b>?
-          </p>
-        ),
-      })}>
-        <Icon material="play_circle_outline" tooltip="Resume" interactive={toolbar}/>
-        <span className="title">Resume</span>
-      </MenuItem>
-
-      : <MenuItem onClick={() => openConfirmDialog({
-        ok: async () => {
-          try {
-            await cronJobApi.suspend({ namespace: object.getNs(), name: object.getName() });
-          } catch (err) {
-            Notifications.error(err);
-          }
-        },
-        labelOk: `Suspend`,
-        message: (
-          <p>
-            Suspend CronJob <b>{object.getName()}</b>?
-          </p>
-        ),
-      })}>
-        <Icon material="pause_circle_filled" tooltip="Suspend" interactive={toolbar}/>
-        <span className="title">Suspend</span>
-      </MenuItem>
+    {object.isSuspend()
+      ? (
+        <MenuItem
+          onClick={() => openConfirmDialog({
+            ok: async () => {
+              try {
+                await cronJobApi.resume({ namespace: object.getNs(), name: object.getName() });
+              } catch (err) {
+                Notifications.checkedError(err, "Unknown error occured while resuming CronJob");
+              }
+            },
+            labelOk: `Resume`,
+            message: (
+              <p>
+                {"Resume CronJob "}
+                <b>{object.getName()}</b>
+                ?
+              </p>
+            ),
+          })}
+        >
+          <Icon
+            material="play_circle_outline"
+            tooltip="Resume"
+            interactive={toolbar}
+          />
+          <span className="title">Resume</span>
+        </MenuItem>
+      )
+      : (
+        <MenuItem
+          onClick={() => openConfirmDialog({
+            ok: async () => {
+              try {
+                await cronJobApi.suspend({ namespace: object.getNs(), name: object.getName() });
+              } catch (err) {
+                Notifications.checkedError(err, "Unknown error occured while suspending CronJob");
+              }
+            },
+            labelOk: `Suspend`,
+            message: (
+              <p>
+                {"Suspend CronJob "}
+                <b>{object.getName()}</b>
+                ?
+              </p>),
+          })}
+        >
+          <Icon
+            material="pause_circle_filled"
+            tooltip="Suspend"
+            interactive={toolbar}
+          />
+          <span className="title">Suspend</span>
+        </MenuItem>
+      )
    }
  </>
 );
@@ -1,14 +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 { cronJobStore } from "./cronjob.store";
-
-const cronJobsStoreInjectable = getInjectable({
-  id: "cron-jobs-store",
-  instantiate: () => cronJobStore,
-  causesSideEffects: true,
-});
-
-export default cronJobsStoreInjectable;
@@ -10,27 +10,28 @@ import kebabCase from "lodash/kebabCase";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge/badge";
-import { jobStore } from "../+workloads-jobs/job.store";
+import type { JobStore } from "../+workloads-jobs/store";
 import { Link } from "react-router-dom";
-import { cronJobStore } from "./cronjob.store";
+import type { CronJobStore } from "./store";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { getDetailsUrl } from "../kube-detail-params";
 import type { Job } from "../../../common/k8s-api/endpoints";
 import { CronJob } from "../../../common/k8s-api/endpoints";
 import { KubeObjectMeta } from "../kube-object-meta";
 import logger from "../../../common/logger";
-import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
-import type { KubeObject } from "../../../common/k8s-api/kube-object";
-import type { Disposer } from "../../../common/utils";
 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 cronJobStoreInjectable from "./store.injectable";
+import jobStoreInjectable from "../+workloads-jobs/store.injectable";

 export interface CronJobDetailsProps extends KubeObjectDetailsProps<CronJob> {
 }

 interface Dependencies {
-  subscribeStores: (stores: KubeObjectStore<KubeObject>[]) => Disposer;
+  subscribeStores: SubscribeStores;
+  jobStore: JobStore;
+  cronJobStore: CronJobStore;
 }

@observer
@@ -38,13 +39,13 @@ class NonInjectedCronJobDetails extends React.Component<CronJobDetailsProps & De
  componentDidMount() {
    disposeOnUnmount(this, [
      this.props.subscribeStores([
-        jobStore,
+        this.props.jobStore,
      ]),
    ]);
  }

  render() {
-    const { object: cronJob } = this.props;
+    const { object: cronJob, jobStore, cronJobStore } = this.props;

    if (!cronJob) {
      return null;
@@ -77,7 +78,7 @@ class NonInjectedCronJobDetails extends React.Component<CronJobDetailsProps & De
        <DrawerItem name="Last schedule">
          {cronJob.getLastScheduleTime()}
        </DrawerItem>
-        {childJobs.length > 0 &&
+        {childJobs.length > 0 && (
          <>
            <DrawerTitle>Jobs</DrawerTitle>
            {childJobs.map((job: Job) => {
@@ -87,11 +88,15 @@ class NonInjectedCronJobDetails extends React.Component<CronJobDetailsProps & De
              return (
                <div className="job" key={job.getId()}>
                  <div className="title">
-                    <Link to={getDetailsUrl(job.selfLink)}>
+                    <Link to={() => job.selfLink ? getDetailsUrl(job.selfLink) : ""}>
                      {job.getName()}
                    </Link>
                  </div>
-                  <DrawerItem name="Condition" className="conditions" labelsOnly>
+                  <DrawerItem
+                    name="Condition"
+                    className="conditions"
+                    labelsOnly
+                  >
                    {condition && (
                      <Badge
                        label={condition.type}
@@ -108,19 +113,17 @@ class NonInjectedCronJobDetails extends React.Component<CronJobDetailsProps & De
              );})
            }
          </>
-        }
+        )}
      </div>
    );
  }
 }

-export const CronJobDetails = withInjectables<Dependencies, CronJobDetailsProps>(
-  NonInjectedCronJobDetails,
-
-  {
-    getProps: (di, props) => ({
-      subscribeStores: di.inject(kubeWatchApiInjectable).subscribeStores,
-      ...props,
-    }),
-  },
-);
+export const CronJobDetails = withInjectables<Dependencies, CronJobDetailsProps>(NonInjectedCronJobDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    subscribeStores: di.inject(subscribeStoresInjectable),
+    cronJobStore: di.inject(cronJobStoreInjectable),
+    jobStore: di.inject(jobStoreInjectable),
+  }),
+});
@@ -12,7 +12,7 @@ import type { DialogProps } from "../dialog";
 import { Dialog } from "../dialog";
 import { Wizard, WizardStep } from "../wizard";
 import type { CronJob } from "../../../common/k8s-api/endpoints";
-import { cronJobApi, jobApi } from "../../../common/k8s-api/endpoints";
+import { jobApi } from "../../../common/k8s-api/endpoints";
 import { Notifications } from "../notifications";
 import { cssNames } from "../../utils";
 import { Input } from "../input";
@@ -21,15 +21,11 @@ import { systemName, maxLength } from "../input/input_validators";
 export interface CronJobTriggerDialogProps extends Partial<DialogProps> {
 }

-const dialogState = observable.object({
-  isOpen: false,
-  data: null as CronJob,
-});
+const dialogState = observable.box<CronJob | undefined>();

@observer
 export class CronJobTriggerDialog extends Component<CronJobTriggerDialogProps> {
  @observable jobName = "";
-  @observable ready = false;

  constructor(props: CronJobTriggerDialogProps) {
    super(props);
@@ -37,117 +33,100 @@ export class CronJobTriggerDialog extends Component<CronJobTriggerDialogProps> {
  }

  static open(cronjob: CronJob) {
-    dialogState.isOpen = true;
-    dialogState.data = cronjob;
+    dialogState.set(cronjob);
  }

  static close() {
-    dialogState.isOpen = false;
+    dialogState.set(undefined);
  }

-  get cronjob() {
-    return dialogState.data;
-  }
+  onOpen = () => {
+    const cronJob = dialogState.get();

-  close = () => {
-    CronJobTriggerDialog.close();
-  };
-
-  onOpen = async () => {
-    const { cronjob } = this;
-
-    this.jobName = cronjob ? `${cronjob.getName()}-manual-${Math.random().toString(36).slice(2, 7)}` : "";
+    this.jobName = cronJob ? `${cronJob.getName()}-manual-${Math.random().toString(36).slice(2, 7)}` : "";
    this.jobName = this.jobName.slice(0, 63);
-    this.ready = true;
  };

-  onClose = () => {
-    this.ready = false;
-  };
-
-  trigger = async () => {
-    const { cronjob } = this;
-    const { close } = this;
+  async trigger(cronJob: CronJob): Promise<void> {
+    if (!cronJob.spec.jobTemplate) {
+      return void Notifications.error(`CronJob ${cronJob.getName()} has no jobTemplate`);
+    }

    try {
-      const cronjobDefinition = await cronJobApi.get({
-        name: cronjob.getName(),
-        namespace: cronjob.getNs(),
-      });
-
      await jobApi.create({
        name: this.jobName,
-        namespace: cronjob.getNs(),
+        namespace: cronJob.getNs(),
      }, {
-        spec: cronjobDefinition.spec.jobTemplate.spec,
+        spec: cronJob.spec.jobTemplate.spec,
        metadata: {
          annotations: { "cronjob.kubernetes.io/instantiate": "manual" },
          ownerReferences: [{
-            apiVersion: cronjob.apiVersion,
+            apiVersion: cronJob.apiVersion,
            blockOwnerDeletion: true,
            controller: true,
-            kind: cronjob.kind,
-            name: cronjob.metadata.name,
-            uid: cronjob.metadata.uid,
+            kind: cronJob.kind,
+            name: cronJob.metadata.name,
+            uid: cronJob.metadata.uid,
          }],
        },
      });

-      close();
+      CronJobTriggerDialog.close();
    } catch (err) {
-      Notifications.error(err);
+      Notifications.checkedError(err, "Unknown error occurred while creating job");
    }
-  };
+  }

-  renderContents() {
+  renderContents(cronJob: CronJob) {
    return (
-      <>
-        <div className="flex gaps">
-          Job name:
-        </div>
-        <div className="flex gaps">
-          <Input
-            required autoFocus
-            placeholder={this.jobName}
-            trim
-            validators={[systemName, maxLength]}
-            maxLength={63}
-            value={this.jobName} onChange={v => this.jobName = v.toLowerCase()}
-            className="box grow"
-          />
-        </div>
-      </>
+      <Wizard
+        header={(
+          <h5>
+            Trigger CronJob
+            <span>{cronJob.getName()}</span>
+          </h5>
+        )}
+        done={CronJobTriggerDialog.close}
+      >
+        <WizardStep
+          contentClass="flex gaps column"
+          next={() => this.trigger(cronJob)}
+          nextLabel="Trigger"
+        >
+          <div className="flex gaps">
+            Job name:
+          </div>
+          <div className="flex gaps">
+            <Input
+              required
+              autoFocus
+              placeholder={this.jobName}
+              trim
+              validators={[systemName, maxLength]}
+              maxLength={63}
+              value={this.jobName}
+              onChange={v => this.jobName = v.toLowerCase()}
+              className="box grow"
+            />
+          </div>
+        </WizardStep>
+      </Wizard>
    );
  }

  render() {
    const { className, ...dialogProps } = this.props;
-    const cronjobName = this.cronjob ? this.cronjob.getName() : "";
-    const header = (
-      <h5>
-        Trigger CronJob <span>{cronjobName}</span>
-      </h5>
-    );
+    const cronJob = dialogState.get();

    return (
      <Dialog
        {...dialogProps}
-        isOpen={dialogState.isOpen}
+        isOpen={Boolean(cronJob)}
        className={cssNames("CronJobTriggerDialog", className)}
        onOpen={this.onOpen}
-        onClose={this.onClose}
-        close={this.close}
+        close={CronJobTriggerDialog.close}
      >
-        <Wizard header={header} done={this.close}>
-          <WizardStep
-            contentClass="flex gaps column"
-            next={this.trigger}
-            nextLabel="Trigger"
-            disabledNext={!this.ready}
-          >
-            {this.renderContents()}
-          </WizardStep>
-        </Wizard>
+        {cronJob && this.renderContents(cronJob)}
      </Dialog>
    );
  }
@@ -7,9 +7,9 @@ import "./cronjobs.scss";

 import React from "react";
 import { observer } from "mobx-react";
-import { cronJobStore } from "./cronjob.store";
-import { jobStore } from "../+workloads-jobs/job.store";
-import { eventStore } from "../+events/event.store";
+import { cronJobStore } from "./legacy-store";
+import { jobStore } from "../+workloads-jobs/legacy-store";
+import { eventStore } from "../+events/legacy-store";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import moment from "moment";
@@ -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 cronJobStoreInjectable from "./store.injectable";
+
+/**
+ * @deprecated use `di.inject(cronJobStoreInjectable)` instead
+ */
+export const cronJobStore = asLegacyGlobalForExtensionApi(cronJobStoreInjectable);
@@ -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 getJobsByOwnerInjectable from "../+workloads-jobs/get-jobs-by-owner.injectable";
+import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
+import cronJobApiInjectable from "../../../common/k8s-api/endpoints/cron-job.api.injectable";
+import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
+import { CronJobStore } from "./store";
+
+const cronJobStoreInjectable = getInjectable({
+  id: "cron-job-store",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectable), "cronJobStore is only available in certain environments");
+
+    const api = di.inject(cronJobApiInjectable);
+
+    return new CronJobStore({
+      getJobsByOwner: di.inject(getJobsByOwnerInjectable),
+    }, api);
+  },
+  injectionToken: kubeObjectStoreInjectionToken,
+});
+
+export default cronJobStoreInjectable;
@@ -3,25 +3,24 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */

+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 { CronJob } from "../../../common/k8s-api/endpoints/cron-job.api";
-import { cronJobApi } from "../../../common/k8s-api/endpoints/cron-job.api";
-import { jobStore } from "../+workloads-jobs/job.store";
-import { apiManager } from "../../../common/k8s-api/api-manager";
+import type { CronJob, CronJobApi } from "../../../common/k8s-api/endpoints/cron-job.api";
+import type { GetJobsByOwner } from "../+workloads-jobs/get-jobs-by-owner.injectable";

-export class CronJobStore extends KubeObjectStore<CronJob> {
-  api = cronJobApi;
+interface Dependencies {
+  getJobsByOwner: GetJobsByOwner;
+}

-  constructor() {
-    super();
-    autoBind(this);
+export class CronJobStore extends KubeObjectStore<CronJob, CronJobApi> {
+  constructor(protected readonly dependencies: Dependencies, api: CronJobApi, opts?: KubeObjectStoreOptions) {
+    super(api, opts);
  }

  getStatuses(cronJobs?: CronJob[]) {
    const status = { scheduled: 0, suspended: 0 };

-    cronJobs.forEach(cronJob => {
+    cronJobs?.forEach(cronJob => {
      if (cronJob.spec.suspend) {
        status.suspended++;
      }
@@ -35,13 +34,10 @@ export class CronJobStore extends KubeObjectStore<CronJob> {

  getActiveJobsNum(cronJob: CronJob) {
    // Active jobs are jobs without any condition 'Complete' nor 'Failed'
-    const jobs = jobStore.getJobsByOwner(cronJob);
+    const jobs = this.dependencies.getJobsByOwner(cronJob);

    if (!jobs.length) return 0;

    return jobs.filter(job => !job.getCondition()).length;
  }
 }
-
-export const cronJobStore = new CronJobStore();
-apiManager.registerStore(cronJobStore);