From 2180bcbdafd412f141e566c8c31515e549de6172 Mon Sep 17 00:00:00 2001 From: suomiy Date: Tue, 9 Jul 2019 15:48:26 +0200 Subject: [PATCH] add warn to accessReview for null --- frontend/public/components/utils/rbac.tsx | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/frontend/public/components/utils/rbac.tsx b/frontend/public/components/utils/rbac.tsx index b7da86ed4ab..c676bbf2603 100644 --- a/frontend/public/components/utils/rbac.tsx +++ b/frontend/public/components/utils/rbac.tsx @@ -2,6 +2,8 @@ import * as React from 'react'; import { connect } from 'react-redux'; import * as _ from 'lodash-es'; +import { getName, getNamespace } from '@console/shared'; + import store from '../../redux'; import { impersonateStateToProps } from '../../reducers/ui'; import { @@ -87,10 +89,16 @@ type RequireCreatePermissionProps = { children: React.ReactNode; }; -export const asAccessReview = (kindObj: K8sKind, obj: K8sResourceKind, verb: K8sVerb): AccessReviewResourceAttributes => ({ - group: kindObj.apiGroup, - resource: kindObj.plural, - name: obj.metadata.name, - namespace: obj.metadata.namespace, - verb, -}); +export const asAccessReview = (kindObj: K8sKind, obj: K8sResourceKind, verb: K8sVerb): AccessReviewResourceAttributes => { + if (!obj){ + console.warn('review obj should not be null'); // eslint-disable-line no-console + return null; + } + return ({ + group: kindObj.apiGroup, + resource: kindObj.plural, + name: getName(obj), + namespace: getNamespace(obj), + verb, + }); +};