Skip to content

Commit 02cba86

Browse files
feat: switch view and team dropdowns in header (#631)
* feat: switch view and team dropdowns in header * feat: fixed header dropdown width * feat: add styled select component for header --------- Co-authored-by: svcAPLBot <174728082+svcAPLBot@users.noreply.github.com>
1 parent 17a7352 commit 02cba86

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed

src/components/Header.tsx

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ const RootStyle = styled(AppBar, {
5353
},
5454
}))
5555

56+
const StyledSelect = styled(Select)(() => ({
57+
width: 120,
58+
minWidth: 120,
59+
'& .MuiSelect-select': {
60+
overflow: 'hidden',
61+
textOverflow: 'ellipsis',
62+
whiteSpace: 'nowrap',
63+
},
64+
}))
65+
5666
// ----------------------------------------------------------------------
5767

5868
export default function Header({ onOpenSidebar, isCollapse = false, verticalLayout = false }: Props) {
@@ -133,25 +143,10 @@ export default function Header({ onOpenSidebar, isCollapse = false, verticalLayo
133143
)}
134144
<Box sx={{ flexGrow: 1 }} />
135145
<Stack direction='row' alignItems='center' spacing={{ xs: 0.5, sm: 1.5 }}>
136-
{isPlatformAdmin && (
137-
<>
138-
<Typography>view:</Typography>
139-
<Select
140-
size='small'
141-
color='secondary'
142-
value={themeView}
143-
onChange={handleChangeView}
144-
data-cy='select-view'
145-
>
146-
<MenuItem value='platform'>platform</MenuItem>
147-
<MenuItem value='team'>team</MenuItem>
148-
</Select>
149-
</>
150-
)}
151146
{themeView === 'team' && (
152147
<>
153-
<Typography variant='body1'>team:</Typography>
154-
<Select
148+
<Typography variant='body1'>Team:</Typography>
149+
<StyledSelect
155150
size='small'
156151
color='secondary'
157152
value={(teams?.length && oboTeamId) || ''}
@@ -163,7 +158,22 @@ export default function Header({ onOpenSidebar, isCollapse = false, verticalLayo
163158
{teamName}
164159
</MenuItem>
165160
))}
166-
</Select>
161+
</StyledSelect>
162+
</>
163+
)}
164+
{isPlatformAdmin && (
165+
<>
166+
<Typography>View:</Typography>
167+
<StyledSelect
168+
size='small'
169+
color='secondary'
170+
value={themeView}
171+
onChange={handleChangeView}
172+
data-cy='select-view'
173+
>
174+
<MenuItem value='platform'>platform</MenuItem>
175+
<MenuItem value='team'>team</MenuItem>
176+
</StyledSelect>
167177
</>
168178
)}
169179
<AccountPopover email={email} />

0 commit comments

Comments
 (0)