Fix cron jobs not being viewable on newer kube (#6542)

* Replace use of legacy globals with injectables

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

* Remove dead code

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

* Fix error shown to users when load fails

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

* Switch CronJob default apiBase

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

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton authored and GitHub committed 2022-11-10 15:34:58 +02:00
1 parent 95ec86a2db
commit 5c34d65de8
5 files changed
+37 -24

No files matched your search

@@ -7,14 +7,18 @@ import "./cronjobs.scss";
import React from "react";
import { observer } from "mobx-react";
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";
import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
import { KubeObjectAge } from "../kube-object/age";
import type { CronJobStore } from "./store";
import type { JobStore } from "../+workloads-jobs/store";
import type { EventStore } from "../+events/store";
import { withInjectables } from "@ogre-tools/injectable-react";
import cronJobStoreInjectable from "./store.injectable";
import jobStoreInjectable from "../+workloads-jobs/store.injectable";
import eventStoreInjectable from "../+events/store.injectable";
enum columnId {
name = "name",
@@ -26,9 +30,21 @@ enum columnId {
age = "age",
}
interface Dependencies {
cronJobStore: CronJobStore;
jobStore: JobStore;
eventStore: EventStore;
}
@observer
export class CronJobs extends React.Component {
class NonInjectedCronJobs extends React.Component<Dependencies>{
render() {
const {
cronJobStore,
eventStore,
jobStore,
} = this.props;
return (
<SiblingsInTabLayout>
<KubeObjectListLayout
@@ -80,3 +96,11 @@ export class CronJobs extends React.Component {
}
}
export const CronJobs = withInjectables<Dependencies>(NonInjectedCronJobs, {
getProps: (di, props) => ({
cronJobStore: di.inject(cronJobStoreInjectable),
eventStore: di.inject(eventStoreInjectable),
jobStore: di.inject(jobStoreInjectable),
...props,
}),
});
@@ -1,12 +0,0 @@
/**
* 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);