From 9548ea30a5706332a423dd54edd00ba439973b63 Mon Sep 17 00:00:00 2001
From: Dmitrii Misharov <dmisharo@redhat.com>
Date: Tue, 22 Sep 2020 19:40:10 +0200
Subject: [PATCH] Added more OUIA props into Dropdown component (#4754)

* Added more OUIA props into Dropdown component

* Better OUIA default ids for DropdownToggleCheckbox

* getOUIAProps is replaced by useOUIAProps
---
 .../ApplicationLauncher.test.tsx.snap         | 222 ++++++++++++++++++
 .../src/components/Dropdown/DropdownItem.tsx  |  70 +++---
 .../components/Dropdown/DropdownSeparator.tsx |  35 +--
 .../components/Dropdown/DropdownToggle.tsx    |   7 +-
 .../Dropdown/DropdownToggleCheckbox.tsx       |  31 ++-
 .../DropdownToggleCheckbox.test.tsx.snap      |   3 +
 .../__snapshots__/Dropdown.test.tsx.snap      |  90 +++++++
 .../DropdownToggle.test.tsx.snap              |  30 +++
 .../DropdownToggleCheckbox.test.tsx.snap      |  21 ++
 .../__snapshots__/Toggle.test.tsx.snap        |   6 +
 .../__snapshots__/OptionsMenu.test.tsx.snap   | 195 +++++++++++++++
 .../__snapshots__/Pagination.test.tsx.snap    | 195 +++++++++++++++
 12 files changed, 856 insertions(+), 49 deletions(-)

diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
index 89358d553ee..5208df7424a 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
+++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
@@ -147,6 +147,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                 aria-haspopup="true"
                 aria-label="Application launcher"
                 class="pf-c-app-launcher__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="pf-dropdown-toggle-id-5"
                 type="button"
               >
@@ -178,6 +181,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   <a
                     aria-disabled="false"
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-7"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                   >
                     Link
@@ -188,6 +194,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                 >
                   <button
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-8"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                     type="button"
                   >
@@ -200,6 +209,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   <a
                     aria-disabled="true"
                     class="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-9"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                   >
                     Disabled Link
@@ -210,6 +222,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                 >
                   <button
                     class="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-10"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     disabled=""
                     tabindex="-1"
                     type="button"
@@ -231,6 +246,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   <a
                     aria-disabled="false"
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-11"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                   >
                     Separated Link
@@ -241,6 +259,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                 >
                   <button
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-12"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                     type="button"
                   >
@@ -258,6 +279,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
           aria-label="Application launcher"
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="pf-dropdown-toggle-id-5"
           isActive={false}
@@ -281,6 +305,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   aria-haspopup="true"
                   aria-label="Application launcher"
                   class="pf-c-app-launcher__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="pf-dropdown-toggle-id-5"
                   type="button"
                 >
@@ -312,6 +339,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     <a
                       aria-disabled="false"
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-7"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                     >
                       Link
@@ -322,6 +352,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   >
                     <button
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-8"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                       type="button"
                     >
@@ -334,6 +367,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     <a
                       aria-disabled="true"
                       class="pf-m-disabled pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-9"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                     >
                       Disabled Link
@@ -344,6 +380,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   >
                     <button
                       class="pf-m-disabled pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-10"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       disabled=""
                       tabindex="-1"
                       type="button"
@@ -365,6 +404,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     <a
                       aria-disabled="false"
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-11"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                     >
                       Separated Link
@@ -375,6 +417,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   >
                     <button
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-12"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                       type="button"
                     >
@@ -391,6 +436,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
             aria-haspopup={true}
             aria-label="Application launcher"
             className="pf-c-app-launcher__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="pf-dropdown-toggle-id-5"
             onClick={[Function]}
@@ -470,6 +518,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-7"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -495,6 +546,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   <a
                     aria-disabled={false}
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-7"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     href={null}
                     tabIndex={-1}
                   >
@@ -529,6 +583,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-8"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -553,6 +610,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                 >
                   <button
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-8"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     disabled={false}
                     href={null}
                     tabIndex={-1}
@@ -590,6 +650,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-9"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -615,6 +678,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   <a
                     aria-disabled={true}
                     className="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-9"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     href={null}
                     tabIndex={-1}
                   >
@@ -651,6 +717,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-10"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -675,6 +744,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                 >
                   <button
                     className="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-10"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     disabled={true}
                     href={null}
                     tabIndex={-1}
@@ -708,6 +780,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownSeparator-2"
+                data-ouia-component-type="PF4/DropdownSeparator"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 icon={null}
@@ -761,6 +836,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-11"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -786,6 +864,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                   <a
                     aria-disabled={false}
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-11"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     href={null}
                     tabIndex={-1}
                   >
@@ -820,6 +901,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-12"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -844,6 +928,9 @@ exports[`ApplicationLauncher custom icon 1`] = `
                 >
                   <button
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-12"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     disabled={false}
                     href={null}
                     tabIndex={-1}
@@ -1009,6 +1096,9 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
                 aria-haspopup="true"
                 aria-label="Application launcher"
                 class="pf-c-app-launcher__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="pf-dropdown-toggle-id-3"
                 type="button"
               >
@@ -1038,6 +1128,9 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
           aria-label="Application launcher"
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="pf-dropdown-toggle-id-3"
           isActive={false}
@@ -1061,6 +1154,9 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
                   aria-haspopup="true"
                   aria-label="Application launcher"
                   class="pf-c-app-launcher__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="pf-dropdown-toggle-id-3"
                   type="button"
                 >
@@ -1089,6 +1185,9 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
             aria-haspopup={true}
             aria-label="Application launcher"
             className="pf-c-app-launcher__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="pf-dropdown-toggle-id-3"
             onClick={[Function]}
@@ -1276,6 +1375,9 @@ exports[`ApplicationLauncher dropup 1`] = `
                 aria-haspopup="true"
                 aria-label="Application launcher"
                 class="pf-c-app-launcher__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="pf-dropdown-toggle-id-2"
                 type="button"
               >
@@ -1305,6 +1407,9 @@ exports[`ApplicationLauncher dropup 1`] = `
           aria-label="Application launcher"
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="pf-dropdown-toggle-id-2"
           isActive={false}
@@ -1328,6 +1433,9 @@ exports[`ApplicationLauncher dropup 1`] = `
                   aria-haspopup="true"
                   aria-label="Application launcher"
                   class="pf-c-app-launcher__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="pf-dropdown-toggle-id-2"
                   type="button"
                 >
@@ -1356,6 +1464,9 @@ exports[`ApplicationLauncher dropup 1`] = `
             aria-haspopup={true}
             aria-label="Application launcher"
             className="pf-c-app-launcher__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="pf-dropdown-toggle-id-2"
             onClick={[Function]}
@@ -1543,6 +1654,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                 aria-haspopup="true"
                 aria-label="Application launcher"
                 class="pf-c-app-launcher__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="pf-dropdown-toggle-id-4"
                 type="button"
               >
@@ -1573,6 +1687,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   <a
                     aria-disabled="false"
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                   >
                     Link
@@ -1583,6 +1700,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                 >
                   <button
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                     type="button"
                   >
@@ -1595,6 +1715,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   <a
                     aria-disabled="true"
                     class="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                   >
                     Disabled Link
@@ -1605,6 +1728,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                 >
                   <button
                     class="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     disabled=""
                     tabindex="-1"
                     type="button"
@@ -1626,6 +1752,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   <a
                     aria-disabled="false"
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                   >
                     Separated Link
@@ -1636,6 +1765,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                 >
                   <button
                     class="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe="true"
                     tabindex="-1"
                     type="button"
                   >
@@ -1653,6 +1785,9 @@ exports[`ApplicationLauncher expanded 1`] = `
           aria-label="Application launcher"
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="pf-dropdown-toggle-id-4"
           isActive={false}
@@ -1676,6 +1811,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   aria-haspopup="true"
                   aria-label="Application launcher"
                   class="pf-c-app-launcher__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="pf-dropdown-toggle-id-4"
                   type="button"
                 >
@@ -1706,6 +1844,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     <a
                       aria-disabled="false"
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                     >
                       Link
@@ -1716,6 +1857,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   >
                     <button
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                       type="button"
                     >
@@ -1728,6 +1872,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     <a
                       aria-disabled="true"
                       class="pf-m-disabled pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                     >
                       Disabled Link
@@ -1738,6 +1885,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   >
                     <button
                       class="pf-m-disabled pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       disabled=""
                       tabindex="-1"
                       type="button"
@@ -1759,6 +1909,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     <a
                       aria-disabled="false"
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                     >
                       Separated Link
@@ -1769,6 +1922,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   >
                     <button
                       class="pf-c-app-launcher__menu-item"
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe="true"
                       tabindex="-1"
                       type="button"
                     >
@@ -1785,6 +1941,9 @@ exports[`ApplicationLauncher expanded 1`] = `
             aria-haspopup={true}
             aria-label="Application launcher"
             className="pf-c-app-launcher__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="pf-dropdown-toggle-id-4"
             onClick={[Function]}
@@ -1862,6 +2021,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -1887,6 +2049,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   <a
                     aria-disabled={false}
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     href={null}
                     tabIndex={-1}
                   >
@@ -1921,6 +2086,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -1945,6 +2113,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                 >
                   <button
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     disabled={false}
                     href={null}
                     tabIndex={-1}
@@ -1982,6 +2153,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -2007,6 +2181,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   <a
                     aria-disabled={true}
                     className="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     href={null}
                     tabIndex={-1}
                   >
@@ -2043,6 +2220,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -2067,6 +2247,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                 >
                   <button
                     className="pf-m-disabled pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     disabled={true}
                     href={null}
                     tabIndex={-1}
@@ -2100,6 +2283,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownSeparator-1"
+                data-ouia-component-type="PF4/DropdownSeparator"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 icon={null}
@@ -2153,6 +2339,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -2178,6 +2367,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                   <a
                     aria-disabled={false}
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     href={null}
                     tabIndex={-1}
                   >
@@ -2212,6 +2404,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                     "sendRef": [Function],
                   }
                 }
