Skip to content

add uwa to user table uni field and check student number #1628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErikaKK merged 3 commits into from
Jul 31, 2025
Merged

add uwa to user table uni field and check student number #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5759e2
add uwa to user table uni field and check student number
ErikaKK Jul 30, 2025
e2271c3
add label for other university
ErikaKK Jul 30, 2025
9c4236f
simplify expression
ErikaKK Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/_components/clients/EditProfile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ const formSchema = z
message: "Student number is required",
path: ["student_number"],
})
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || student_number?.length === 8, {
message: "Student number must be 8 digits long",
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || /^\d{8}$/.test(student_number), {
message: "Student number must be 8 digits",
path: ["student_number"],
})
.refine(({ isUWA, uni = "" }) => Boolean(isUWA) || uni || uni === "other", {
Expand Down Expand Up @@ -146,7 +146,7 @@ const EditProfile = ({ setIsEditing, id, refetch }: EditProfileProps) => {
updateUser({
...data,
student_number: data.isUWA ? data.student_number : null,
uni: data.isUWA ? null : data.uni,
uni: data.isUWA ? "UWA" : data.uni,
}),

updateSocials({
Expand Down
5 changes: 3 additions & 2 deletions src/app/create-account/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ const formSchema = z
message: "Student number is required",
path: ["student_number"],
})
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || student_number.length === 8, {
message: "Student number must be 8 digits long",
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || /^\d{8}$/.test(student_number), {
message: "Student number must be 8 digits",
path: ["student_number"],
})
.refine(({ isUWA, uni = "" }) => Boolean(isUWA) || uni || uni === "other", {
Expand Down Expand Up @@ -151,6 +151,7 @@ export default function CreateAccount() {

if (values.isUWA) {
userData.student_number = values.student_number
userData.uni = "UWA"
} else {
userData.uni = values.uni
}
Expand Down
7 changes: 5 additions & 2 deletions src/app/dashboard/admin/@users/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ const formSchema = z
message: "Student number is required",
path: ["student_number"],
})
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || student_number.length === 8, {
message: "Student number must be 8 digits long",
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || /^\d{8}$/.test(student_number), {
message: "Student number must be 8 digits",
path: ["student_number"],
})
.refine(({ isUWA, uni = "" }) => Boolean(isUWA) || uni || uni === "other", {
Expand Down Expand Up @@ -99,6 +99,9 @@ const AddUserForm = () => {

const onSubmit = async (values: FormSchema) => {
if (process.env.NEXT_PUBLIC_VERCEL_ENV === "production") track("created-account")
if (values.isUWA) {
values.uni = "UWA"
}

// move to react hook form?
if (values.github !== "") {
Expand Down
11 changes: 9 additions & 2 deletions src/app/profile/[id]/profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,16 @@ interface ProfilePageProps {

const ProfilePage = ({ id, currentUser }: ProfilePageProps) => {
const [isEditing, setIsEditing] = useState(false)

const { data: user, refetch } = api.users.get.useQuery(id)
const universityLabel = user ? UNIVERSITIES.find((u) => u.value === user.university)?.label : undefined

let universityLabel: string | undefined
if (user?.student_number?.length) {
universityLabel = "University of Western Australia"
} else if (!UNIVERSITIES.find((u) => u.value === user?.university) && user?.university !== "UWA") {
universityLabel = user?.university || undefined
} else {
universityLabel = user ? UNIVERSITIES.find((u) => u.value === user.university)?.label : undefined
}

if (user) {
return (
Expand Down
6 changes: 3 additions & 3 deletions src/app/profile/settings/@personal/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ const formSchema = z
message: "Student number is required",
path: ["student_number"],
})
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || student_number?.length === 8, {
message: "Student number must be 8 digits long",
.refine(({ isUWA, student_number = "" }) => !Boolean(isUWA) || /^\d{8}$/.test(student_number), {
message: "Student number must be 8 digits",
path: ["student_number"],
})
.refine(({ isUWA, uni = "" }) => Boolean(isUWA) || uni || uni === "other", {
Expand Down Expand Up @@ -78,7 +78,7 @@ const PersonalForm = (props: { defaultValues?: Partial<FormSchema> }) => {
updateUser.mutate({
...data,
student_number: !data.isUWA ? null : data.student_number,
uni: data.isUWA ? null : data.uni,
uni: data.isUWA ? "UWA" : data.uni,
})
}

Expand Down