diff --git a/frontend/packages/console-shared/src/selectors/common.ts b/frontend/packages/console-shared/src/selectors/common.ts index b82f58a83a..dfb277fba4 100644 --- a/frontend/packages/console-shared/src/selectors/common.ts +++ b/frontend/packages/console-shared/src/selectors/common.ts @@ -2,5 +2,11 @@ import * as _ from 'lodash'; import { K8sResourceKind } from '@console/internal/module/k8s'; -export const getName = (value: K8sResourceKind): string => _.get(value, 'metadata.name'); -export const getNamespace = (value: K8sResourceKind): string => _.get(value, 'metadata.namespace'); +export const getName = (value: K8sResourceKind) => + _.get(value, 'metadata.name') as K8sResourceKind['metadata']['name']; +export const getNamespace = (value: K8sResourceKind) => + _.get(value, 'metadata.namespace') as K8sResourceKind['metadata']['namespace']; +export const getUid = (value: K8sResourceKind) => + _.get(value, 'metadata.uid') as K8sResourceKind['metadata']['uid']; +export const getDeletetionTimestamp = (value: K8sResourceKind) => + _.get(value, 'metadata.deletionTimestamp') as K8sResourceKind['metadata']['deletionTimestamp']; diff --git a/frontend/packages/dev-console/src/utils/imagestream-utils.ts b/frontend/packages/dev-console/src/utils/imagestream-utils.ts index e58afff0e3..50291c9012 100644 --- a/frontend/packages/dev-console/src/utils/imagestream-utils.ts +++ b/frontend/packages/dev-console/src/utils/imagestream-utils.ts @@ -87,7 +87,7 @@ export const normalizeBuilderImages = ( ): NormalizedBuilderImages => { const builderImageStreams = imageStreams.filter((imageStream) => isBuilder(imageStream)); - return builderImageStreams.reduce((builderImages, imageStream) => { + return builderImageStreams.reduce((builderImages: NormalizedBuilderImages, imageStream) => { const tags = getBuilderTagsSortedByVersion(imageStream); const recentTag = getMostRecentBuilderTag(imageStream); const { name } = imageStream.metadata; diff --git a/frontend/public/components/factory/table.tsx b/frontend/public/components/factory/table.tsx index 6a104c7f19..a0520de861 100644 --- a/frontend/public/components/factory/table.tsx +++ b/frontend/public/components/factory/table.tsx @@ -167,6 +167,7 @@ export const TableData: React.SFC = ({className, ...props}) => { }; TableData.displayName = 'TableData'; export type TableDataProps = { + id?: string; className?: string; } diff --git a/frontend/public/module/k8s/index.ts b/frontend/public/module/k8s/index.ts index b8925cdb0d..133c532988 100644 --- a/frontend/public/module/k8s/index.ts +++ b/frontend/public/module/k8s/index.ts @@ -35,10 +35,12 @@ export type ObjectReference = { export type ObjectMetadata = { name?: string; generateName?: string; + uid?: string; annotations?: {[key: string]: string}, namespace?: string, labels?: {[key: string]: string}, ownerReferences?: OwnerReference[], + deletionTimestamp?: string; [key: string]: any, }; @@ -81,8 +83,8 @@ export type Toleration = { }; export type K8sResourceKind = { - apiVersion: string; - kind: string; + apiVersion?: string; + kind?: string; metadata?: ObjectMetadata; spec?: { selector?: Selector;