+                data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                data-ouia-component-type="PF4/DropdownItem"
+                data-ouia-safe={true}
                 description={null}
                 enterTriggersArrowDown={false}
                 href={null}
@@ -2236,6 +2431,9 @@ exports[`ApplicationLauncher expanded 1`] = `
                 >
                   <button
                     className="pf-c-app-launcher__menu-item"
+                    data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                    data-ouia-component-type="PF4/DropdownItem"
+                    data-ouia-safe={true}
                     disabled={false}
                     href={null}
                     tabIndex={-1}
@@ -2401,6 +2599,9 @@ exports[`ApplicationLauncher regular 1`] = `
                 aria-haspopup="true"
                 aria-label="Application launcher"
                 class="pf-c-app-launcher__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="pf-dropdown-toggle-id-0"
                 type="button"
               >
@@ -2430,6 +2631,9 @@ exports[`ApplicationLauncher regular 1`] = `
           aria-label="Application launcher"
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="pf-dropdown-toggle-id-0"
           isActive={false}
@@ -2453,6 +2657,9 @@ exports[`ApplicationLauncher regular 1`] = `
                   aria-haspopup="true"
                   aria-label="Application launcher"
                   class="pf-c-app-launcher__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="pf-dropdown-toggle-id-0"
                   type="button"
                 >
@@ -2481,6 +2688,9 @@ exports[`ApplicationLauncher regular 1`] = `
             aria-haspopup={true}
             aria-label="Application launcher"
             className="pf-c-app-launcher__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="pf-dropdown-toggle-id-0"
             onClick={[Function]}
@@ -2668,6 +2878,9 @@ exports[`ApplicationLauncher right aligned 1`] = `
                 aria-haspopup="true"
                 aria-label="Application launcher"
                 class="pf-c-app-launcher__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="pf-dropdown-toggle-id-1"
                 type="button"
               >
@@ -2697,6 +2910,9 @@ exports[`ApplicationLauncher right aligned 1`] = `
           aria-label="Application launcher"
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="pf-dropdown-toggle-id-1"
           isActive={false}
@@ -2720,6 +2936,9 @@ exports[`ApplicationLauncher right aligned 1`] = `
                   aria-haspopup="true"
                   aria-label="Application launcher"
                   class="pf-c-app-launcher__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="pf-dropdown-toggle-id-1"
                   type="button"
                 >
