Added OUIA props to Sidenav (#996)

* Added OUIA props to Sidenav * Updated snapshots
RedHatInsights · Oct 5, 2020 · e35d634 · e35d634
1 parent 5f39fb6
commit e35d634
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/src/js/App/Sidenav/AppSwitcher.js b/src/js/App/Sidenav/AppSwitcher.js
@@ -29,7 +29,8 @@ const AppSwitcher = ({ currentApp }) => {
                 component='a'
                 href={`${document.baseURI}${app.id}`}
                 className={classNames({ 'ins-c-app-switcher__current': app.title === activeApp })}
-                key={app.id}>
+                key={app.id}
+                ouiaId={app.id}>
                 {app.title}
             </DropdownItem>
         );
@@ -51,6 +52,7 @@ const AppSwitcher = ({ currentApp }) => {
                 }
                 isOpen={isOpen}
                 dropdownItems={dropdownItems(currentApp)}
+                ouiaId='App Switcher'
             />
         </section>
     );

diff --git a/src/js/App/Sidenav/Navigation.js b/src/js/App/Sidenav/Navigation.js
@@ -98,16 +98,16 @@ export const Navigation = ({
                     item.subItems ? <NavExpandable
                         className="ins-m-navigation-align"
                         title={item.title}
-                        ouia-nav-group={item.id}
                         itemID={item.id}
+                        ouiaId={item.id}
                         key={key}
                         isActive={item.active}
                         isExpanded={item.active}>
                         {
                             item.subItems.map((subItem, subKey) => <NavigationItem
                                 ignoreCase={subItem.ignoreCase}
                                 itemID={subItem.reload || subItem.id}
-                                ouia-nav-item={subItem.reload || subItem.id}
+                                ouiaId={subItem.reload || subItem.id}
                                 key={subKey}
                                 title={subItem.title}
                                 parent={subItem.reload ? activeLocation : `${activeLocation}${item.id ? `/${item.id}` : ''}`}
@@ -118,7 +118,7 @@ export const Navigation = ({
                     </NavExpandable> : <NavigationItem
                         ignoreCase={item.ignoreCase}
                         itemID={item.id}
-                        ouia-nav-item={item.id}
+                        ouiaId={item.id}
                         key={key}
                         title={item.title}
                         parent={activeLocation}
@@ -131,6 +131,7 @@ export const Navigation = ({
                         className='ins-c-navigation__additional-links'
                         key={key}
                         to={item.url}
+                        ouiaId={item.id}
                         target='_blank'
                         rel='noopener noreferrer'>
                         {item.title} {item.external && <ExternalLinkAltIcon/>}

diff --git a/src/js/App/Sidenav/__snapshots__/AppSwitcher.test.js.snap b/src/js/App/Sidenav/__snapshots__/AppSwitcher.test.js.snap
@@ -6,7 +6,7 @@ exports[`AppSwitcher should render correctly 1`] = `
 >
   <div
     className="pf-c-dropdown ins-c-app-switcher__dropdown"
-    data-ouia-component-id={0}
+    data-ouia-component-id="App Switcher"
     data-ouia-component-type="PF4/Dropdown"
     data-ouia-safe={true}
   >

diff --git a/src/js/App/Sidenav/__snapshots__/Navigation.test.js.snap b/src/js/App/Sidenav/__snapshots__/Navigation.test.js.snap
@@ -251,7 +251,7 @@ exports[`Navigation should render corectly 1`] = `
       isExpanded={true}
       itemID="overview"
       key="0"
-      ouia-nav-group="overview"
+      ouiaId="overview"
       srText=""
       title="Overview"
     >
@@ -260,7 +260,7 @@ exports[`Navigation should render corectly 1`] = `
         itemID="someID"
         key="0"
         onClick={[Function]}
-        ouia-nav-item="someID"
+        ouiaId="someID"
         parent="openshift/overview"
         title="Clusters"
       />
@@ -270,7 +270,7 @@ exports[`Navigation should render corectly 1`] = `
       itemID="rules"
       key="1"
       onClick={[Function]}
-      ouia-nav-item="rules"
+      ouiaId="rules"
       parent="openshift"
       title="Rules"
     />
@@ -279,7 +279,7 @@ exports[`Navigation should render corectly 1`] = `
       itemID="topics"
       key="2"
       onClick={[Function]}
-      ouia-nav-item="topics"
+      ouiaId="topics"
       parent="openshift"
       title="Topics"
     />
@@ -288,7 +288,7 @@ exports[`Navigation should render corectly 1`] = `
       itemID="inventory"
       key="3"
       onClick={[Function]}
-      ouia-nav-item="inventory"
+      ouiaId="inventory"
       parent="openshift"
       title="Inventory"
     />
@@ -297,7 +297,7 @@ exports[`Navigation should render corectly 1`] = `
       itemID="remediations"
       key="4"
       onClick={[Function]}
-      ouia-nav-item="remediations"
+      ouiaId="remediations"
       parent="openshift"
       title="Remediations"
     />
@@ -368,7 +368,7 @@ exports[`Navigation should render correctly 2 1`] = `
       isExpanded={true}
       itemID="overview"
       key="0"
-      ouia-nav-group="overview"
+      ouiaId="overview"
       srText=""
       title="Overview"
     >
@@ -377,7 +377,7 @@ exports[`Navigation should render correctly 2 1`] = `
         itemID="someID"
         key="0"
         onClick={[Function]}
-        ouia-nav-item="someID"
+        ouiaId="someID"
         parent="openshift/overview"
         title="Clusters"
       />
@@ -387,7 +387,7 @@ exports[`Navigation should render correctly 2 1`] = `
       itemID="rules"
       key="1"
       onClick={[Function]}
-      ouia-nav-item="rules"
+      ouiaId="rules"
       parent="openshift"
       title="Rules"
     />
@@ -396,7 +396,7 @@ exports[`Navigation should render correctly 2 1`] = `
       itemID="topics"
       key="2"
       onClick={[Function]}
-      ouia-nav-item="topics"
+      ouiaId="topics"
       parent="openshift"
       title="Topics"
     />
@@ -405,7 +405,7 @@ exports[`Navigation should render correctly 2 1`] = `
       itemID="inventory"
       key="3"
       onClick={[Function]}
-      ouia-nav-item="inventory"
+      ouiaId="inventory"
       parent="openshift"
       title="Inventory"
     />
@@ -414,7 +414,7 @@ exports[`Navigation should render correctly 2 1`] = `
       itemID="remediations"
       key="4"
       onClick={[Function]}
-      ouia-nav-item="remediations"
+      ouiaId="remediations"
       parent="openshift"
       title="Remediations"
     />