Merge pull request #760 from RedHatInsights/master

Remove beta flag on user preferences (#757) master-stable
RedHatInsights · Apr 17, 2020 · c554844 · c554844
2 parents e02b7aa + 957799e
commit c554844
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 8 deletions.
diff --git a/src/js/App/Header/HeaderTests/__snapshots__/UserToggle.test.js.snap b/src/js/App/Header/HeaderTests/__snapshots__/UserToggle.test.js.snap
@@ -58,6 +58,11 @@ exports[`ConnectedUserToggle -- not org admin should render correctly 1`] = `
             >
               My profile
             </DropdownItem>,
+            <DropdownItem
+              href="./user-preferences/email"
+            >
+              User preferences
+            </DropdownItem>,
             <DropdownItem
               component="button"
               onClick={[Function]}
@@ -114,6 +119,11 @@ exports[`ConnectedUserToggle -- not org admin should render correctly 1`] = `
               >
                 My profile
               </DropdownItem>,
+              <DropdownItem
+                href="./user-preferences/email"
+              >
+                User preferences
+              </DropdownItem>,
               <DropdownItem
                 component="button"
                 onClick={[Function]}
@@ -171,6 +181,11 @@ exports[`ConnectedUserToggle -- not org admin should render correctly 1`] = `
                   >
                     My profile
                   </DropdownItem>,
+                  <DropdownItem
+                    href="./user-preferences/email"
+                  >
+                    User preferences
+                  </DropdownItem>,
                   <DropdownItem
                     component="button"
                     onClick={[Function]}
@@ -229,6 +244,11 @@ exports[`ConnectedUserToggle -- not org admin should render correctly 1`] = `
                   >
                     My profile
                   </DropdownItem>,
+                  <DropdownItem
+                    href="./user-preferences/email"
+                  >
+                    User preferences
+                  </DropdownItem>,
                   <DropdownItem
                     component="button"
                     onClick={[Function]}
@@ -494,6 +514,11 @@ exports[`ConnectedUserToggle -- org admin should render correctly 1`] = `
             >
               My profile
             </DropdownItem>,
+            <DropdownItem
+              href="./user-preferences/email"
+            >
+              User preferences
+            </DropdownItem>,
             <DropdownItem
               component="button"
               onClick={[Function]}
@@ -557,6 +582,11 @@ exports[`ConnectedUserToggle -- org admin should render correctly 1`] = `
               >
                 My profile
               </DropdownItem>,
+              <DropdownItem
+                href="./user-preferences/email"
+              >
+                User preferences
+              </DropdownItem>,
               <DropdownItem
                 component="button"
                 onClick={[Function]}
@@ -621,6 +651,11 @@ exports[`ConnectedUserToggle -- org admin should render correctly 1`] = `
                   >
                     My profile
                   </DropdownItem>,
+                  <DropdownItem
+                    href="./user-preferences/email"
+                  >
+                    User preferences
+                  </DropdownItem>,
                   <DropdownItem
                     component="button"
                     onClick={[Function]}
@@ -686,6 +721,11 @@ exports[`ConnectedUserToggle -- org admin should render correctly 1`] = `
                   >
                     My profile
                   </DropdownItem>,
+                  <DropdownItem
+                    href="./user-preferences/email"
+                  >
+                    User preferences
+                  </DropdownItem>,
                   <DropdownItem
                     component="button"
                     onClick={[Function]}
@@ -916,6 +956,11 @@ exports[`UserToggle should render correctly with isSmall false 1`] = `
       >
         My profile
       </DropdownItem>,
+      <DropdownItem
+        href="./user-preferences/email"
+      >
+        User preferences
+      </DropdownItem>,
       <DropdownItem
         component="button"
         onClick={[Function]}
@@ -973,6 +1018,11 @@ exports[`UserToggle should render correctly with isSmall true 1`] = `
       >
         My profile
       </DropdownItem>,
+      <DropdownItem
+        href="./user-preferences/email"
+      >
+        User preferences
+      </DropdownItem>,
       <DropdownItem
         component="button"
         onClick={[Function]}

diff --git a/src/js/App/Header/UserToggle.js b/src/js/App/Header/UserToggle.js
@@ -44,14 +44,12 @@ function buildItems(username, isOrgAdmin, accountNumber = -1, extraItems) {
             rel='noopener noreferrer'>
                 My profile
         </DropdownItem>,
-        ...window.insights.chrome.isBeta() ? [
-            <DropdownItem
-                key="User preferences"
-                href="./user-preferences/email"
-            >
-                    User preferences
-            </DropdownItem>
-        ] : [],
+        <DropdownItem
+            key="User preferences"
+            href="./user-preferences/email"
+        >
+            User preferences
+        </DropdownItem>,
         <DropdownItem
             key="logout"
             component="button"