@@ -2748,6 +2967,9 @@ exports[`ApplicationLauncher right aligned 1`] = `
             aria-haspopup={true}
             aria-label="Application launcher"
             className="pf-c-app-launcher__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="pf-dropdown-toggle-id-1"
             onClick={[Function]}
diff --git a/packages/react-core/src/components/Dropdown/DropdownItem.tsx b/packages/react-core/src/components/Dropdown/DropdownItem.tsx
index e09497eae99..57f86d71bf7 100644
--- a/packages/react-core/src/components/Dropdown/DropdownItem.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownItem.tsx
@@ -1,8 +1,9 @@
 import * as React from 'react';
 import { InternalDropdownItemProps, InternalDropdownItem } from './InternalDropdownItem';
 import { DropdownArrowContext } from './dropdownConstants';
+import { useOUIAProps, OUIAProps } from '../../helpers';
 
-export interface DropdownItemProps extends InternalDropdownItemProps {
+export interface DropdownItemProps extends InternalDropdownItemProps, OUIAProps {
   /** Anything which can be rendered as dropdown item */
   children?: React.ReactNode;
   /** Classes applied to root element of dropdown item */
@@ -65,35 +66,42 @@ export const DropdownItem: React.FunctionComponent<DropdownItemProps> = ({
   autoFocus,
   description = null,
   styleChildren,
+  ouiaId,
+  ouiaSafe,
   ...props
-}: DropdownItemProps) => (
-  <DropdownArrowContext.Consumer>
-    {context => (
-      <InternalDropdownItem
-        context={context}
-        role="menuitem"
-        tabIndex={tabIndex}
-        className={className}
-        component={component}
-        isDisabled={isDisabled}
-        isPlainText={isPlainText}
-        isHovered={isHovered}
-        href={href}
-        tooltip={tooltip}
-        tooltipProps={tooltipProps}
-        listItemClassName={listItemClassName}
-        onClick={onClick}
-        additionalChild={additionalChild}
-        customChild={customChild}
-        icon={icon}
-        autoFocus={autoFocus}
-        styleChildren={styleChildren}
-        description={description}
-        {...props}
-      >
-        {children}
-      </InternalDropdownItem>
-    )}
-  </DropdownArrowContext.Consumer>
-);
+}: DropdownItemProps) => {
+  const ouiaProps = useOUIAProps(DropdownItem.displayName, ouiaId, ouiaSafe);
+  return (
+    <DropdownArrowContext.Consumer>
+      {context => (
+        <InternalDropdownItem
+          context={context}
+          role="menuitem"
+          tabIndex={tabIndex}
+          className={className}
+          component={component}
+          isDisabled={isDisabled}
+          isPlainText={isPlainText}
+          isHovered={isHovered}
+          href={href}
+          tooltip={tooltip}
+          tooltipProps={tooltipProps}
+          listItemClassName={listItemClassName}
+          onClick={onClick}
+          additionalChild={additionalChild}
+          customChild={customChild}
+          icon={icon}
+          autoFocus={autoFocus}
+          styleChildren={styleChildren}
+          description={description}
+          {...ouiaProps}
+          {...props}
+        >
+          {children}
+        </InternalDropdownItem>
+      )}
+    </DropdownArrowContext.Consumer>
+  );
+};
+
 DropdownItem.displayName = 'DropdownItem';
diff --git a/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx b/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx
index 5826bb37b1c..c026a706199 100644
--- a/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownSeparator.tsx
@@ -2,8 +2,9 @@ import * as React from 'react';
 import { DropdownArrowContext } from './dropdownConstants';
 import { InternalDropdownItem } from './InternalDropdownItem';
 import { Divider, DividerVariant } from '../Divider';
+import { useOUIAProps, OUIAProps } from '../../helpers';
 
-export interface SeparatorProps extends React.HTMLProps<HTMLAnchorElement> {
+export interface SeparatorProps extends React.HTMLProps<HTMLAnchorElement>, OUIAProps {
   /** Classes applied to root element of dropdown item */
   className?: string;
   /** Click event to pass to InternalDropdownItem */
@@ -14,18 +15,24 @@ export const DropdownSeparator: React.FunctionComponent<SeparatorProps> = ({
   className = '',
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ref, // Types of Ref are different for React.FC vs React.Component
+  ouiaId,
+  ouiaSafe,
   ...props
-}: SeparatorProps) => (
-  <DropdownArrowContext.Consumer>
-    {context => (
-      <InternalDropdownItem
-        {...props}
-        context={context}
-        component={<Divider component={DividerVariant.div} />}
-        className={className}
-        role="separator"
-      />
-    )}
-  </DropdownArrowContext.Consumer>
-);
+}: SeparatorProps) => {
+  const ouiaProps = useOUIAProps(DropdownSeparator.displayName, ouiaId, ouiaSafe);
+  return (
+    <DropdownArrowContext.Consumer>
+      {context => (
+        <InternalDropdownItem
+          {...props}
+          context={context}
+          component={<Divider component={DividerVariant.div} />}
+          className={className}
+          role="separator"
+          {...ouiaProps}
+        />
+      )}
+    </DropdownArrowContext.Consumer>
+  );
+};
 DropdownSeparator.displayName = 'DropdownSeparator';
diff --git a/packages/react-core/src/components/Dropdown/DropdownToggle.tsx b/packages/react-core/src/components/Dropdown/DropdownToggle.tsx
index bfcff419240..0f2ac2377f6 100644
--- a/packages/react-core/src/components/Dropdown/DropdownToggle.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownToggle.tsx
@@ -4,8 +4,9 @@ import { Toggle } from './Toggle';
 import styles from '@patternfly/react-styles/css/components/Dropdown/dropdown';
 import { DropdownContext } from './dropdownConstants';
 import { css } from '@patternfly/react-styles';
+import { useOUIAProps, OUIAProps } from '../../helpers';
 
-export interface DropdownToggleProps extends React.HTMLProps<HTMLButtonElement> {
+export interface DropdownToggleProps extends React.HTMLProps<HTMLButtonElement>, OUIAProps {
   /** HTML ID of dropdown toggle */
   id?: string;
   /** Anything which can be rendered as dropdown toggle button */
@@ -65,10 +66,13 @@ export const DropdownToggle: React.FunctionComponent<DropdownToggleProps> = ({
   splitButtonItems,
   splitButtonVariant = 'checkbox',
   'aria-haspopup': ariaHasPopup,
+  ouiaId,
+  ouiaSafe,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ref, // Types of Ref are different for React.FC vs React.Component
   ...props
 }: DropdownToggleProps) => {
+  const ouiaProps = useOUIAProps(DropdownToggle.displayName, ouiaId, ouiaSafe);
   const toggle = (
     <DropdownContext.Consumer>
       {({ toggleTextClass, toggleIndicatorClass, toggleIconClass }) => (
@@ -85,6 +89,7 @@ export const DropdownToggle: React.FunctionComponent<DropdownToggleProps> = ({
           isPrimary={isPrimary}
           onToggle={onToggle}
           aria-haspopup={ariaHasPopup}
+          {...ouiaProps}
           {...(splitButtonItems && { isSplitButton: true, 'aria-label': props['aria-label'] || 'Select' })}
         >
           {icon && <span className={css(toggleIconClass)}>{icon}</span>}
diff --git a/packages/react-core/src/components/Dropdown/DropdownToggleCheckbox.tsx b/packages/react-core/src/components/Dropdown/DropdownToggleCheckbox.tsx
index b75a8373910..a7d28ec49d8 100644
--- a/packages/react-core/src/components/Dropdown/DropdownToggleCheckbox.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownToggleCheckbox.tsx
@@ -2,9 +2,11 @@ import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Dropdown/dropdown';
 import { css } from '@patternfly/react-styles';
 import { PickOptional } from '../../helpers/typeUtils';
+import { getOUIAProps, OUIAProps, getDefaultOUIAId } from '../../helpers';
 
 export interface DropdownToggleCheckboxProps
-  extends Omit<React.HTMLProps<HTMLInputElement>, 'type' | 'onChange' | 'disabled' | 'checked'> {
+  extends Omit<React.HTMLProps<HTMLInputElement>, 'type' | 'onChange' | 'disabled' | 'checked'>,
+    OUIAProps {
   /** Additional classes added to the DropdownToggleCheckbox */
   className?: string;
   /** Flag to show if the checkbox selection is valid or invalid */
@@ -25,7 +27,7 @@ export interface DropdownToggleCheckboxProps
   'aria-label': string;
 }
 
-export class DropdownToggleCheckbox extends React.Component<DropdownToggleCheckboxProps> {
+export class DropdownToggleCheckbox extends React.Component<DropdownToggleCheckboxProps, { ouiaStateId: string }> {
   static displayName = 'DropdownToggleCheckbox';
   static defaultProps: PickOptional<DropdownToggleCheckboxProps> = {
     className: '',
@@ -34,6 +36,13 @@ export class DropdownToggleCheckbox extends React.Component<DropdownToggleCheckb
     onChange: () => undefined as any
   };
 
+  constructor(props: DropdownToggleCheckboxProps) {
+    super(props);
+    this.state = {
+      ouiaStateId: getDefaultOUIAId(DropdownToggleCheckbox.displayName)
+    };
+  }
+
   handleChange = (event: React.FormEvent<HTMLInputElement>) => {
     this.props.onChange((event.target as HTMLInputElement).checked, event);
   };
@@ -51,7 +60,18 @@ export class DropdownToggleCheckbox extends React.Component<DropdownToggleCheckb
 
   render() {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { className, onChange, isValid, isDisabled, isChecked, checked, children, ...props } = this.props;
+    const {
+      className,
+      onChange,
+      isValid,
+      isDisabled,
+      isChecked,
+      checked,
+      children,
+      ouiaId,
+      ouiaSafe,
+      ...props
+    } = this.props;
     const text = children && (
       <span className={css(styles.dropdownToggleText, className)} aria-hidden="true" id={`${props.id}-text`}>
         {children}
@@ -67,6 +87,11 @@ export class DropdownToggleCheckbox extends React.Component<DropdownToggleCheckb
           aria-invalid={!isValid}
           disabled={isDisabled}
           checked={this.calculateChecked()}
+          {...getOUIAProps(
+            DropdownToggleCheckbox.displayName,
+            ouiaId !== undefined ? ouiaId : this.state.ouiaStateId,
+            ouiaSafe
+          )}
         />
         {text}
       </label>
diff --git a/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/DropdownToggleCheckbox.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/DropdownToggleCheckbox.test.tsx.snap
index 7c5d707d8d6..e8499dc4639 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/DropdownToggleCheckbox.test.tsx.snap
+++ b/packages/react-core/src/components/Dropdown/__tests__/Generated/__snapshots__/DropdownToggleCheckbox.test.tsx.snap
@@ -9,6 +9,9 @@ exports[`DropdownToggleCheckbox should match snapshot (auto-generated) 1`] = `
     aria-invalid={false}
     aria-label="string"
     checked={true}
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-1"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={false}
     id="string"
     onChange={[Function]}
diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
index 133ffe2cf40..79c8e5e6445 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
+++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
@@ -1886,6 +1886,9 @@ exports[`KebabToggle expanded 1`] = `
                   "sendRef": [Function],
                 }
               }
+              data-ouia-component-id="OUIA-Generated-DropdownSeparator-2"
+              data-ouia-component-type="PF4/DropdownSeparator"
+              data-ouia-safe={true}
               description={null}
               enterTriggersArrowDown={false}
               icon={null}
@@ -3404,6 +3407,9 @@ exports[`dropdown basic 1`] = `
                 aria-expanded="true"
                 aria-haspopup="false"
                 class="pf-c-dropdown__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="Dropdown Toggle"
                 type="button"
               >
