Skip to content

Commit b7b803c

Browse files
committed
fix: user.admin errors and failing e2e tests
1 parent edcfe3c commit b7b803c

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

src/ui/components/Navbars/DashboardNavbarLinks.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const DashboardNavbarLinks: React.FC = () => {
2828
const [openProfile, setOpenProfile] = useState<HTMLElement | null>(null);
2929
const [, setAuth] = useState<boolean>(true);
3030
const [, setIsLoading] = useState<boolean>(true);
31-
const [errorMessage, setErrorMessage] = useState<string>('');
31+
const [, setErrorMessage] = useState<string>('');
3232
const [user, setUser] = useState<PublicUser | null>(null);
3333

3434
useEffect(() => {
@@ -67,7 +67,6 @@ const DashboardNavbarLinks: React.FC = () => {
6767

6868
return (
6969
<div>
70-
{errorMessage && <div className={classes.errorMessage}>{errorMessage}</div>}
7170
<div className={classes.manager}>
7271
<Button
7372
color={window.innerWidth > 959 ? 'transparent' : 'white'}

src/ui/views/RepoDetails/RepoDetails.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const RepoDetails: React.FC = () => {
101101
justifyContent='flex-end'
102102
alignItems='center'
103103
>
104-
{user.admin && (
104+
{user?.admin && (
105105
<Grid item>
106106
<Button
107107
variant='contained'
@@ -170,7 +170,7 @@ const RepoDetails: React.FC = () => {
170170
<h3>
171171
<Visibility /> Reviewers
172172
</h3>
173-
{user.admin && (
173+
{user?.admin && (
174174
<div style={{ textAlign: 'right' }}>
175175
<AddUser repoId={repoId || ''} type='authorise' refreshFn={refresh} />
176176
</div>
@@ -180,7 +180,7 @@ const RepoDetails: React.FC = () => {
180180
<TableHead>
181181
<TableRow>
182182
<TableCell align='left'>Username</TableCell>
183-
{user.admin && <TableCell align='right'></TableCell>}
183+
{user?.admin && <TableCell align='right'></TableCell>}
184184
</TableRow>
185185
</TableHead>
186186
<TableBody>
@@ -189,7 +189,7 @@ const RepoDetails: React.FC = () => {
189189
<TableCell align='left'>
190190
<UserLink username={username} />
191191
</TableCell>
192-
{user.admin && (
192+
{user?.admin && (
193193
<TableCell align='right' component='th' scope='row'>
194194
<Button
195195
variant='contained'
@@ -213,7 +213,7 @@ const RepoDetails: React.FC = () => {
213213
<h3>
214214
<Code /> Contributors
215215
</h3>
216-
{user.admin && (
216+
{user?.admin && (
217217
<div style={{ textAlign: 'right' }}>
218218
<AddUser repoId={repoId || ''} type='push' refreshFn={refresh} />
219219
</div>
@@ -223,7 +223,7 @@ const RepoDetails: React.FC = () => {
223223
<TableHead>
224224
<TableRow>
225225
<TableCell align='left'>Username</TableCell>
226-
{user.admin && <TableCell align='right'></TableCell>}
226+
{user?.admin && <TableCell align='right'></TableCell>}
227227
</TableRow>
228228
</TableHead>
229229
<TableBody>
@@ -232,7 +232,7 @@ const RepoDetails: React.FC = () => {
232232
<TableCell align='left'>
233233
<UserLink username={username} />
234234
</TableCell>
235-
{user.admin && (
235+
{user?.admin && (
236236
<TableCell align='right' component='th' scope='row'>
237237
<Button
238238
variant='contained'

src/ui/views/RepoList/Components/Repositories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export default function Repositories(): React.ReactElement {
117117
if (isLoading) return <div>Loading...</div>;
118118
if (isError) return <Danger>{errorMessage}</Danger>;
119119

120-
const addrepoButton = user.admin ? (
120+
const addrepoButton = user?.admin ? (
121121
<GridItem>
122122
<NewRepo onSuccess={refresh} />
123123
</GridItem>

src/ui/views/User/UserProfile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export default function UserProfile(): React.ReactElement {
139139
)}
140140
<GridItem xs={2} sm={2} md={2}>
141141
<FormLabel component='legend'>Administrator</FormLabel>
142-
{user.admin ? (
142+
{user?.admin ? (
143143
<span style={{ color: 'green' }}>
144144
<Check fontSize='small' />
145145
</span>

src/ui/views/UserList/Components/UserList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const UserList: React.FC = () => {
9191
</a>
9292
</TableCell>
9393
<TableCell align='left'>
94-
{user.admin ? (
94+
{user?.admin ? (
9595
<Check fontSize='small' color='primary' />
9696
) : (
9797
<CloseRounded color='error' />

0 commit comments

Comments
 (0)