Merge pull request ceph#58239 from rhcs-dashboard/carbon-forms

mgr/dashboard: carbonize rbd forms

Reviewed-by: Ankush Behl <[email protected]>

Author: nizamial09

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/images.e2e-spec.ts

@@ -18,7 +18,7 @@ describe('Images page', () => {
   after(() => {
     // Deletes images test pool
     pools.navigateTo();
-    pools.delete(poolName);
+    pools.delete(poolName, null, null, true);
     pools.navigateTo();
     pools.existTableCell(poolName, false);
   });
@@ -58,7 +58,7 @@ describe('Images page', () => {
     });
 
     it('should delete image', () => {
-      images.delete(newImageName);
+      images.delete(newImageName, null, null, true);
     });
   });
 

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/images.po.ts

@@ -71,12 +71,12 @@ export class ImagesPageHelper extends PageHelper {
     cy.contains('button', 'Restore').click();
 
     // wait for pop-up to be visible (checks for title of pop-up)
-    cy.get('cd-modal #name').should('be.visible');
+    cy.get('cds-modal #name').should('be.visible');
 
     // If a new name for the image is passed, it changes the name of the image
     if (newName !== undefined) {
       // click name box and send new name
-      cy.get('cd-modal #name').clear().type(newName);
+      cy.get('cds-modal #name').clear().type(newName);
     }
 
     cy.get('[data-cy=submitBtn]').click();
@@ -95,7 +95,7 @@ export class ImagesPageHelper extends PageHelper {
     cy.contains('button', 'Purge Trash').click();
 
     // Check for visibility of modal container
-    cy.get('.modal-header').should('be.visible');
+    cy.get('cds-modal').should('be.visible');
 
     // If purging a specific pool, selects that pool if given
     if (pool !== undefined) {

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/mirroring.e2e-spec.ts

@@ -74,7 +74,7 @@ describe('Mirroring page', () => {
           cy.get('.table-actions button.dropdown-toggle').first().click();
           cy.get('[aria-label="Import Bootstrap Token"]').click();
           cy.get('cd-bootstrap-import-modal').within(() => {
-            cy.get(`label[for=${name}]`).click();
+            cy.get(`input[name=${name}]`).click({ force: true });
             cy.get('textarea[id=token]').wait(100).type(bootstrapToken);
             cy.get('button[type=submit]').click();
           });
@@ -112,7 +112,7 @@ describe('Mirroring page', () => {
 
     afterEach(() => {
       pools.navigateTo();
-      pools.delete(poolName);
+      pools.delete(poolName, null, null, true);
     });
   });
 });

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/mirroring.po.ts

@@ -25,12 +25,12 @@ export class MirroringPageHelper extends PageHelper {
     cy.contains('button', 'Edit Mode').click();
 
     // Clicks the drop down in the edit pop-up, then clicks the Update button
-    cy.get('.modal-content').should('be.visible');
+    cy.get('cds-modal').should('be.visible');
     this.selectOption('mirrorMode', option);
 
     // Clicks update button and checks if the mode has been changed
     cy.contains('button', 'Update').click();
-    cy.contains('.modal-dialog', 'Edit pool mirror mode').should('not.exist');
+    cy.contains('cds-modal').should('not.exist');
     const val = option.toLowerCase(); // used since entries in table are lower case
     this.getFirstTableCell(val).should('be.visible');
   }
@@ -39,7 +39,7 @@ export class MirroringPageHelper extends PageHelper {
   generateToken(poolName: string) {
     cy.get('[aria-label="Create Bootstrap Token"]').first().click();
     cy.get('cd-bootstrap-create-modal').within(() => {
-      cy.get(`label[for=${poolName}]`).click();
+      cy.get(`input[name=${poolName}]`).click({ force: true });
       cy.get('button[type=submit]').click();
       cy.get('textarea[id=token]').wait(200).invoke('val').as('token');
       cy.get('[aria-label="Back"]').click();

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/hosts.po.ts

@@ -61,7 +61,7 @@ export class HostsPageHelper extends PageHelper {
   }
 
   remove(hostname: string) {
-    super.delete(hostname, this.columnIndex.hostname, 'hosts');
+    super.delete(hostname, this.columnIndex.hostname, 'hosts', true);
   }
 
   // Add or remove labels on a host, then verify labels in the table
@@ -113,7 +113,7 @@ export class HostsPageHelper extends PageHelper {
       this.getTableCell(this.columnIndex.hostname, hostname, true).click();
       this.clickActionButton('enter-maintenance');
 
-      cy.get('cd-modal').within(() => {
+      cy.get('cds-modal').within(() => {
         cy.contains('button', 'Continue').click();
       });
 

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/logs.e2e-spec.ts

@@ -54,7 +54,7 @@ describe('Logs page', () => {
 
     it('should delete pool and check audit logs reacted', () => {
       pools.navigateTo();
-      pools.delete(poolname);
+      pools.delete(poolname, null, null, true);
       logs.checkAuditForPoolFunction(poolname, 'delete', hour, minute);
     });
   });

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts

@@ -198,11 +198,11 @@ export class ServicesPageHelper extends PageHelper {
     this.clickActionButton('delete');
 
     // Confirms deletion
-    cy.get('cd-modal .custom-control-label').click();
-    cy.contains('cd-modal button', 'Delete').click();
+    cy.get('cds-modal input#confirmation_input').click({ force: true });
+    cy.contains('cds-modal button', 'Delete').click();
 
     // Wait for modal to close
-    cy.get('cd-modal').should('not.exist');
+    cy.get('cds-modal').should('not.exist');
     this.checkExist(serviceName, false);
   }
 

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/users.e2e-spec.ts

@@ -40,7 +40,7 @@ describe('Cluster Ceph Users', () => {
     });
 
     it('should delete a user', () => {
-      users.delete(entityName);
+      users.delete(entityName, null, null, true);
     });
   });
 });

src/pybind/mgr/dashboard/frontend/cypress/e2e/common/forms-helper.feature.po.ts

@@ -60,11 +60,20 @@ Then('I check the tick box in modal', () => {
   cy.get('cd-modal input#confirmation').click();
 });
 
+Then('I check the tick box in carbon modal', () => {
+  cy.get('cds-modal input#confirmation_input').click({ force: true });
+});
+
 And('I confirm to {string}', (action: string) => {
   cy.contains('cd-modal button', action).click();
   cy.get('cd-modal').should('not.exist');
 });
 
+And('I confirm to {string} on carbon modal', (action: string) => {
+  cy.contains('cds-modal button', action).click();
+  cy.get('cds-modal').should('not.exist');
+});
+
 Then('I should see an error in {string} field', (field: string) => {
   cy.get('cd-modal').within(() => {
     cy.get(`input[id=${field}]`).should('have.class', 'ng-invalid');

src/pybind/mgr/dashboard/frontend/cypress/e2e/common/global.feature.po.ts

@@ -29,10 +29,20 @@ Then('I should see the modal', () => {
   cy.get('cd-modal').should('exist');
 });
 
+// @TODO: Replace with the existing (above one)
+// once carbon migration is completed
+Then('I should see the carbon modal', () => {
+  cy.get('cds-modal').should('exist');
+});
+
 Then('I should not see the modal', () => {
   cy.get('cd-modal').should('not.exist');
 });
 
+Then('I should not see the carbon modal', () => {
+  cy.get('cds-modal').should('not.exist');
+});
+
 And('I go to the {string} tab', (names: string) => {
   for (const name of names.split(', ')) {
     cy.contains('.nav.nav-tabs a', name).click();