@@ -3445,6 +3451,9 @@ exports[`dropdown basic 1`] = `
           aria-haspopup={false}
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="Dropdown Toggle"
           isActive={false}
@@ -3467,6 +3476,9 @@ exports[`dropdown basic 1`] = `
                   aria-expanded="true"
                   aria-haspopup="false"
                   class="pf-c-dropdown__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="Dropdown Toggle"
                   type="button"
                 >
@@ -3508,6 +3520,9 @@ exports[`dropdown basic 1`] = `
             aria-expanded={true}
             aria-haspopup={false}
             className="pf-c-dropdown__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="Dropdown Toggle"
             onClick={[Function]}
@@ -3920,6 +3935,9 @@ exports[`dropdown dropup + right aligned 1`] = `
                 aria-expanded="false"
                 aria-haspopup="true"
                 class="pf-c-dropdown__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="Dropdown Toggle"
                 type="button"
               >
@@ -3954,6 +3972,9 @@ exports[`dropdown dropup + right aligned 1`] = `
           aria-haspopup={true}
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="Dropdown Toggle"
           isActive={false}
@@ -3976,6 +3997,9 @@ exports[`dropdown dropup + right aligned 1`] = `
                   aria-expanded="false"
                   aria-haspopup="true"
                   class="pf-c-dropdown__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="Dropdown Toggle"
                   type="button"
                 >
@@ -4010,6 +4034,9 @@ exports[`dropdown dropup + right aligned 1`] = `
             aria-expanded={false}
             aria-haspopup={true}
             className="pf-c-dropdown__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="Dropdown Toggle"
             onClick={[Function]}
@@ -4398,6 +4425,9 @@ exports[`dropdown dropup 1`] = `
                 aria-expanded="false"
                 aria-haspopup="true"
                 class="pf-c-dropdown__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="Dropdown Toggle"
                 type="button"
               >
@@ -4432,6 +4462,9 @@ exports[`dropdown dropup 1`] = `
           aria-haspopup={true}
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="Dropdown Toggle"
           isActive={false}
@@ -4454,6 +4487,9 @@ exports[`dropdown dropup 1`] = `
                   aria-expanded="false"
                   aria-haspopup="true"
                   class="pf-c-dropdown__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="Dropdown Toggle"
                   type="button"
                 >
@@ -4488,6 +4524,9 @@ exports[`dropdown dropup 1`] = `
             aria-expanded={false}
             aria-haspopup={true}
             className="pf-c-dropdown__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="Dropdown Toggle"
             onClick={[Function]}
@@ -4876,6 +4915,9 @@ exports[`dropdown expanded 1`] = `
                 aria-expanded="true"
                 aria-haspopup="true"
                 class="pf-c-dropdown__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="Dropdown Toggle"
                 type="button"
               >
@@ -4986,6 +5028,9 @@ exports[`dropdown expanded 1`] = `
           aria-haspopup={true}
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="Dropdown Toggle"
           isActive={false}
@@ -5008,6 +5053,9 @@ exports[`dropdown expanded 1`] = `
                   aria-expanded="true"
                   aria-haspopup="true"
                   class="pf-c-dropdown__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="Dropdown Toggle"
                   type="button"
                 >
@@ -5118,6 +5166,9 @@ exports[`dropdown expanded 1`] = `
             aria-expanded={true}
             aria-haspopup={true}
             className="pf-c-dropdown__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="Dropdown Toggle"
             onClick={[Function]}
@@ -5342,6 +5393,9 @@ exports[`dropdown expanded 1`] = `
                   "sendRef": [Function],
                 }
               }
+              data-ouia-component-id="OUIA-Generated-DropdownSeparator-1"
+              data-ouia-component-type="PF4/DropdownSeparator"
+              data-ouia-safe={true}
               description={null}
               enterTriggersArrowDown={false}
               icon={null}
@@ -5795,6 +5849,9 @@ exports[`dropdown primary 1`] = `
                 aria-expanded="false"
                 aria-haspopup="true"
                 class="pf-c-dropdown__toggle pf-m-primary"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="Dropdown Toggle"
                 type="button"
               >
@@ -5829,6 +5886,9 @@ exports[`dropdown primary 1`] = `
           aria-haspopup={true}
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="Dropdown Toggle"
           isActive={false}
@@ -5851,6 +5911,9 @@ exports[`dropdown primary 1`] = `
                   aria-expanded="false"
                   aria-haspopup="true"
                   class="pf-c-dropdown__toggle pf-m-primary"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="Dropdown Toggle"
                   type="button"
                 >
@@ -5885,6 +5948,9 @@ exports[`dropdown primary 1`] = `
             aria-expanded={false}
             aria-haspopup={true}
             className="pf-c-dropdown__toggle pf-m-primary"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="Dropdown Toggle"
             onClick={[Function]}
@@ -6272,6 +6338,9 @@ exports[`dropdown regular 1`] = `
                 aria-expanded="false"
                 aria-haspopup="true"
                 class="pf-c-dropdown__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="Dropdown Toggle"
                 type="button"
               >
@@ -6306,6 +6375,9 @@ exports[`dropdown regular 1`] = `
           aria-haspopup={true}
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="Dropdown Toggle"
           isActive={false}
@@ -6328,6 +6400,9 @@ exports[`dropdown regular 1`] = `
                   aria-expanded="false"
                   aria-haspopup="true"
                   class="pf-c-dropdown__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="Dropdown Toggle"
                   type="button"
                 >
@@ -6362,6 +6437,9 @@ exports[`dropdown regular 1`] = `
             aria-expanded={false}
             aria-haspopup={true}
             className="pf-c-dropdown__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="Dropdown Toggle"
             onClick={[Function]}
@@ -6750,6 +6828,9 @@ exports[`dropdown right aligned 1`] = `
                 aria-expanded="false"
                 aria-haspopup="true"
                 class="pf-c-dropdown__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="Dropdown Toggle"
                 type="button"
               >
@@ -6784,6 +6865,9 @@ exports[`dropdown right aligned 1`] = `
           aria-haspopup={true}
           bubbleEvent={false}
           className=""
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           getMenuRef={[Function]}
           id="Dropdown Toggle"
           isActive={false}
@@ -6806,6 +6890,9 @@ exports[`dropdown right aligned 1`] = `
                   aria-expanded="false"
                   aria-haspopup="true"
                   class="pf-c-dropdown__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="Dropdown Toggle"
                   type="button"
                 >
@@ -6840,6 +6927,9 @@ exports[`dropdown right aligned 1`] = `
             aria-expanded={false}
             aria-haspopup={true}
             className="pf-c-dropdown__toggle"
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             disabled={false}
             id="Dropdown Toggle"
             onClick={[Function]}
diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggle.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggle.test.tsx.snap
index c780df7db25..1fd4255b8dc 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggle.test.tsx.snap
+++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggle.test.tsx.snap
@@ -9,6 +9,9 @@ exports[`state active 1`] = `
   <Toggle
     bubbleEvent={false}
     className=""
+    data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+    data-ouia-component-type="PF4/DropdownToggle"
+    data-ouia-safe={true}
     getMenuRef={null}
     id="Dropdown Toggle"
     isActive={true}
@@ -24,6 +27,9 @@ exports[`state active 1`] = `
     <button
       aria-expanded={false}
       className="pf-c-dropdown__toggle pf-m-active"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe={true}
       disabled={false}
       id="Dropdown Toggle"
       onClick={[Function]}
@@ -77,6 +83,9 @@ exports[`state class changes 1`] = `
   <Toggle
     bubbleEvent={false}
     className=""
+    data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+    data-ouia-component-type="PF4/DropdownToggle"
+    data-ouia-safe={true}
     getMenuRef={null}
     id="Dropdown Toggle"
     isActive={false}
@@ -93,6 +102,9 @@ exports[`state class changes 1`] = `
     <button
       aria-expanded={false}
       className="pf-c-dropdown__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe={true}
       disabled={false}
       id="Dropdown Toggle"
       isFocused={true}
