Skip to content

Commit 8131f12

Browse files
committed
fix: missing error display
1 parent 88e79d4 commit 8131f12

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

src/ui/services/auth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getCookie } from '../utils.jsx';
1+
import { getCookie } from '../utils';
22

33
const baseUrl = import.meta.env.VITE_API_URI
44
? `${import.meta.env.VITE_API_URI}`

src/ui/services/user.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const getUsers = async (
4040
setIsLoading: SetStateCallback<boolean>,
4141
setData: SetStateCallback<UserData[]>,
4242
setAuth: SetStateCallback<boolean>,
43-
setIsError: SetStateCallback<boolean>,
4443
setErrorMessage: SetStateCallback<string>,
4544
query: Record<string, string> = {},
4645
): Promise<void> => {

src/ui/views/OpenPushRequests/components/PushesTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const PushesTable: React.FC<PushesTableProps> = (props) => {
4545
authorised: props.authorised ?? false,
4646
rejected: props.rejected ?? false,
4747
};
48-
getPushes(setIsLoading, setData, setAuth, setIsError, props.handlePushTableError, query);
48+
getPushes(setIsLoading, setData, setAuth, setIsError, props.handleError, query);
4949
}, [props]);
5050

5151
useEffect(() => {

src/ui/views/RepoDetails/Components/AddUser.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { addUser } from '../../../services/repo';
1717
import { getUsers } from '../../../services/user';
1818
import { PersonAdd } from '@material-ui/icons';
1919
import { UserData } from '../../../../types/models';
20+
import Danger from '../../../components/Typography/Danger';
2021

2122
interface AddUserDialogProps {
2223
repoName: string;
@@ -37,7 +38,7 @@ const AddUserDialog: React.FC<AddUserDialogProps> = ({
3738
const [data, setData] = useState<UserData[]>([]);
3839
const [, setAuth] = useState<boolean>(true);
3940
const [isLoading, setIsLoading] = useState<boolean>(false);
40-
const [isError, setIsError] = useState<boolean>(false);
41+
const [errorMessage, setErrorMessage] = useState<string>('');
4142
const [error, setError] = useState<string>('');
4243
const [tip, setTip] = useState<boolean>(false);
4344

@@ -76,10 +77,10 @@ const AddUserDialog: React.FC<AddUserDialogProps> = ({
7677
};
7778

7879
useEffect(() => {
79-
getUsers(setIsLoading, setData, setAuth, setIsError, setError, {});
80+
getUsers(setIsLoading, setData, setAuth, setErrorMessage, {});
8081
}, []);
8182

82-
if (isError) return <div>Something went wrong ...</div>;
83+
if (errorMessage) return <Danger>{errorMessage}</Danger>;
8384

8485
return (
8586
<>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const UserList: React.FC<UserListProps> = (props) => {
3030
const [data, setData] = useState<UserData[]>([]);
3131
const [, setAuth] = useState<boolean>(true);
3232
const [isLoading, setIsLoading] = useState<boolean>(false);
33-
const [isError, setIsError] = useState<boolean>(false);
3433
const [errorMessage, setErrorMessage] = useState<string>('');
3534
const navigate = useNavigate();
3635
const [currentPage, setCurrentPage] = useState<number>(1);
@@ -47,11 +46,11 @@ const UserList: React.FC<UserListProps> = (props) => {
4746
if (!k) continue;
4847
query[k] = props[k];
4948
}
50-
getUsers(setIsLoading, setData, setAuth, setIsError, setErrorMessage, query);
49+
getUsers(setIsLoading, setData, setAuth, setErrorMessage, query);
5150
}, [props]);
5251

5352
if (isLoading) return <div>Loading...</div>;
54-
if (isError) return <Danger>{errorMessage}</Danger>;
53+
if (errorMessage) return <Danger>{errorMessage}</Danger>;
5554

5655
const filteredUsers = data.filter(
5756
(user) =>

0 commit comments

Comments
 (0)