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

make single source of truth for status icon

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2021-03-29 09:44:58 -04:00
parent 30a279856b
commit a6e266f3b6
2 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx
View File

@ -6,18 +6,7 @@ import { cssNames, formatDuration } from "../../utils";
import { KubeObject, KubeObjectStatus, KubeObjectStatusLevel } from "../../..//extensions/renderer-api/k8s-api";
import { kubeObjectStatusRegistry } from "../../../extensions/registries";
interface BaseProps {
statuses?: KubeObjectStatus[];
object?: KubeObject;
}
interface StatusProps extends BaseProps {
statuses: KubeObjectStatus[];
object?: undefined;
}
interface ObjectProps extends BaseProps {
statuses?: undefined;
export interface ObjectProps {
object: KubeObject;
}
@ -74,7 +63,7 @@ function splitByLevel(src: KubeObjectStatus[]): SplitStatusesByLevel {
return { maxLevel, criticals, warnings, infos };
}
export class KubeObjectStatusIcon extends React.Component<StatusProps | ObjectProps> {
export class KubeObjectStatusIcon extends React.Component<ObjectProps> {
renderStatuses(statuses: KubeObjectStatus[], level: number) {
const filteredStatuses = statuses.filter((item) => item.level == level);
@ -94,16 +83,8 @@ export class KubeObjectStatusIcon extends React.Component<StatusProps | ObjectPr
);
}
resolveStatusesFromProps() {
if (this.props.statuses) {
return this.props.statuses;
}
return kubeObjectStatusRegistry.getItemsForObject(this.props.object);
}
render() {
const statuses = this.resolveStatusesFromProps();
const statuses = kubeObjectStatusRegistry.getItemsForObject(this.props.object);
if (statuses.length === 0) {
return null;

23
src/renderer/components/kube-object/kube-object-meta.tsx
View File

@ -5,7 +5,6 @@ import { lookupApiLink } from "../../api/kube-api";
import { Link } from "react-router-dom";
import { KubeObjectStatusIcon } from "../kube-object-status-icon";
import { getDetailsUrl } from "./kube-object-details";
import { kubeObjectStatusRegistry } from "../../../extensions/registries";
export interface KubeObjectMetaProps {
object: KubeObject;
@ -23,25 +22,12 @@ export class KubeObjectMeta extends React.Component<KubeObjectMetaProps> {
return hideFields.includes(field);
}
renderObjectName() {
const { object } = this.props;
const statuses = kubeObjectStatusRegistry.getItemsForObject(object);
if (statuses.length === 0) {
return object.getName();
}
return <>{object.getName()} <KubeObjectStatusIcon key="icon" statuses={statuses} /></>;
}
render() {
const { object } = this.props;
const {
getNs, getLabels, getResourceVersion, selfLink,
getAnnotations, getFinalizers, getId, getAge,
metadata: { creationTimestamp },
getNs, getLabels, getResourceVersion, selfLink, getAnnotations,
getFinalizers, getId, getAge, getName, metadata: { creationTimestamp },
} = object;
const ownerRefs = object.getOwnerRefs();
return (
@ -50,7 +36,8 @@ export class KubeObjectMeta extends React.Component<KubeObjectMetaProps> {
{getAge(true, false)} ago ({creationTimestamp})
</DrawerItem>
<DrawerItem name="Name" hidden={this.isHidden("name")}>
{this.renderObjectName()}
{getName()}
<KubeObjectStatusIcon key="icon" object={object} />
</DrawerItem>
<DrawerItem name="Namespace" hidden={this.isHidden("namespace") || !getNs()}>
{getNs()}
@ -79,7 +66,7 @@ export class KubeObjectMeta extends React.Component<KubeObjectMetaProps> {
labels={getFinalizers()}
hidden={this.isHidden("finalizers")}
/>
{ownerRefs && ownerRefs.length > 0 &&
{ownerRefs?.length > 0 &&
<DrawerItem name="Controlled By" hidden={this.isHidden("ownerReferences")}>
{
ownerRefs.map(ref => {