@@ -147,6 +159,9 @@ exports[`state class changes 2`] = `
   <Toggle
     bubbleEvent={false}
     className=""
+    data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
+    data-ouia-component-type="PF4/DropdownToggle"
+    data-ouia-safe={true}
     getMenuRef={null}
     id="Dropdown Toggle"
     isActive={false}
@@ -163,6 +178,9 @@ exports[`state class changes 2`] = `
     <button
       aria-expanded={false}
       className="pf-c-dropdown__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe={true}
       disabled={false}
       id="Dropdown Toggle"
       isFocused={true}
@@ -217,6 +235,9 @@ exports[`state focus 1`] = `
   <Toggle
     bubbleEvent={false}
     className=""
+    data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+    data-ouia-component-type="PF4/DropdownToggle"
+    data-ouia-safe={true}
     getMenuRef={null}
     id="Dropdown Toggle"
     isActive={false}
@@ -233,6 +254,9 @@ exports[`state focus 1`] = `
     <button
       aria-expanded={false}
       className="pf-c-dropdown__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe={true}
       disabled={false}
       id="Dropdown Toggle"
       isFocused={true}
@@ -287,6 +311,9 @@ exports[`state hover 1`] = `
   <Toggle
     bubbleEvent={false}
     className=""
+    data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+    data-ouia-component-type="PF4/DropdownToggle"
+    data-ouia-safe={true}
     getMenuRef={null}
     id="Dropdown Toggle"
     isActive={false}
@@ -303,6 +330,9 @@ exports[`state hover 1`] = `
     <button
       aria-expanded={false}
       className="pf-c-dropdown__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe={true}
       disabled={false}
       id="Dropdown Toggle"
       isHovered={true}
diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggleCheckbox.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggleCheckbox.test.tsx.snap
index db5a15e23d3..09cfd3d5e08 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggleCheckbox.test.tsx.snap
+++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/DropdownToggleCheckbox.test.tsx.snap
@@ -9,6 +9,9 @@ exports[`3rd state 1`] = `
     aria-invalid={false}
     aria-label="check"
     checked={false}
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-5"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={false}
     id="check"
     onChange={[Function]}
@@ -26,6 +29,9 @@ exports[`controlled 1`] = `
     aria-invalid={false}
     aria-label="check"
     checked={true}
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-1"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={false}
     id="check"
     onChange={[Function]}
@@ -42,6 +48,9 @@ exports[`isDisabled 1`] = `
   <input
     aria-invalid={false}
     aria-label="check"
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-4"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={true}
     id="check"
     type="checkbox"
@@ -59,6 +68,9 @@ exports[`passing HTML attribute 1`] = `
     aria-label="check"
     aria-labelledby="labelId"
     checked={true}
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-7"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={false}
     id="check"
     label="label"
@@ -77,6 +89,9 @@ exports[`passing class 1`] = `
     aria-invalid={false}
     aria-label="check"
     checked={true}
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-6"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={false}
     id="check"
     label="label"
@@ -94,6 +109,9 @@ exports[`uncontrolled 1`] = `
   <input
     aria-invalid={false}
     aria-label="check"
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-2"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={false}
     id="check"
     type="checkbox"
@@ -109,6 +127,9 @@ exports[`with text 1`] = `
   <input
     aria-invalid={false}
     aria-label="check"
+    data-ouia-component-id="OUIA-Generated-DropdownToggleCheckbox-3"
+    data-ouia-component-type="PF4/DropdownToggleCheckbox"
+    data-ouia-safe={true}
     disabled={true}
     id="check"
     type="checkbox"
diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Toggle.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Toggle.test.tsx.snap
index 3c90e0f1b90..219b2e32c99 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Toggle.test.tsx.snap
+++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Toggle.test.tsx.snap
@@ -7,6 +7,9 @@ exports[`Dropdown toggle 1`] = `
   <Toggle
     bubbleEvent={false}
     className=""
+    data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+    data-ouia-component-type="PF4/DropdownToggle"
+    data-ouia-safe={true}
     getMenuRef={null}
     id="Dropdown Toggle"
     isActive={false}
@@ -22,6 +25,9 @@ exports[`Dropdown toggle 1`] = `
     <button
       aria-expanded={false}
       className="pf-c-dropdown__toggle"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+      data-ouia-component-type="PF4/DropdownToggle"
+      data-ouia-safe={true}
       disabled={false}
       id="Dropdown Toggle"
       onClick={[Function]}
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
index 40e3ed2fbf5..650f0dfe582 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
@@ -124,6 +124,9 @@ exports[`optionsMenu expanded 1`] = `
                 aria-haspopup="listbox"
                 aria-label="Options menu"
                 class="pf-c-options-menu__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="expanded-toggle"
                 type="button"
               >
@@ -172,6 +175,9 @@ exports[`optionsMenu expanded 1`] = `
                     >
                       <button
                         class="pf-c-options-menu__menu-item"
+                        data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                        data-ouia-component-type="PF4/DropdownItem"
+                        data-ouia-safe="true"
                         tabindex="-1"
                         type="button"
                       >
@@ -184,6 +190,9 @@ exports[`optionsMenu expanded 1`] = `
                     >
                       <button
                         class="pf-c-options-menu__menu-item"
+                        data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                        data-ouia-component-type="PF4/DropdownItem"
+                        data-ouia-safe="true"
                         tabindex="-1"
                         type="button"
                       >
@@ -197,6 +206,9 @@ exports[`optionsMenu expanded 1`] = `
                       <button
                         aria-disabled="true"
                         class="pf-m-disabled pf-c-options-menu__menu-item"
+                        data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                        data-ouia-component-type="PF4/DropdownItem"
+                        data-ouia-safe="true"
                         disabled=""
                         tabindex="-1"
                         type="button"
@@ -210,6 +222,9 @@ exports[`optionsMenu expanded 1`] = `
                     >
                       <button
                         class="pf-c-options-menu__menu-item"
+                        data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                        data-ouia-component-type="PF4/DropdownItem"
+                        data-ouia-safe="true"
                         tabindex="-1"
                         type="button"
                       >
@@ -242,6 +257,9 @@ exports[`optionsMenu expanded 1`] = `
                     >
                       <button
                         class="pf-c-options-menu__menu-item"
+                        data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                        data-ouia-component-type="PF4/DropdownItem"
+                        data-ouia-safe="true"
                         tabindex="-1"
                         type="button"
                       >
@@ -254,6 +272,9 @@ exports[`optionsMenu expanded 1`] = `
                     >
                       <button
                         class="pf-c-options-menu__menu-item"
+                        data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                        data-ouia-component-type="PF4/DropdownItem"
+                        data-ouia-safe="true"
                         tabindex="-1"
                         type="button"
                       >
@@ -296,6 +317,9 @@ exports[`optionsMenu expanded 1`] = `
                   aria-haspopup="listbox"
                   aria-label="Options menu"
                   class="pf-c-options-menu__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="expanded-toggle"
                   type="button"
                 >
@@ -344,6 +368,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           class="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe="true"
                           tabindex="-1"
                           type="button"
                         >
@@ -356,6 +383,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           class="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe="true"
                           tabindex="-1"
                           type="button"
                         >
@@ -369,6 +399,9 @@ exports[`optionsMenu expanded 1`] = `
                         <button
                           aria-disabled="true"
                           class="pf-m-disabled pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe="true"
                           disabled=""
                           tabindex="-1"
                           type="button"
@@ -382,6 +415,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           class="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe="true"
                           tabindex="-1"
                           type="button"
                         >
@@ -414,6 +450,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           class="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe="true"
                           tabindex="-1"
                           type="button"
                         >
@@ -426,6 +465,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           class="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe="true"
                           tabindex="-1"
                           type="button"
                         >
@@ -449,6 +491,9 @@ exports[`optionsMenu expanded 1`] = `
             aria-label="Options menu"
             bubbleEvent={false}
             className=""
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             getMenuRef={[Function]}
             id="expanded-toggle"
             isActive={false}
@@ -473,6 +518,9 @@ exports[`optionsMenu expanded 1`] = `
                     aria-haspopup="listbox"
                     aria-label="Options menu"
                     class="pf-c-options-menu__toggle"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe="true"
                     id="expanded-toggle"
                     type="button"
                   >
