RaidBuilder/RaidBuilderWeb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Raid Instances showing up on calendar

Browse Source
This commit is contained in:
Mattrixwv
2025-03-15 18:37:57 -04:00
parent ea0018bae2
commit 0eeedf1e3b
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/calendar/RaidGroupCalendarLoader.tsx
View File

@@ -1,5 +1,5 @@
import DangerMessage from "@/components/message/DangerMessage";
import { useGetGameCalendar, useGetRaidGroupCalendar } from "@/hooks/CalendarHooks";
import { useGetGameCalendar, useGetRaidGroupCalendar, useGetRaidInstanceCalendarEvents } from "@/hooks/CalendarHooks";
import CalendarDisplay from "./CalendarDisplay";
@@ -12,6 +12,7 @@ export default function RaidGroupCalendarLoader({
}){
const gameCalendarQuery = useGetGameCalendar(gameId);
const raidGroupCalendarQuery = useGetRaidGroupCalendar(raidGroupId);
const raidInstanceCalendarQuery = useGetRaidInstanceCalendarEvents(raidGroupId);
if(raidGroupCalendarQuery.status === "error"){
@@ -20,7 +21,10 @@ export default function RaidGroupCalendarLoader({
else if(gameCalendarQuery.status === "error"){
return (<DangerMessage>Error {gameCalendarQuery.error.message}</DangerMessage>);
}
else if((raidGroupCalendarQuery.status === "pending") || (gameCalendarQuery.status === "pending")){
else if(raidInstanceCalendarQuery.status === "error"){
return (<DangerMessage>Error {raidInstanceCalendarQuery.error.message}</DangerMessage>);
}
else if((raidGroupCalendarQuery.status === "pending") || (gameCalendarQuery.status === "pending") || (raidInstanceCalendarQuery.status === "pending")){
return (
<div>
Loading...
@@ -31,7 +35,7 @@ export default function RaidGroupCalendarLoader({
return (
<CalendarDisplay
raidGroupId={raidGroupId}
calendarEvents={[...raidGroupCalendarQuery.data, ...gameCalendarQuery.data]}
calendarEvents={[...raidGroupCalendarQuery.data, ...gameCalendarQuery.data, ...raidInstanceCalendarQuery.data]}
/>
);
}