Skip to content

Commit

Permalink
upgrade tsc, refetch query on error banner close
Browse files Browse the repository at this point in the history
  • Loading branch information
ettorepuccetti committed Aug 6, 2023
1 parent e97332b commit 71c17ab
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 13 deletions.
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"pretty-quick": "^3.1.3",
"prisma": "^5.0.0",
"ts-node": "^10.9.1",
"typescript": "^4.9.5"
"typescript": "^5.1.6"
},
"ct3aMetadata": {
"initVersion": "7.7.0"
Expand Down
11 changes: 9 additions & 2 deletions src/components/Calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,21 +131,28 @@ export default function Calendar() {
{reservationAdd.error !== null && (
<ErrorAlert
error={reservationAdd.error}
onClose={() => reservationAdd.reset()}
onClose={() => {
reservationAdd.reset();
void reservationQuery.refetch();
}}
/>
)}

{reservationDelete.error !== null && (
<ErrorAlert
error={reservationDelete.error}
onClose={() => reservationDelete.reset()}
onClose={() => {
reservationDelete.reset();
void reservationQuery.refetch();
}}
/>
)}

<SpinnerPartial
open={
clubQuery.isLoading ||
reservationQuery.isLoading ||
reservationQuery.isRefetching ||
courtQuery.isLoading ||
reservationAdd.isLoading ||
reservationDelete.isLoading
Expand Down
4 changes: 3 additions & 1 deletion src/components/ReserveDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export default function ReserveDialog(props: ReserveDialogProps) {
const [overwriteName, setOverwriteName] = useState<string>(""); //cannot set to undefined because of controlled component
const { data: sessionData } = useSession();

// to set endDate to startDate + 1 hour, when component is mounted
useEffect(() => {
setEndDate((dayjs(startDate).add(1, "hour") as unknown as Date) ?? null);
}, [startDate]);
Expand All @@ -49,7 +50,8 @@ export default function ReserveDialog(props: ReserveDialogProps) {

props.onConfirm(
cleanedEndDate,
overwriteName !== "" ? overwriteName : undefined //manage overwriteName limitation about controlled component
//manage overwriteName limitation about controlled component
overwriteName !== "" ? overwriteName : undefined
);
setEndDate(null);
setOverwriteName("");
Expand Down
4 changes: 3 additions & 1 deletion src/server/api/routers/reservation-mutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ export const reservationMutationRouter = createTRPCRouter({
input.courtId
)
) {
throw new TRPCClientError("Error: Reservation collision");
throw new TRPCClientError(
"La tua prenotazione non puo' essere efettuata. Per favore, scegli un orario in cui il campo è libero"
);
}

// start date before end date
Expand Down

1 comment on commit 71c17ab

@vercel
Copy link

@vercel vercel bot commented on 71c17ab Aug 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.