@@ -521,6 +569,9 @@ exports[`optionsMenu expanded 1`] = `
                         >
                           <button
                             class="pf-c-options-menu__menu-item"
+                            data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                            data-ouia-component-type="PF4/DropdownItem"
+                            data-ouia-safe="true"
                             tabindex="-1"
                             type="button"
                           >
@@ -533,6 +584,9 @@ exports[`optionsMenu expanded 1`] = `
                         >
                           <button
                             class="pf-c-options-menu__menu-item"
+                            data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                            data-ouia-component-type="PF4/DropdownItem"
+                            data-ouia-safe="true"
                             tabindex="-1"
                             type="button"
                           >
@@ -546,6 +600,9 @@ exports[`optionsMenu expanded 1`] = `
                           <button
                             aria-disabled="true"
                             class="pf-m-disabled pf-c-options-menu__menu-item"
+                            data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                            data-ouia-component-type="PF4/DropdownItem"
+                            data-ouia-safe="true"
                             disabled=""
                             tabindex="-1"
                             type="button"
@@ -559,6 +616,9 @@ exports[`optionsMenu expanded 1`] = `
                         >
                           <button
                             class="pf-c-options-menu__menu-item"
+                            data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                            data-ouia-component-type="PF4/DropdownItem"
+                            data-ouia-safe="true"
                             tabindex="-1"
                             type="button"
                           >
@@ -591,6 +651,9 @@ exports[`optionsMenu expanded 1`] = `
                         >
                           <button
                             class="pf-c-options-menu__menu-item"
+                            data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                            data-ouia-component-type="PF4/DropdownItem"
+                            data-ouia-safe="true"
                             tabindex="-1"
                             type="button"
                           >
@@ -603,6 +666,9 @@ exports[`optionsMenu expanded 1`] = `
                         >
                           <button
                             class="pf-c-options-menu__menu-item"
+                            data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                            data-ouia-component-type="PF4/DropdownItem"
+                            data-ouia-safe="true"
                             tabindex="-1"
                             type="button"
                           >
@@ -625,6 +691,9 @@ exports[`optionsMenu expanded 1`] = `
               aria-haspopup="listbox"
               aria-label="Options menu"
               className="pf-c-options-menu__toggle"
+              data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+              data-ouia-component-type="PF4/DropdownToggle"
+              data-ouia-safe={true}
               disabled={false}
               id="expanded-toggle"
               onClick={[Function]}
@@ -719,6 +788,9 @@ exports[`optionsMenu expanded 1`] = `
                           "sendRef": [Function],
                         }
                       }
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe={true}
                       description={null}
                       enterTriggersArrowDown={false}
                       icon={null}
@@ -742,6 +814,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           className="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe={true}
                           disabled={false}
                           tabIndex={-1}
                           type="button"
@@ -769,6 +844,9 @@ exports[`optionsMenu expanded 1`] = `
                           "sendRef": [Function],
                         }
                       }
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe={true}
                       description={null}
                       enterTriggersArrowDown={false}
                       icon={null}
@@ -792,6 +870,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           className="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe={true}
                           disabled={false}
                           tabIndex={-1}
                           type="button"
@@ -823,6 +904,9 @@ exports[`optionsMenu expanded 1`] = `
                           "sendRef": [Function],
                         }
                       }
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe={true}
                       description={null}
                       enterTriggersArrowDown={false}
                       icon={null}
@@ -847,6 +931,9 @@ exports[`optionsMenu expanded 1`] = `
                         <button
                           aria-disabled={true}
                           className="pf-m-disabled pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-3"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe={true}
                           disabled={true}
                           tabIndex={-1}
                           type="button"
@@ -874,6 +961,9 @@ exports[`optionsMenu expanded 1`] = `
                           "sendRef": [Function],
                         }
                       }
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe={true}
                       description={null}
                       enterTriggersArrowDown={false}
                       icon={null}
@@ -897,6 +987,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           className="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-4"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe={true}
                           disabled={false}
                           tabIndex={-1}
                           type="button"
@@ -961,6 +1054,9 @@ exports[`optionsMenu expanded 1`] = `
                           "sendRef": [Function],
                         }
                       }
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe={true}
                       description={null}
                       enterTriggersArrowDown={false}
                       icon={null}
@@ -984,6 +1080,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           className="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-5"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe={true}
                           disabled={false}
                           tabIndex={-1}
                           type="button"
@@ -1011,6 +1110,9 @@ exports[`optionsMenu expanded 1`] = `
                           "sendRef": [Function],
                         }
                       }
+                      data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                      data-ouia-component-type="PF4/DropdownItem"
+                      data-ouia-safe={true}
                       description={null}
                       enterTriggersArrowDown={false}
                       icon={null}
@@ -1034,6 +1136,9 @@ exports[`optionsMenu expanded 1`] = `
                       >
                         <button
                           className="pf-c-options-menu__menu-item"
+                          data-ouia-component-id="OUIA-Generated-DropdownItem-6"
+                          data-ouia-component-type="PF4/DropdownItem"
+                          data-ouia-safe={true}
                           disabled={false}
                           tabIndex={-1}
                           type="button"
@@ -1191,6 +1296,9 @@ exports[`optionsMenu isDisabled 1`] = `
                 aria-haspopup="listbox"
                 aria-label="Options menu"
                 class="pf-c-options-menu__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 disabled=""
                 id="disabled-toggle"
                 type="button"
@@ -1245,6 +1353,9 @@ exports[`optionsMenu isDisabled 1`] = `
                   aria-haspopup="listbox"
                   aria-label="Options menu"
                   class="pf-c-options-menu__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   disabled=""
                   id="disabled-toggle"
                   type="button"
@@ -1280,6 +1391,9 @@ exports[`optionsMenu isDisabled 1`] = `
             aria-label="Options menu"
             bubbleEvent={false}
             className=""
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             getMenuRef={[Function]}
             id="disabled-toggle"
             isActive={false}
@@ -1304,6 +1418,9 @@ exports[`optionsMenu isDisabled 1`] = `
                     aria-haspopup="listbox"
                     aria-label="Options menu"
                     class="pf-c-options-menu__toggle"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe="true"
                     disabled=""
                     id="disabled-toggle"
                     type="button"
@@ -1338,6 +1455,9 @@ exports[`optionsMenu isDisabled 1`] = `
               aria-haspopup="listbox"
               aria-label="Options menu"
               className="pf-c-options-menu__toggle"
+              data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+              data-ouia-component-type="PF4/DropdownToggle"
+              data-ouia-safe={true}
               disabled={true}
               id="disabled-toggle"
               onClick={[Function]}
@@ -1508,6 +1628,9 @@ exports[`optionsMenu open up 1`] = `
                 aria-haspopup="listbox"
                 aria-label="Options menu"
                 class="pf-c-options-menu__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="openUp-toggle"
                 type="button"
               >
@@ -1561,6 +1684,9 @@ exports[`optionsMenu open up 1`] = `
                   aria-haspopup="listbox"
                   aria-label="Options menu"
                   class="pf-c-options-menu__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="openUp-toggle"
                   type="button"
                 >
@@ -1595,6 +1721,9 @@ exports[`optionsMenu open up 1`] = `
             aria-label="Options menu"
             bubbleEvent={false}
             className=""
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             getMenuRef={[Function]}
             id="openUp-toggle"
             isActive={false}
@@ -1619,6 +1748,9 @@ exports[`optionsMenu open up 1`] = `
                     aria-haspopup="listbox"
                     aria-label="Options menu"
                     class="pf-c-options-menu__toggle"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe="true"
                     id="openUp-toggle"
                     type="button"
                   >
@@ -1652,6 +1784,9 @@ exports[`optionsMenu open up 1`] = `
               aria-haspopup="listbox"
               aria-label="Options menu"
               className="pf-c-options-menu__toggle"
+              data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+              data-ouia-component-type="PF4/DropdownToggle"
+              data-ouia-safe={true}
               disabled={false}
               id="openUp-toggle"
               onClick={[Function]}
@@ -1822,6 +1957,9 @@ exports[`optionsMenu plain 1`] = `
                 aria-haspopup="listbox"
                 aria-label="Options menu"
                 class="pf-c-options-menu__toggle pf-m-plain"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="plain-toggle"
                 type="button"
               >
