Merge pull request #12270 from codyrancher/role-template-detail-remove

Fix a problem with deleting role templates from the respective detail pages

cypress/e2e/po/detail/management.cattle.io.roletemplate.po.ts

@@ -1,11 +1,18 @@
 import RoleDetailPo from '@/cypress/e2e/po/detail/role.po';
 import RoleTemplateEditPo from '@/cypress/e2e/po/edit/management.cattle.io.roletemplate.po';
 import ResourceDetailPo from '@/cypress/e2e/po/edit/resource-detail.po';
+import ActionMenu from '@/cypress/e2e/po/components/action-menu.po';
 
 class RoleTemplateDetailComponentPo extends ResourceDetailPo {
   userCreateEditView(clusterId: string, userId?: string ) {
     return new RoleTemplateEditPo(clusterId, userId);
   }
+
+  openMastheadActionMenu() {
+    this.self().get('[data-testid="mathead-action-menu"]').click();
+
+    return new ActionMenu(undefined);
+  }
 }
 
 export default class RoleTemplateDetailPo extends RoleDetailPo {

cypress/e2e/tests/pages/users-and-auth/roles.spec.ts

@@ -228,6 +228,25 @@ describe('Roles Templates', { tags: ['@usersAndAuths', '@adminUser'] }, () => {
       promptRemove.warning().first().should('contain.text', 'Caution:'); // Check warning message content
     });
 
+    it('can delete a role template from the detail page', () => {
+      // Delete role and verify role is removed from list
+      roles.waitForRequests();
+      const oneRoleTemplateId = roleTemplatesToDelete.splice(0, 1)[0];
+      const detailPage = roles.detailRole(oneRoleTemplateId);
+
+      detailPage.goTo();
+      detailPage.waitForPage();
+
+      const actionMenu = detailPage.detail().openMastheadActionMenu();
+
+      actionMenu.clickMenuItem(5);
+
+      const promptRemove = new PromptRemove();
+
+      promptRemove.remove();
+      roles.list('CLUSTER').elementWithName(oneRoleTemplateId).should('not.exist');
+    });
+
     it('can delete a role template', () => {
     // Delete role and verify role is removed from list
       roles.waitForRequests();

shell/components/PromptRemove.vue

@@ -105,8 +105,8 @@ export default {
         return null;
       }
 
-      if (this.toRemove[0].doneLocationRemove) {
-        return this.toRemove[0].doneLocationRemove;
+      if (this.toRemove[0].doneOverride) {
+        return this.toRemove[0].doneOverride;
       }
 
       const currentRoute = this.toRemove[0].currentRoute();

shell/components/ResourceDetail/Masthead.vue

@@ -521,6 +521,7 @@ export default {
             <button
               v-if="isView"
               ref="actions"
+              data-testid="mathead-action-menu"
               aria-haspopup="true"
               type="button"
               class="btn role-multi-action actions"