ROX-31767: Fix selectors for logout test (#17952)

Author: dvail

ui/apps/platform/cypress/constants/TopNavigation.js

@@ -1,13 +1,13 @@
 import scopeSelectors from '../helpers/scopeSelectors';
+import pf6 from '../selectors/pf6';
 
 export const selectors = {
     orchestratorComponentsToggle: scopeSelectors('[data-testid="orchestrator-components-toggle"]', {
         hideButton: 'button:contains("Hide")',
         showButton: 'button:contains("Show")',
     }),
-    menuButton: '[aria-label="User menu"]',
-
-    menuList: scopeSelectors('[aria-label="User menu"] + div ul li', {
+    menuButton: `${pf6.menuToggle}[aria-label="User menu"]`,
+    menuList: scopeSelectors(pf6.dropdownItem, {
         userEmail: '[data-testid="menu-user-email"]',
         userName: '[data-testid="menu-user-name"]',
         userRoles: '[data-testid="menu-user-roles"]',

ui/apps/platform/cypress/selectors/pf6.ts

@@ -1,7 +1,6 @@
-const navSelectors = {
-    nav: 'nav[data-ouia-component-type="PF6/Nav"]',
-    navExpandable: `li[data-ouia-component-type="PF6/NavExpandable"]`,
-    navItem: `li[data-ouia-component-type="PF6/NavItem"]`,
+const dropdownSelectors = {
+    dropdown: 'div[data-ouia-component-type="PF6/Dropdown"]',
+    dropdownItem: '*[data-ouia-component-type="PF6/DropdownItem"]',
 } as const;
 
 const menu = 'div[data-ouia-component-type="PF6/Menu"]';
@@ -11,7 +10,14 @@ const menuSelectors = {
     menuItem: `${menu} *[role="menuitem"]`,
 } as const;
 
+const navSelectors = {
+    nav: 'nav[data-ouia-component-type="PF6/Nav"]',
+    navExpandable: `li[data-ouia-component-type="PF6/NavExpandable"]`,
+    navItem: `li[data-ouia-component-type="PF6/NavItem"]`,
+} as const;
+
 export default {
-    ...navSelectors,
+    ...dropdownSelectors,
     ...menuSelectors,
+    ...navSelectors,
 };