@@ -1856,6 +1994,9 @@ exports[`optionsMenu plain 1`] = `
                   aria-haspopup="listbox"
                   aria-label="Options menu"
                   class="pf-c-options-menu__toggle pf-m-plain"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="plain-toggle"
                   type="button"
                 >
@@ -1872,6 +2013,9 @@ exports[`optionsMenu plain 1`] = `
             aria-label="Options menu"
             bubbleEvent={false}
             className=""
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             getMenuRef={[Function]}
             id="plain-toggle"
             isActive={false}
@@ -1896,6 +2040,9 @@ exports[`optionsMenu plain 1`] = `
                     aria-haspopup="listbox"
                     aria-label="Options menu"
                     class="pf-c-options-menu__toggle pf-m-plain"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe="true"
                     id="plain-toggle"
                     type="button"
                   >
@@ -1910,6 +2057,9 @@ exports[`optionsMenu plain 1`] = `
               aria-haspopup="listbox"
               aria-label="Options menu"
               className="pf-c-options-menu__toggle pf-m-plain"
+              data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+              data-ouia-component-type="PF4/DropdownToggle"
+              data-ouia-safe={true}
               disabled={false}
               id="plain-toggle"
               onClick={[Function]}
@@ -2051,6 +2201,9 @@ exports[`optionsMenu regular 1`] = `
                 aria-haspopup="listbox"
                 aria-label="Options menu"
                 class="pf-c-options-menu__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="regular-toggle"
                 type="button"
               >
@@ -2104,6 +2257,9 @@ exports[`optionsMenu regular 1`] = `
                   aria-haspopup="listbox"
                   aria-label="Options menu"
                   class="pf-c-options-menu__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="regular-toggle"
                   type="button"
                 >
@@ -2138,6 +2294,9 @@ exports[`optionsMenu regular 1`] = `
             aria-label="Options menu"
             bubbleEvent={false}
             className=""
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             getMenuRef={[Function]}
             id="regular-toggle"
             isActive={false}
@@ -2162,6 +2321,9 @@ exports[`optionsMenu regular 1`] = `
                     aria-haspopup="listbox"
                     aria-label="Options menu"
                     class="pf-c-options-menu__toggle"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe="true"
                     id="regular-toggle"
                     type="button"
                   >
@@ -2195,6 +2357,9 @@ exports[`optionsMenu regular 1`] = `
               aria-haspopup="listbox"
               aria-label="Options menu"
               className="pf-c-options-menu__toggle"
+              data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+              data-ouia-component-type="PF4/DropdownToggle"
+              data-ouia-safe={true}
               disabled={false}
               id="regular-toggle"
               onClick={[Function]}
@@ -2366,6 +2531,9 @@ exports[`optionsMenu right aligned + open up 1`] = `
                 aria-haspopup="listbox"
                 aria-label="Options menu"
                 class="pf-c-options-menu__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="rightAlignedOpenUp-toggle"
                 type="button"
               >
@@ -2419,6 +2587,9 @@ exports[`optionsMenu right aligned + open up 1`] = `
                   aria-haspopup="listbox"
                   aria-label="Options menu"
                   class="pf-c-options-menu__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="rightAlignedOpenUp-toggle"
                   type="button"
                 >
@@ -2453,6 +2624,9 @@ exports[`optionsMenu right aligned + open up 1`] = `
             aria-label="Options menu"
             bubbleEvent={false}
             className=""
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             getMenuRef={[Function]}
             id="rightAlignedOpenUp-toggle"
             isActive={false}
@@ -2477,6 +2651,9 @@ exports[`optionsMenu right aligned + open up 1`] = `
                     aria-haspopup="listbox"
                     aria-label="Options menu"
                     class="pf-c-options-menu__toggle"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe="true"
                     id="rightAlignedOpenUp-toggle"
                     type="button"
                   >
@@ -2510,6 +2687,9 @@ exports[`optionsMenu right aligned + open up 1`] = `
               aria-haspopup="listbox"
               aria-label="Options menu"
               className="pf-c-options-menu__toggle"
+              data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+              data-ouia-component-type="PF4/DropdownToggle"
+              data-ouia-safe={true}
               disabled={false}
               id="rightAlignedOpenUp-toggle"
               onClick={[Function]}
@@ -2680,6 +2860,9 @@ exports[`optionsMenu right aligned 1`] = `
                 aria-haspopup="listbox"
                 aria-label="Options menu"
                 class="pf-c-options-menu__toggle"
+                data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                data-ouia-component-type="PF4/DropdownToggle"
+                data-ouia-safe="true"
                 id="rightAligned-toggle"
                 type="button"
               >
@@ -2733,6 +2916,9 @@ exports[`optionsMenu right aligned 1`] = `
                   aria-haspopup="listbox"
                   aria-label="Options menu"
                   class="pf-c-options-menu__toggle"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe="true"
                   id="rightAligned-toggle"
                   type="button"
                 >
@@ -2767,6 +2953,9 @@ exports[`optionsMenu right aligned 1`] = `
             aria-label="Options menu"
             bubbleEvent={false}
             className=""
+            data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+            data-ouia-component-type="PF4/DropdownToggle"
+            data-ouia-safe={true}
             getMenuRef={[Function]}
             id="rightAligned-toggle"
             isActive={false}
@@ -2791,6 +2980,9 @@ exports[`optionsMenu right aligned 1`] = `
                     aria-haspopup="listbox"
                     aria-label="Options menu"
                     class="pf-c-options-menu__toggle"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe="true"
                     id="rightAligned-toggle"
                     type="button"
                   >
@@ -2824,6 +3016,9 @@ exports[`optionsMenu right aligned 1`] = `
               aria-haspopup="listbox"
               aria-label="Options menu"
               className="pf-c-options-menu__toggle"
+              data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+              data-ouia-component-type="PF4/DropdownToggle"
+              data-ouia-safe={true}
               disabled={false}
               id="rightAligned-toggle"
               onClick={[Function]}
diff --git a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
index 4d2c99fb86c..8deb40a1a57 100644
--- a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
@@ -245,6 +245,9 @@ exports[`component render custom pagination toggle 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-12"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-11"
                       type="button"
                     >
