Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit34f7992

Browse files
refactor: Remove user roles from dropdown (#4419)
1 parent257df81 commit34f7992

File tree

4 files changed

+7
-37
lines changed

4 files changed

+7
-37
lines changed

‎site/src/components/BorderedMenu/BorderedMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ const useStyles = makeStyles((theme) => ({
3434

3535
"&[data-variant='user-dropdown'] $paperRoot":{
3636
paddingBottom:theme.spacing(1),
37-
width:292,
37+
minWidth:292,
3838
},
3939
},
4040
paperRoot:{
41-
width:"292px",
41+
minWidth:292,
4242
border:`2px solid${theme.palette.secondary.dark}`,
4343
borderRadius:theme.shape.borderRadius,
4444
boxShadow:theme.shadows[6],

‎site/src/components/UserDropdown/UsersDropdown.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,10 @@ export const useStyles = makeStyles((theme) => ({
8585

8686
menuItem:{
8787
height:navHeight,
88-
padding:`${theme.spacing(1.5)}px 0px${theme.spacing(1.5)}px${theme.spacing(2.75)}px`,
88+
padding:theme.spacing(1.5,0),
8989

9090
"&:hover":{
91-
backgroundColor:theme.palette.action.hover,
92-
transition:"background-color 0.3s ease",
91+
backgroundColor:"transparent",
9392
},
9493
},
9594
}))

‎site/src/components/UserDropdownContent/UserDropdownContent.test.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{screen}from"@testing-library/react"
2-
import{MockOwnerRole,MockUser}from"../../testHelpers/entities"
2+
import{MockUser}from"../../testHelpers/entities"
33
import{render}from"../../testHelpers/renderHelpers"
44
import{Language,UserDropdownContent}from"./UserDropdownContent"
55

@@ -23,12 +23,6 @@ describe("UserDropdownContent", () => {
2323
expect(screen.getByText(Language.signOutLabel)).toBeDefined()
2424
})
2525

26-
it("displays the user's roles",()=>{
27-
render(<UserDropdownContentuser={MockUser}onSignOut={jest.fn()}onPopoverClose={jest.fn()}/>)
28-
29-
expect(screen.getByText(MockOwnerRole.display_name)).toBeDefined()
30-
})
31-
3226
it("has the correct link for the account item",()=>{
3327
render(<UserDropdownContentuser={MockUser}onSignOut={jest.fn()}onPopoverClose={jest.fn()}/>)
3428

‎site/src/components/UserDropdownContent/UserDropdownContent.tsx

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
importChipfrom"@material-ui/core/Chip"
21
importDividerfrom"@material-ui/core/Divider"
32
importListItemIconfrom"@material-ui/core/ListItemIcon"
43
importListItemTextfrom"@material-ui/core/ListItemText"
@@ -9,7 +8,6 @@ import AccountIcon from "@material-ui/icons/AccountCircleOutlined"
98
import{FC}from"react"
109
import{Link}from"react-router-dom"
1110
import*asTypesGenfrom"../../api/typesGenerated"
12-
import{Role}from"../../api/typesGenerated"
1311
import{navHeight}from"../../theme/constants"
1412
import{DocsIcon}from"../Icons/DocsIcon"
1513
import{LogoutIcon}from"../Icons/LogoutIcon"
@@ -46,13 +44,6 @@ export const UserDropdownContent: FC<UserDropdownContentProps> = ({
4644
</div>
4745
<TypographyclassName={styles.userName}>{user.username}</Typography>
4846
<TypographyclassName={styles.userEmail}>{user.email}</Typography>
49-
<ulclassName={styles.chipContainer}>
50-
{user.roles.map((role:Role)=>(
51-
<likey={role.name}className={styles.chipStyles}>
52-
<Chipclasses={{root:styles.chipRoot}}label={role.display_name}/>
53-
</li>
54-
))}
55-
</ul>
5647
</div>
5748

5849
<Divider/>
@@ -94,7 +85,7 @@ export const UserDropdownContent: FC<UserDropdownContentProps> = ({
9485

9586
constuseStyles=makeStyles((theme)=>({
9687
root:{
97-
paddingTop:theme.spacing(3),
88+
padding:theme.spacing(3,2),
9889
textAlign:"center",
9990
},
10091
avatarContainer:{
@@ -116,27 +107,13 @@ const useStyles = makeStyles((theme) => ({
116107
},
117108
userName:{
118109
fontSize:16,
119-
marginBottom:theme.spacing(0.5),
110+
marginTop:theme.spacing(1),
120111
},
121112
userEmail:{
122113
fontSize:14,
123114
letterSpacing:0.2,
124115
color:theme.palette.text.secondary,
125116
},
126-
chipContainer:{
127-
display:"flex",
128-
justifyContent:"center",
129-
flexWrap:"wrap",
130-
listStyle:"none",
131-
margin:"0",
132-
padding:`${theme.spacing(1.5)}px${theme.spacing(2.75)}px`,
133-
},
134-
chipStyles:{
135-
margin:theme.spacing(0.5),
136-
},
137-
chipRoot:{
138-
backgroundColor:theme.palette.secondary.dark,
139-
},
140117
link:{
141118
textDecoration:"none",
142119
color:"inherit",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp