hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicate 'Controlled by' section on Jobs' details (#5943)

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
(cherry picked from commit 485f213461)
This commit is contained in:
Sebastian Malton 2022-08-01 03:22:49 -07:00 committed by Janne Savolainen
parent b494b1df88
commit d85ed3d905
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/renderer/components/+workloads-jobs/job-details.tsx
View File

@ -11,7 +11,6 @@ import { disposeOnUnmount, observer } from "mobx-react";
import { DrawerItem } from "../drawer"; import { DrawerItem } from "../drawer";
import { Badge } from "../badge"; import { Badge } from "../badge";
import { PodDetailsStatuses } from "../+workloads-pods/pod-details-statuses"; import { PodDetailsStatuses } from "../+workloads-pods/pod-details-statuses";
import { Link } from "react-router-dom";
import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations"; import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations";
import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"; import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities";
import type { JobStore } from "./store"; import type { JobStore } from "./store";
@ -23,7 +22,6 @@ import { makeObservable, observable, reaction } from "mobx";
import { podMetricTabs, PodCharts } from "../+workloads-pods/pod-charts"; import { podMetricTabs, PodCharts } from "../+workloads-pods/pod-charts";
import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import { ClusterMetricsResourceType } from "../../../common/cluster-types";
import { ResourceMetrics } from "../resource-metrics"; import { ResourceMetrics } from "../resource-metrics";
import type { ApiManager } from "../../../common/k8s-api/api-manager";
import logger from "../../../common/logger"; import logger from "../../../common/logger";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
@ -32,9 +30,6 @@ import type { PodStore } from "../+workloads-pods/store";
import podStoreInjectable from "../+workloads-pods/store.injectable"; import podStoreInjectable from "../+workloads-pods/store.injectable";
import jobStoreInjectable from "./store.injectable"; import jobStoreInjectable from "./store.injectable";
import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
export interface JobDetailsProps extends KubeObjectDetailsProps<Job> { export interface JobDetailsProps extends KubeObjectDetailsProps<Job> {
@ -45,8 +40,6 @@ interface Dependencies {
podStore: PodStore; podStore: PodStore;
jobStore: JobStore; jobStore: JobStore;
getActiveClusterEntity: GetActiveClusterEntity; getActiveClusterEntity: GetActiveClusterEntity;
getDetailsUrl: GetDetailsUrl;
apiManager: ApiManager;
} }
@observer @observer
@ -76,7 +69,7 @@ class NonInjectedJobDetails extends React.Component<JobDetailsProps & Dependenci
}; };
render() { render() {
const { object: job, jobStore, getActiveClusterEntity, getDetailsUrl, apiManager } = this.props; const { object: job, jobStore, getActiveClusterEntity } = this.props;
if (!job) { if (!job) {
return null; return null;
@ -92,7 +85,6 @@ class NonInjectedJobDetails extends React.Component<JobDetailsProps & Dependenci
const nodeSelector = job.getNodeSelectors(); const nodeSelector = job.getNodeSelectors();
const images = job.getImages(); const images = job.getImages();
const childPods = jobStore.getChildPods(job); const childPods = jobStore.getChildPods(job);
const ownerRefs = job.getOwnerRefs();
const condition = job.getCondition(); const condition = job.getCondition();
const isMetricHidden = getActiveClusterEntity()?.isMetricHidden(ClusterMetricsResourceType.Job); const isMetricHidden = getActiveClusterEntity()?.isMetricHidden(ClusterMetricsResourceType.Job);
@ -130,24 +122,6 @@ class NonInjectedJobDetails extends React.Component<JobDetailsProps & Dependenci
} }
</DrawerItem> </DrawerItem>
)} )}
{ownerRefs.length > 0 && (
<DrawerItem name="Controlled by">
{
ownerRefs.map(ref => {
const { name, kind } = ref;
const detailsUrl = getDetailsUrl(apiManager.lookupApiLink(ref, job));
return (
<p key={name}>
{kind}
{" "}
<Link to={detailsUrl}>{name}</Link>
</p>
);
})
}
</DrawerItem>
)}
<DrawerItem <DrawerItem
name="Conditions" name="Conditions"
className="conditions" className="conditions"
@ -184,8 +158,6 @@ export const JobDetails = withInjectables<Dependencies, JobDetailsProps>(NonInje
subscribeStores: di.inject(subscribeStoresInjectable), subscribeStores: di.inject(subscribeStoresInjectable),
podStore: di.inject(podStoreInjectable), podStore: di.inject(podStoreInjectable),
jobStore: di.inject(jobStoreInjectable), jobStore: di.inject(jobStoreInjectable),
getDetailsUrl: di.inject(getDetailsUrlInjectable),
apiManager: di.inject(apiManagerInjectable),
getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable), getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
}), }),
}); });