@@ -309,6 +312,9 @@ exports[`component render custom pagination toggle 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-12"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-11"
                           type="button"
                         >
@@ -339,6 +345,9 @@ exports[`component render custom pagination toggle 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-12"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-11"
                   isActive={false}
@@ -368,6 +377,9 @@ exports[`component render custom pagination toggle 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-12"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-11"
                             type="button"
                           >
@@ -398,6 +410,9 @@ exports[`component render custom pagination toggle 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-12"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-11"
                     onClick={[Function]}
@@ -887,6 +902,9 @@ exports[`component render custom perPageOptions 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-7"
                       type="button"
                     >
@@ -979,6 +997,9 @@ exports[`component render custom perPageOptions 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-7"
                           type="button"
                         >
@@ -1009,6 +1030,9 @@ exports[`component render custom perPageOptions 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-7"
                   isActive={false}
@@ -1049,6 +1073,9 @@ exports[`component render custom perPageOptions 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-7"
                             type="button"
                           >
@@ -1079,6 +1106,9 @@ exports[`component render custom perPageOptions 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-7"
                     onClick={[Function]}
@@ -1628,6 +1658,9 @@ exports[`component render custom start end 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-10"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-9"
                       type="button"
                     >
@@ -1720,6 +1753,9 @@ exports[`component render custom start end 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-10"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-9"
                           type="button"
                         >
@@ -1750,6 +1786,9 @@ exports[`component render custom start end 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-10"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-9"
                   isActive={false}
@@ -1790,6 +1829,9 @@ exports[`component render custom start end 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-10"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-9"
                             type="button"
                           >
@@ -1820,6 +1862,9 @@ exports[`component render custom start end 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-10"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-9"
                     onClick={[Function]}
@@ -2782,6 +2827,9 @@ exports[`component render last page 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-6"
                       type="button"
                     >
@@ -2874,6 +2922,9 @@ exports[`component render last page 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-6"
                           type="button"
                         >
@@ -2904,6 +2955,9 @@ exports[`component render last page 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-6"
                   isActive={false}
@@ -2944,6 +2998,9 @@ exports[`component render last page 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-6"
                             type="button"
                           >
@@ -2974,6 +3031,9 @@ exports[`component render last page 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-6"
                     onClick={[Function]}
@@ -3523,6 +3583,9 @@ exports[`component render limited number of pages 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-4"
                       type="button"
                     >
@@ -3615,6 +3678,9 @@ exports[`component render limited number of pages 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-4"
                           type="button"
                         >
@@ -3645,6 +3711,9 @@ exports[`component render limited number of pages 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-4"
                   isActive={false}
@@ -3685,6 +3754,9 @@ exports[`component render limited number of pages 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-4"
                             type="button"
                           >
@@ -3715,6 +3787,9 @@ exports[`component render limited number of pages 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-5"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-4"
                     onClick={[Function]}
@@ -4266,6 +4341,9 @@ exports[`component render no items 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       disabled=""
                       id="pagination-options-menu-toggle-8"
                       type="button"
@@ -4359,6 +4437,9 @@ exports[`component render no items 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           disabled=""
                           id="pagination-options-menu-toggle-8"
                           type="button"
@@ -4390,6 +4471,9 @@ exports[`component render no items 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-8"
                   isActive={false}
@@ -4430,6 +4514,9 @@ exports[`component render no items 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             disabled=""
                             id="pagination-options-menu-toggle-8"
                             type="button"
@@ -4461,6 +4548,9 @@ exports[`component render no items 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-9"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={true}
                     id="pagination-options-menu-toggle-8"
                     onClick={[Function]}
@@ -4990,6 +5080,9 @@ exports[`component render should render correctly bottom 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-1"
                       type="button"
                     >
@@ -5082,6 +5175,9 @@ exports[`component render should render correctly bottom 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-1"
                           type="button"
                         >
@@ -5112,6 +5208,9 @@ exports[`component render should render correctly bottom 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-1"
                   isActive={false}
@@ -5152,6 +5251,9 @@ exports[`component render should render correctly bottom 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-1"
                             type="button"
                           >
@@ -5182,6 +5284,9 @@ exports[`component render should render correctly bottom 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-1"
                     onClick={[Function]}
@@ -5731,6 +5836,9 @@ exports[`component render should render correctly compact 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-2"
                       type="button"
                     >
@@ -5823,6 +5931,9 @@ exports[`component render should render correctly compact 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-2"
                           type="button"
                         >
@@ -5853,6 +5964,9 @@ exports[`component render should render correctly compact 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-2"
                   isActive={false}
@@ -5893,6 +6007,9 @@ exports[`component render should render correctly compact 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-2"
                             type="button"
                           >
@@ -5923,6 +6040,9 @@ exports[`component render should render correctly compact 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-3"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-2"
                     onClick={[Function]}
@@ -6352,6 +6472,9 @@ exports[`component render should render correctly disabled 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       disabled=""
                       id="pagination-options-menu-toggle-3"
                       type="button"
@@ -6445,6 +6568,9 @@ exports[`component render should render correctly disabled 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           disabled=""
                           id="pagination-options-menu-toggle-3"
                           type="button"
@@ -6476,6 +6602,9 @@ exports[`component render should render correctly disabled 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-3"
                   isActive={false}
@@ -6516,6 +6645,9 @@ exports[`component render should render correctly disabled 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             disabled=""
                             id="pagination-options-menu-toggle-3"
                             type="button"
@@ -6547,6 +6679,9 @@ exports[`component render should render correctly disabled 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-4"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={true}
                     id="pagination-options-menu-toggle-3"
                     onClick={[Function]}
@@ -7098,6 +7233,9 @@ exports[`component render should render correctly top 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-0"
                       type="button"
                     >
@@ -7190,6 +7328,9 @@ exports[`component render should render correctly top 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-0"
                           type="button"
                         >
@@ -7220,6 +7361,9 @@ exports[`component render should render correctly top 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-0"
                   isActive={false}
@@ -7260,6 +7404,9 @@ exports[`component render should render correctly top 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-0"
                             type="button"
                           >
@@ -7290,6 +7437,9 @@ exports[`component render should render correctly top 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-0"
                     onClick={[Function]}
@@ -7831,6 +7981,9 @@ exports[`component render titles 1`] = `
                       aria-expanded="false"
                       aria-label="Select"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-11"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-10"
                       type="button"
                     >
@@ -7924,6 +8077,9 @@ exports[`component render titles 1`] = `
                           aria-expanded="false"
                           aria-label="Select"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-11"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-10"
                           type="button"
                         >
@@ -7954,6 +8110,9 @@ exports[`component render titles 1`] = `
                   aria-label="Select"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-11"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-10"
                   isActive={false}
@@ -7994,6 +8153,9 @@ exports[`component render titles 1`] = `
                             aria-expanded="false"
                             aria-label="Select"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-11"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-10"
                             type="button"
                           >
@@ -8024,6 +8186,9 @@ exports[`component render titles 1`] = `
                     aria-expanded={false}
                     aria-label="Select"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-11"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-10"
                     onClick={[Function]}
@@ -8574,6 +8739,9 @@ exports[`component render up drop direction 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-13"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       id="pagination-options-menu-toggle-12"
                       type="button"
                     >
@@ -8666,6 +8834,9 @@ exports[`component render up drop direction 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-13"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           id="pagination-options-menu-toggle-12"
                           type="button"
                         >
@@ -8696,6 +8867,9 @@ exports[`component render up drop direction 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-13"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-12"
                   isActive={false}
@@ -8736,6 +8910,9 @@ exports[`component render up drop direction 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-13"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             id="pagination-options-menu-toggle-12"
                             type="button"
                           >
@@ -8766,6 +8943,9 @@ exports[`component render up drop direction 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-13"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={false}
                     id="pagination-options-menu-toggle-12"
                     onClick={[Function]}
@@ -9315,6 +9495,9 @@ exports[`component render zero results 1`] = `
                       aria-expanded="false"
                       aria-label="Items per page"
                       class="  pf-c-options-menu__toggle-button"
+                      data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                      data-ouia-component-type="PF4/DropdownToggle"
+                      data-ouia-safe="true"
                       disabled=""
                       id="pagination-options-menu-toggle-5"
                       type="button"
@@ -9408,6 +9591,9 @@ exports[`component render zero results 1`] = `
                           aria-expanded="false"
                           aria-label="Items per page"
                           class="  pf-c-options-menu__toggle-button"
+                          data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                          data-ouia-component-type="PF4/DropdownToggle"
+                          data-ouia-safe="true"
                           disabled=""
                           id="pagination-options-menu-toggle-5"
                           type="button"
@@ -9439,6 +9625,9 @@ exports[`component render zero results 1`] = `
                   aria-label="Items per page"
                   bubbleEvent={false}
                   className="pf-c-options-menu__toggle-button"
+                  data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                  data-ouia-component-type="PF4/DropdownToggle"
+                  data-ouia-safe={true}
                   getMenuRef={null}
                   id="pagination-options-menu-toggle-5"
                   isActive={false}
@@ -9479,6 +9668,9 @@ exports[`component render zero results 1`] = `
                             aria-expanded="false"
                             aria-label="Items per page"
                             class="  pf-c-options-menu__toggle-button"
+                            data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                            data-ouia-component-type="PF4/DropdownToggle"
+                            data-ouia-safe="true"
                             disabled=""
                             id="pagination-options-menu-toggle-5"
                             type="button"
@@ -9510,6 +9702,9 @@ exports[`component render zero results 1`] = `
                     aria-expanded={false}
                     aria-label="Items per page"
                     className="  pf-c-options-menu__toggle-button"
+                    data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
+                    data-ouia-component-type="PF4/DropdownToggle"
+                    data-ouia-safe={true}
                     disabled={true}
                     id="pagination-options-menu-toggle-5"
                     onClick={[Function]}