CONSOLE-4615: Update DefaultList to use ResourceDataView

Author: rhamilto

frontend/packages/console-shared/src/hooks/useCRDAdditionalPrinterColumns.ts

@@ -6,22 +6,24 @@ import {
   K8sModel,
 } from '@console/internal/module/k8s';
 
-export const useCRDAdditionalPrinterColumns = (model: K8sModel): CRDAdditionalPrinterColumn[] => {
+export const useCRDAdditionalPrinterColumns = (
+  model: K8sModel,
+): [CRDAdditionalPrinterColumn[], boolean] => {
   const [CRDAPC, setCRDAPC] = useState<CRDAdditionalPrinterColumns>({});
-  const [loading, setLoading] = useState(true);
+  const [loaded, setLoaded] = useState(false);
 
   useEffect(() => {
     coFetchJSON(`/api/console/crd-columns/${model.plural}.${model.apiGroup}`)
       .then((response) => {
         setCRDAPC(response);
-        setLoading(false);
+        setLoaded(true);
       })
       .catch((e) => {
-        setLoading(false);
+        setLoaded(false);
         // eslint-disable-next-line no-console
         console.log(e.message);
       });
   }, [model.plural, model.apiGroup]);
 
-  return !loading ? CRDAPC?.[model.apiVersion] ?? [] : [];
+  return [CRDAPC?.[model.apiVersion] ?? [], loaded];
 };

frontend/packages/integration-tests-cypress/tests/crd-extensions/console-cli-download.cy.ts

@@ -3,7 +3,6 @@ import * as _ from 'lodash';
 import { checkErrors, testName } from '../../support';
 import { detailsPage } from '../../views/details-page';
 import { listPage } from '../../views/list-page';
-import { modal } from '../../views/modal';
 import * as yamlEditor from '../../views/yaml-editor';
 
 const crd = 'ConsoleCLIDownload';
@@ -60,12 +59,6 @@ describe(`${crd} CRD`, () => {
     cy.visit(`/command-line-tools`);
     cy.get(`[data-test-id=${name}]`).should('contain', name);
 
-    cy.visit(`/k8s/cluster/console.openshift.io~v1~${crd}`);
-    listPage.rows.shouldBeLoaded();
-    listPage.rows.clickKebabAction(name, `Delete ${crd}`);
-    modal.shouldBeOpened();
-    modal.modalTitleShouldContain(`Delete ${crd}`);
-    modal.submit();
-    modal.shouldBeClosed();
+    cy.exec(`oc delete ${crd} ${name}`);
   });
 });

frontend/packages/integration-tests-cypress/tests/crd-extensions/console-notification.cy.ts

@@ -3,7 +3,6 @@ import * as _ from 'lodash';
 import { checkErrors, testName } from '../../support';
 import { detailsPage } from '../../views/details-page';
 import { listPage } from '../../views/list-page';
-import { modal } from '../../views/modal';
 import * as yamlEditor from '../../views/yaml-editor';
 
 const crd = 'ConsoleNotification';
@@ -50,9 +49,8 @@ describe(`${crd} CRD`, () => {
     });
 
     cy.visit(`/k8s/cluster/console.openshift.io~v1~${crd}`);
-    listPage.rows.shouldBeLoaded();
+    listPage.dvRows.shouldBeLoaded();
     cy.log('Additional printer columns should exist.');
-    cy.byTestID('has-additional-printer-columns').should('exist');
     cy.byTestID('additional-printer-column-header-Text').should('have.text', 'Text');
     cy.byTestID('additional-printer-column-data-Text').should('have.text', text);
     cy.byTestID('additional-printer-column-header-Location').should('have.text', 'Location');
@@ -99,12 +97,6 @@ describe(`${crd} CRD`, () => {
 
     cy.get(altNotification).contains(altText).should('exist').and('be.visible');
 
-    cy.visit(`/k8s/cluster/console.openshift.io~v1~${crd}`);
-    listPage.rows.shouldBeLoaded();
-    listPage.rows.clickKebabAction(name, `Delete ${crd}`);
-    modal.shouldBeOpened();
-    modal.modalTitleShouldContain(`Delete ${crd}`);
-    modal.submit();
-    modal.shouldBeClosed();
+    cy.exec(`oc delete ${crd} ${name}`);
   });
 });

frontend/packages/integration-tests-cypress/tests/crd-extensions/console-yaml-sample.cy.ts

@@ -3,7 +3,6 @@ import * as _ from 'lodash';
 import { checkErrors, testName } from '../../support';
 import { detailsPage } from '../../views/details-page';
 import { listPage } from '../../views/list-page';
-import { modal } from '../../views/modal';
 import * as resourceSidebar from '../../views/resource-sidebar';
 import * as yamlEditor from '../../views/yaml-editor';
 
@@ -76,9 +75,9 @@ metadata:
     });
 
     cy.visit(`/k8s/cluster/console.openshift.io~v1~${crd}`);
-    listPage.rows.shouldBeLoaded();
+    listPage.dvRows.shouldBeLoaded();
     cy.log('Additional printer columns should not exist.');
-    cy.byTestID('has-additional-printer-columns').should('not.exist');
+    cy.get('[data-test^="additional-printer-column-header-"]').should('not.exist');
     cy.log('Created date should exist since Age does not.');
     cy.byTestID('column-header-Created').should('exist');
     cy.byTestID('column-data-Created').should('exist');
@@ -105,12 +104,6 @@ metadata:
     detailsPage.titleShouldContain(testJobName);
 
     // Delete CRD
-    cy.visit(`/k8s/cluster/console.openshift.io~v1~${crd}`);
-    listPage.rows.shouldBeLoaded();
-    listPage.rows.clickKebabAction(name, `Delete ${crd}`);
-    modal.shouldBeOpened();
-    modal.modalTitleShouldContain(`Delete ${crd}`);
-    modal.submit();
-    modal.shouldBeClosed();
+    cy.exec(`oc delete ${crd} ${name}`);
   });
 });