Skip to content

fix validation issues for status updates. #104

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
merged 1 commit into from
Apr 3, 2025
Merged

fix validation issues for status updates. #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/common/types/roomRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export enum RoomRequestStatus {

export const roomRequestStatusUpdateRequest = z.object({
status: z.nativeEnum(RoomRequestStatus),
notes: z.optional(z.string().min(1).max(1000)),
notes: z.string().min(1).max(1000),
});

export const roomRequestStatusUpdate = roomRequestStatusUpdateRequest.extend({
Expand Down
23 changes: 12 additions & 11 deletions src/ui/pages/roomRequest/ViewRoomRequest.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,23 @@ import {
roomRequestSchema,
RoomRequestStatus,
RoomRequestStatusUpdatePostBody,
roomRequestStatusUpdateRequest,
} from '@common/types/roomRequest';
import { useParams } from 'react-router-dom';
import { getStatusColor, getStatusIcon } from './roomRequestUtils';
import { formatStatus } from '@common/types/roomRequest';
import moment from 'moment-timezone';
import { useForm } from '@mantine/form';
import { useForm, zodResolver } from '@mantine/form';
import { notifications } from '@mantine/notifications';
import FullScreenLoader from '@ui/components/AuthContext/LoadingScreen';

export const ViewRoomRequest: React.FC = () => {
const { semesterId, requestId } = useParams();
const [data, setData] = useState<RoomRequestGetResponse | null>(null);
const [isSubmitting, setIsSubmitting] = useState(false);
const newStatusForm = useForm<{ status: RoomRequestStatus | null; notes?: string }>({
initialValues: { status: null },
validate: {
status: (value) =>
value && Object.keys(RoomRequestStatus).includes(value) ? null : 'Please select a status.',
notes: (value) =>
value && value.length <= 1000 ? null : 'Please limit your response to 1000 characters.',
},
const newStatusForm = useForm<{ status: RoomRequestStatus | null; notes: string }>({
initialValues: { status: null, notes: '' },
validate: zodResolver(roomRequestStatusUpdateRequest),
});
const handleStatusChange = async (payload: RoomRequestStatusUpdatePostBody) => {
await api.post(`/api/v1/roomRequests/${semesterId}/${requestId}/status`, payload);
Expand All @@ -57,6 +53,10 @@ export const ViewRoomRequest: React.FC = () => {
};
const submitStatusChange = async () => {
try {
newStatusForm.validate();
if (!newStatusForm.isValid()) {
return;
}
setIsSubmitting(true);
await handleStatusChange(newStatusForm.values as RoomRequestStatusUpdatePostBody);
notifications.show({
Expand Down Expand Up @@ -138,12 +138,13 @@ export const ViewRoomRequest: React.FC = () => {
{newStatusForm.values.status && (
<>
<Textarea
label="Event Description"
label="Status Message"
withAsterisk
description="Max 1000 characters."
placeholder="Provide any requisite details needed to use the room."
{...newStatusForm.getInputProps('notes')}
/>
<Button onClick={submitStatusChange} color="green">
<Button mt="md" onClick={submitStatusChange} color="green">
{isSubmitting ? (
<>
<Loader size={16} color="white" />
Expand Down
Loading