Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update user toggle to add mua #976

Merged
merged 2 commits into from
Sep 21, 2020
Merged

update user toggle to add mua #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b7915e
update user toggle to add mua
ryelo Sep 17, 2020
fd8cb1c
Merge branch 'master' into add-mua-menu
karelhala Sep 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/js/App/Header/HeaderTests/__snapshots__/UserToggle.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ exports[`ConnectedUserToggle -- not org admin should render correctly 1`] = `
My profile
</DropdownItem>,
<React.Fragment />,
<React.Fragment />,
<DropdownItem
component="button"
onClick={[Function]}
Expand Down Expand Up @@ -120,6 +121,7 @@ exports[`ConnectedUserToggle -- not org admin should render correctly 1`] = `
My profile
</DropdownItem>,
<React.Fragment />,
<React.Fragment />,
<DropdownItem
component="button"
onClick={[Function]}
Expand Down Expand Up @@ -438,6 +440,7 @@ exports[`ConnectedUserToggle -- org admin should render correctly 1`] = `
My profile
</DropdownItem>,
<React.Fragment />,
<React.Fragment />,
<DropdownItem
component="button"
onClick={[Function]}
Expand Down Expand Up @@ -504,6 +507,7 @@ exports[`ConnectedUserToggle -- org admin should render correctly 1`] = `
My profile
</DropdownItem>,
<React.Fragment />,
<React.Fragment />,
<DropdownItem
component="button"
onClick={[Function]}
Expand Down Expand Up @@ -789,6 +793,7 @@ exports[`UserToggle should render correctly with isSmall false 1`] = `
My profile
</DropdownItem>,
<React.Fragment />,
<React.Fragment />,
<DropdownItem
component="button"
onClick={[Function]}
Expand Down Expand Up @@ -848,6 +853,7 @@ exports[`UserToggle should render correctly with isSmall true 1`] = `
My profile
</DropdownItem>,
<React.Fragment />,
<React.Fragment />,
<DropdownItem
component="button"
onClick={[Function]}
Expand Down
9 changes: 9 additions & 0 deletions src/js/App/Header/UserToggle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ function buildItems(username, isOrgAdmin, accountNumber = -1, extraItems) {
rel='noopener noreferrer'>
My profile
</DropdownItem>,
<React.Fragment key="My user access wrapper">
{ accountNumber > -1 &&
<DropdownItem
key="My user access"
href="./settings/my-user-access">
My User Access
</DropdownItem>
}
</React.Fragment>,
<React.Fragment key="user prefs wrapper">
{ accountNumber > -1 &&
<DropdownItem
Expand Down