From 3e64e8225a2da04f0aacce34615fa3f2a830066e Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Mon, 30 Nov 2020 11:49:24 -0500
Subject: [PATCH] Add ouiaIds to Select component

---
 awx/ui_next/src/components/Search/Search.jsx | 11 +++++++++--
 awx/ui_next/src/screens/Project/Project.jsx  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/components/Search/Search.jsx b/awx/ui_next/src/components/Search/Search.jsx
index 2e3d791a54..55d9209e69 100644
--- a/awx/ui_next/src/components/Search/Search.jsx
+++ b/awx/ui_next/src/components/Search/Search.jsx
@@ -160,7 +160,7 @@ function Search({
   const searchOptions = columns
     .filter(({ key }) => key !== searchKey)
     .map(({ key, name }) => (
-      <SelectOption key={key} value={name}>
+      <SelectOption key={key} value={name} id={`select-option-${key}`}>
         {name}
       </SelectOption>
     ));
@@ -177,6 +177,7 @@ function Search({
             onSelect={handleDropdownSelect}
             selections={searchColumnName}
             isOpen={isSearchDropdownOpen}
+            ouiaId="simple-key-select"
           >
             {searchOptions}
           </Select>
@@ -217,9 +218,14 @@ function Search({
                   })}
                   isOpen={isFilterDropdownOpen}
                   placeholderText={`Filter By ${name}`}
+                  ouiaId={`filter-by-${key}`}
                 >
                   {options.map(([optionKey, optionLabel]) => (
-                    <SelectOption key={optionKey} value={optionKey}>
+                    <SelectOption
+                      key={optionKey}
+                      value={optionKey}
+                      inputId={`select-option-${optionKey}`}
+                    >
                       {optionLabel}
                     </SelectOption>
                   ))}
@@ -234,6 +240,7 @@ function Search({
                 selections={chipsByKey[key].chips[0]?.label}
                 isOpen={isFilterDropdownOpen}
                 placeholderText={`Filter By ${name}`}
+                ouiaId={`filter-by-${key}`}
               >
                 <SelectOption key="true" value="true">
                   {booleanLabels.true || i18n._(t`Yes`)}
diff --git a/awx/ui_next/src/screens/Project/Project.jsx b/awx/ui_next/src/screens/Project/Project.jsx
index ce460d29aa..b215f0ee34 100644
--- a/awx/ui_next/src/screens/Project/Project.jsx
+++ b/awx/ui_next/src/screens/Project/Project.jsx
@@ -57,7 +57,7 @@ function Project({ i18n, setBreadcrumb }) {
 
   useEffect(() => {
     fetchProjectAndRoles();
-  }, [fetchProjectAndRoles]);
+  }, [fetchProjectAndRoles, location.pathname]);
 
   useEffect(() => {
     if (project) {