Skip to content

Commit 4c7a4af

Browse files
Configured alert manager and api explorer to use ResourceDataView
1 parent 5dfdb25 commit 4c7a4af

File tree

9 files changed

+166
-192
lines changed

9 files changed

+166
-192
lines changed

frontend/packages/integration-tests-cypress/tests/cluster-settings/alertmanager/alertmanager.cy.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ describe('Alertmanager', () => {
7575
cy.byTestID('label-0').type(label);
7676
alertmanager.save();
7777
alertmanager.validateCreation(receiverName, receiverType, label);
78-
listPage.rows.clickKebabAction(receiverName, 'Delete Receiver');
78+
listPage.dvRows.clickKebabAction(receiverName, 'Delete Receiver');
7979
warningModal.confirm('AlertmanagerDeleteReceiverConfirmation');
8080
warningModal.shouldBeClosed('AlertmanagerDeleteReceiverConfirmation');
81-
listPage.rows.shouldNotExist(receiverName);
81+
listPage.dvRows.shouldNotExist(receiverName);
8282
});
8383

8484
it('prevents deletion and form edit of a receiver with sub-route', () => {
@@ -100,7 +100,7 @@ receivers:
100100
yamlEditor.clickSaveCreateButton();
101101
cy.byTestID('alert-success').should('exist');
102102
detailsPage.selectTab('Details');
103-
cy.get('[data-test-rows="resource-row"]')
103+
cy.get('[data-test="data-view-table"]')
104104
.contains('team-X-pager')
105105
.parents('tr')
106106
.within(() => {
@@ -180,7 +180,7 @@ route:
180180
yamlEditor.clickSaveCreateButton();
181181
cy.get('.yaml-editor__buttons .pf-m-success').should('exist');
182182
detailsPage.selectTab('Details');
183-
listPage.rows.shouldExist(receiverName);
183+
listPage.dvRows.shouldExist(receiverName);
184184
alertmanager.visitEditPage(receiverName);
185185
cy.byTestID('label-0').should('have.value', matcher1);
186186
cy.byTestID('label-1').should('have.value', matcher2);

frontend/packages/integration-tests-cypress/tests/cluster-settings/alertmanager/receivers/pagerduty.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('Alertmanager: PagerDuty Receiver Form', () => {
5353
alertmanager.validateCreation(receiverName, receiverType, label);
5454

5555
cy.log('update pagerduty_url');
56-
listPage.rows.clickKebabAction(receiverName, 'Edit Receiver');
56+
listPage.dvRows.clickKebabAction(receiverName, 'Edit Receiver');
5757
// Save as default checkbox disabled when url equals global url
5858
cy.byTestID('save-as-default').should('be.disabled');
5959
// changing url enables Save as default checkbox, should save pagerduty_url with Receiver

frontend/packages/integration-tests-cypress/tests/crud/other-routes.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('Visiting other routes', () => {
4141
},
4242
{
4343
path: '/api-explorer',
44-
waitFor: () => cy.get('[data-ouia-component-type$="TableRow"]').should('be.visible'),
44+
waitFor: () => cy.get('[data-test="data-view-table"]').should('be.visible'),
4545
},
4646
{
4747
path: '/api-resource/ns/default/core~v1~Pod',
@@ -59,7 +59,7 @@ describe('Visiting other routes', () => {
5959
? [
6060
{
6161
path: '/api-resource/ns/default/core~v1~Pod/access',
62-
waitFor: () => cy.get('[data-ouia-component-type$="TableRow"]').should('be.visible'),
62+
waitFor: () => cy.get('[data-test="data-view-table"]').should('be.visible'),
6363
},
6464
{
6565
path: '/k8s/cluster/user.openshift.io~v1~User',

frontend/packages/integration-tests-cypress/views/alertmanager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ export const alertmanager = {
7373
validateCreation: (receiverName: string, type: string, label: string) => {
7474
cy.byLegacyTestID('item-filter').clear();
7575
cy.byLegacyTestID('item-filter').type(receiverName);
76-
listPage.rows.shouldExist(receiverName);
77-
listPage.rows.shouldExist(type);
78-
listPage.rows.shouldExist(label);
76+
listPage.dvRows.shouldExist(receiverName);
77+
listPage.dvRows.shouldExist(type);
78+
listPage.dvRows.shouldExist(label);
7979
},
8080
visitAlertmanagerPage: () => {
8181
cy.visit('/settings/cluster/alertmanagerconfig');

frontend/packages/integration-tests-cypress/views/list-page.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ export const listPage = {
104104
shouldBeLoaded: () => {
105105
cy.get(`[data-test="data-view-table"]`).should('be.visible');
106106
},
107+
shouldExist: (resourceName: string) =>
108+
cy.get(`[data-test="data-view-cell-${resourceName}-name"]`).contains(resourceName),
109+
shouldNotExist: (resourceName: string) =>
110+
cy
111+
.get(`[data-test="data-view-cell-${resourceName}-name"]`, { timeout: 90000 })
112+
.should('not.exist'),
107113
clickKebabAction: (resourceName: string, actionName: string) => {
108114
cy.get(`[data-test="data-view-cell-${resourceName}-name"]`)
109115
.contains(resourceName)

frontend/public/components/alert-manager.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,20 @@ const getDataViewRows: GetDataViewRows<K8sResourceKind, undefined> = (data, colu
146146
},
147147
[tableColumnInfo[2].id]: {
148148
cell: <LabelList kind={AlertmanagerModel.kind} labels={metadata.labels} />,
149+
props: {
150+
modifier: 'nowrap',
151+
width: 20,
152+
},
149153
},
150154
[tableColumnInfo[3].id]: {
151155
cell: spec.version || '-',
152156
},
153157
[tableColumnInfo[4].id]: {
154158
cell: <Selector selector={spec.nodeSelector} kind="Node" />,
159+
props: {
160+
modifier: 'nowrap',
161+
width: 20,
162+
},
155163
},
156164
[tableColumnInfo[5].id]: {
157165
cell: <LazyActionMenu context={context} />,

0 commit comments

Comments
 (0)