Skip to content

Commit 3eb4274

Browse files
Addressed CI build failures
1 parent 8f4bd58 commit 3eb4274

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

frontend/packages/dev-console/src/components/monitoring/overview/__tests__/mockData.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export const mockPodEvents = {
9999
},
100100
],
101101
filters: {},
102-
loadError: '',
102+
loadError: undefined,
103103
loaded: true,
104104
selected: null,
105105
},
@@ -255,7 +255,7 @@ export const mockPodEvents = {
255255
},
256256
],
257257
filters: {},
258-
loadError: '',
258+
loadError: undefined,
259259
loaded: true,
260260
selected: null,
261261
},
@@ -319,7 +319,7 @@ export const mockResourceEvents = {
319319
},
320320
],
321321
filters: {},
322-
loadError: '',
322+
loadError: undefined,
323323
loaded: true,
324324
selected: null,
325325
};

frontend/packages/dev-console/src/components/project-access/ProjectAccess.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
StatusBox,
1414
} from '@console/internal/components/utils';
1515
import { RoleBindingModel, RoleModel } from '@console/internal/models';
16+
import type { K8sResourceKind } from '@console/internal/module/k8s';
1617
import { DocumentTitle } from '@console/shared/src/components/document-title/DocumentTitle';
1718
import { PageHeading } from '@console/shared/src/components/heading/PageHeading';
1819
import { ExternalLink } from '@console/shared/src/components/links/ExternalLink';
@@ -25,13 +26,13 @@ import {
2526
getRolesToUpdate,
2627
} from './project-access-form-submit-utils';
2728
import { getUserRoleBindings, Roles } from './project-access-form-utils';
28-
import { Verb, UserRoleBinding } from './project-access-form-utils-types';
29+
import { Verb, UserRoleBinding, RoleBinding } from './project-access-form-utils-types';
2930
import { validationSchema } from './project-access-form-validation-utils';
3031
import ProjectAccessForm from './ProjectAccessForm';
3132

3233
export interface ProjectAccessProps {
3334
namespace: string;
34-
roleBindings?: { data: []; loaded: boolean; loadError: {} };
35+
roleBindings?: { data: K8sResourceKind[]; loaded: boolean; loadError?: Error };
3536
roles: { data: Roles; loaded: boolean };
3637
fullFormView?: boolean;
3738
}
@@ -48,7 +49,7 @@ const ProjectAccess: FC<ProjectAccessProps> = ({
4849
}
4950

5051
const userRoleBindings: UserRoleBinding[] = getUserRoleBindings(
51-
roleBindings.data,
52+
roleBindings.data as RoleBinding[],
5253
Object.keys(roles.data),
5354
namespace,
5455
);

frontend/packages/dev-console/src/components/project-access/__tests__/ProjectAccess.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ describe('Project Access', () => {
9494
roleBindings: {
9595
data: [],
9696
loaded: false,
97-
loadError: {},
97+
loadError: undefined,
9898
},
9999
roles: {
100100
data: defaultAccessRoles,
@@ -111,7 +111,7 @@ describe('Project Access', () => {
111111
});
112112

113113
it('should show the StatusBox when there is error loading the role bindings', () => {
114-
projectAccessProps.roleBindings.loadError = { error: 'user has no access to role bindigs' };
114+
projectAccessProps.roleBindings.loadError = new Error('user has no access to role bindigs');
115115
render(<ProjectAccess {...projectAccessProps} />);
116116

117117
expect(screen.getByText(/StatusBox/)).toBeInTheDocument();

0 commit comments

Comments
 (0)