-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
174 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,132 @@ | ||
| import { useEffect, useState } from "react"; | ||
| import { Spin } from "antd"; | ||
| import { Row, Col, Form, Input, Button, Spin } from "antd"; | ||
| import UserList from "./components/UserList" | ||
| import { ApiRoutes, GET_Responses, UserRole } from "../../@types/requests.d"; | ||
| import apiCall from "../../util/apiFetch"; | ||
| import { useTranslation } from "react-i18next"; | ||
| import { UsersListItem } from "./components/UserList"; | ||
|
|
||
| export type UsersType = GET_Responses[ApiRoutes.USERS] | ||
|
|
||
| const ProfileContent = () => { | ||
| const [users, setUsers] = useState<UsersType[] | null>(null); | ||
| const [users, setUsers] = useState<UsersType | null>(null); | ||
| const [searched, setSearched] = useState(false); | ||
| const [form] = Form.useForm(); | ||
| const { t } = useTranslation(); | ||
|
|
||
| function updateRole(user: UsersType, role: UserRole) { | ||
| //TODO: PUT of PATCH call | ||
| console.log("User: ", user); | ||
| console.log("Role: ", role); | ||
| if(!users) return; | ||
| const updatedUsers = users.map((u) => { | ||
| if (u.userId === user.userId) { | ||
| return { ...u, role: role }; | ||
| } | ||
| return u; | ||
| }); | ||
| setUsers(updatedUsers); | ||
| function updateRole(user: UsersListItem, role: UserRole) { | ||
| //here user is of type User (not UsersListItem), but it seems to work because the needed properties are named the same | ||
| console.log(user) | ||
| apiCall.patch(ApiRoutes.USER, {role: role}, {id: user.id}).then((res) => { | ||
| console.log(res.data); | ||
| //replace this user in the userlist with the updated one from res.data | ||
| const updatedUsers = users?.map((u) => { | ||
| if (u.id === user.id) { | ||
| return { ...u, role: res.data.role }; | ||
| } | ||
| return u; | ||
| }); | ||
| setUsers(updatedUsers?updatedUsers:null); | ||
| }) | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| //TODO: moet met GET call | ||
| /*apiCall.get(ApiRoutes.USERS).then((res) => { | ||
| console.log(res.data) | ||
| setUsers(res.data) | ||
| })*/ | ||
| setUsers([ | ||
| { | ||
| userId: 1, | ||
| name: "Alice Kornelis", | ||
| role: "student", | ||
| email: "[email protected]", | ||
| url: "test" | ||
| }, | ||
| { | ||
| userId: 2, | ||
| name: "Bob Kornelis", | ||
| role: "teacher", | ||
| email: "[email protected]", | ||
| url: "test" | ||
| }, | ||
| { | ||
| userId: 3, | ||
| name: "Charlie Kornelis", | ||
| role: "admin", | ||
| email: "[email protected]", | ||
| url: "test" | ||
| } | ||
| ]); | ||
| }, []); | ||
| const onSearch = (values: any) => { | ||
| setSearched(true); | ||
| setUsers(null); | ||
| //search operation here | ||
| const params = Object.entries(values) | ||
| .filter(([key, value]) => value !== undefined) | ||
| .reduce((obj, [key, value]) => ({ ...obj, [key]: value }), {}); | ||
| const queryString = Object.entries(params) | ||
| .map(([key, value]) => `${key}=${value}`) | ||
| .join('&'); | ||
| console.log(queryString); | ||
| apiCall.get(ApiRoutes.USERS,{params:queryString}).then((res) => { | ||
| console.log(res.data) | ||
| setUsers(res.data); | ||
| }) | ||
|
|
||
| }; | ||
|
|
||
| if (users === null) { | ||
| return ( | ||
| <div style={{ width: "100%", height: "100%", display: "flex", justifyContent: "center", alignItems: "center" }}> | ||
| <Spin | ||
| tip="Loading..." | ||
| size="large" | ||
| /> | ||
| </div> | ||
| ) | ||
| } | ||
| return ( | ||
| <div style={{padding: "3rem"}}> | ||
| <Form | ||
| form={form} | ||
| name="search" | ||
| onFinish={onSearch} | ||
| initialValues={{ remember: true }} | ||
| > | ||
| <Row gutter={24} justify="space-between"> | ||
| <Col span={7}> | ||
| <Form.Item | ||
| name="email" | ||
| rules={[ | ||
| { type: 'email', message: t("editRole.emailError") }, | ||
| ]} | ||
| > | ||
| <Input placeholder={t("editRole.email")} /> | ||
| </Form.Item> | ||
| </Col> | ||
|
|
||
| return ( | ||
| <div style={{padding: "3rem"}}> | ||
| <UserList users={users} updateRole={updateRole} /> | ||
| <Col span={7}> | ||
| <Form.Item | ||
| name="name" | ||
| rules={[ | ||
| { min: 3, message: t("editRole.nameError") }, | ||
| ]} | ||
| > | ||
| <Input placeholder={t("editRole.name")} /> | ||
| </Form.Item> | ||
| </Col> | ||
|
|
||
| <Col span={7}> | ||
| <Form.Item | ||
| name="surname" | ||
| rules={[ | ||
| { min: 3, message: t("editRole.surnameError") }, | ||
| ]} | ||
| > | ||
| <Input placeholder={t("editRole.surname")} /> | ||
| </Form.Item> | ||
| </Col> | ||
|
|
||
| <Col span={3}> | ||
| <Form.Item shouldUpdate> | ||
| {() => ( | ||
| <Button | ||
| type="primary" | ||
| htmlType="submit" | ||
| disabled={ | ||
| ['name', 'surname', 'email'].every(field => !form.getFieldValue(field)) || | ||
| form.getFieldsError().filter(({ errors }) => errors.length).length > 0 | ||
| } | ||
| style={{ width: '100%' }} | ||
| > | ||
| {t("editRole.search")} | ||
| </Button> | ||
| )} | ||
| </Form.Item> | ||
| </Col> | ||
| </Row> | ||
| </Form> | ||
| {searched ? ( | ||
| users === null ? ( | ||
| <div style={{ width: "100%", height: "100%", display: "flex", justifyContent: "center", alignItems: "center" }}> | ||
| <Spin | ||
| tip="Loading..." | ||
| size="large" | ||
| /> | ||
| </div> | ||
| ) : ( | ||
| <UserList users={users} updateRole={updateRole} /> | ||
| ) | ||
| ) : ( | ||
| <div style={{ textAlign: 'center', marginTop: '2rem' }}> | ||
| <p>{t("editRole.searchTutorial")}</p> | ||
| </div> | ||
| ); | ||
| )} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export function EditRole() { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters