Skip to content

Commit 8d00822

Browse files
committed
wip
1 parent 1949737 commit 8d00822

File tree

84 files changed

+1699
-1173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1699
-1173
lines changed

web/cypress/e2e/topology/topology.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ describe('netflow-topology', () => {
3838
cy.get('#elementPanel-drawer-body').should('exist');
3939
cy.get('#drawer-tabs').click();
4040
cy.get('.element-metrics-container').should('exist');
41-
cy.get('.pf-v5-c-chart').should('exist');
41+
cy.get('.pf-v6-c-chart').should('exist');
4242

4343
//close drawer
44-
cy.get('.pf-v5-c-drawer__close').click();
45-
cy.get('.pf-v5-c-drawer__panel-main').should('not.exist');
44+
cy.get('.pf-v6-c-drawer__close').click();
45+
cy.get('.pf-v6-c-drawer__panel-main').should('not.exist');
4646
});
4747

4848
it('update options', () => {

web/cypress/support/commands.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Cypress.Commands.add('openPanelsModal', () => {
7979
cy.showAdvancedOptions();
8080
cy.get('#manage-overview-panels-button').click();
8181
cy.get('#overview-panels-modal').should('exist');
82-
cy.get('#overview-panels-modal').find('.pf-v5-c-data-list__item-content').should('have.length', c.availablePanelsCount);
82+
cy.get('#overview-panels-modal').find('.pf-v6-c-data-list__item-content').should('have.length', c.availablePanelsCount);
8383
});
8484

8585
Cypress.Commands.add('checkColumns', (groups = c.defaultColumnGroupCount, cols = c.defaultColumnCount) => {
@@ -104,13 +104,13 @@ Cypress.Commands.add('openColumnsModal', () => {
104104
cy.showAdvancedOptions();
105105
cy.get('#manage-columns-button').click();
106106
cy.get('#columns-modal').should('exist');
107-
cy.get('#columns-modal').find('.pf-v5-c-data-list__item-content').should('have.length', c.availableColumnCount);
107+
cy.get('#columns-modal').find('.pf-v6-c-data-list__item-content').should('have.length', c.availableColumnCount);
108108
});
109109

110110
Cypress.Commands.add('selectPopupItems', (id, names) => {
111111
for (let i = 0; i < names.length; i++) {
112112
cy.get(id).get('.modal-body').contains(names[i])
113-
.closest('.pf-v5-c-data-list__item-row').find('.pf-v5-c-data-list__check').click();
113+
.closest('.pf-v6-c-data-list__item-row').find('.pf-v6-c-data-list__check').click();
114114
}
115115
});
116116

@@ -131,8 +131,8 @@ Cypress.Commands.add('sortColumn', (name) => {
131131

132132
Cypress.Commands.add('dropdownSelect', (id, name) => {
133133
cy.get(`#${id}`).click();
134-
cy.get('.pf-v5-c-menu__content').should('exist');
135-
cy.get('.pf-v5-c-menu__content').find(`#${name}`).click();
134+
cy.get('.pf-v6-c-menu__content').should('exist');
135+
cy.get('.pf-v6-c-menu__content').find(`#${name}`).click();
136136
});
137137

138138
Cypress.Commands.add('checkContent', (topology) => {
@@ -145,8 +145,8 @@ Cypress.Commands.add('checkContent', (topology) => {
145145

146146
Cypress.Commands.add('addFilter', (filter, value, topology) => {
147147
cy.get('#column-filter-toggle').click();
148-
cy.get('.pf-v5-c-accordion__expandable-content.pf-m-expanded').find(`#${filter}`).click();
149-
cy.get('.pf-v5-c-accordion__expandable-content.pf-m-expanded').should('not.exist');
148+
cy.get('.pf-v6-c-accordion__expandable-content.pf-m-expanded').find(`#${filter}`).click();
149+
cy.get('.pf-v6-c-accordion__expandable-content.pf-m-expanded').should('not.exist');
150150
cy.get('input[type="search"]').type(`${value}{enter}`);
151151
cy.checkContent(topology);
152152
});
@@ -160,7 +160,7 @@ Cypress.Commands.add('changeQueryOption', (name, topology) => {
160160

161161
Cypress.Commands.add('changeTimeRange', (name, topology) => {
162162
cy.get('#time-range-dropdown-dropdown').click();
163-
cy.get('.pf-v5-c-menu__content').contains(name).click();
163+
cy.get('.pf-v6-c-menu__content').contains(name).click();
164164
cy.checkContent(topology);
165165
});
166166

@@ -169,7 +169,7 @@ Cypress.Commands.add('changeMetricFunction', (name) => {
169169
cy.showDisplayOptions();
170170

171171
cy.get('#metricFunction-dropdown').click();
172-
cy.get('.pf-v5-c-menu__content').contains(name).click();
172+
cy.get('.pf-v6-c-menu__content').contains(name).click();
173173
cy.get('[data-layer-id="default"]').children().its('length').should('be.gte', 5);
174174
});
175175

@@ -178,7 +178,7 @@ Cypress.Commands.add('changeMetricType', (name) => {
178178
cy.showDisplayOptions();
179179

180180
cy.get('#metricType-dropdown').click();
181-
cy.get('.pf-v5-c-menu__content').contains(name).click();
181+
cy.get('.pf-v6-c-menu__content').contains(name).click();
182182
cy.get('[data-layer-id="default"]').children().its('length').should('be.gte', 5);
183183
});
184184

web/moduleMapper/dummy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { ResourceIconProps, ResourceLinkProps } from '@openshift-console/dynamic-plugin-sdk';
2+
import { NamespaceBarProps, ResourceIconProps, ResourceLinkProps } from '@openshift-console/dynamic-plugin-sdk';
33
import { useK8sModelsWithColors } from '../src/utils/k8s-models-hook';
44
import { k8sModels } from './k8s-models';
55

0 commit comments

Comments
 (0)