Skip to content

refactor: calendar view #636

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
aaryan610 merged 1 commit into from
Mar 30, 2023
Merged

refactor: calendar view #636

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
90 changes: 33 additions & 57 deletions apps/app/components/core/calendar-view/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,21 @@ export const CalendarView = () => {
endDate: lastDayOfWeek(currentDate),
});

const targetDateFilter = {
target_date: `${renderDateFormat(calendarDateRange.startDate)};after,${renderDateFormat(
calendarDateRange.endDate
)};before`,
};

const { data: projectCalendarIssues } = useSWR(
workspaceSlug && projectId ? PROJECT_CALENDAR_ISSUES(projectId as string) : null,
workspaceSlug && projectId
? () =>
issuesService.getIssuesWithParams(workspaceSlug as string, projectId as string, {
target_date: `${renderDateFormat(calendarDateRange.startDate)};after,${renderDateFormat(
calendarDateRange.endDate
)};before`,
})
issuesService.getIssuesWithParams(
workspaceSlug as string,
projectId as string,
targetDateFilter
)
: null
);

Expand All @@ -89,11 +95,7 @@ export const CalendarView = () => {
workspaceSlug as string,
projectId as string,
cycleId as string,
{
target_date: `${renderDateFormat(
calendarDateRange.startDate
)};after,${renderDateFormat(calendarDateRange.endDate)};before`,
}
targetDateFilter
)
: null
);
Expand All @@ -108,11 +110,7 @@ export const CalendarView = () => {
workspaceSlug as string,
projectId as string,
moduleId as string,
{
target_date: `${renderDateFormat(
calendarDateRange.startDate
)};after,${renderDateFormat(calendarDateRange.endDate)};before`,
}
targetDateFilter
)
: null
);
Expand Down Expand Up @@ -166,48 +164,25 @@ export const CalendarView = () => {
if (!destination || !workspaceSlug || !projectId) return;
if (source.droppableId === destination.droppableId) return;

if (cycleId)
mutate<IIssue[]>(
CYCLE_CALENDAR_ISSUES(projectId as string, cycleId as string),
(prevData) =>
(prevData ?? []).map((p) => {
if (p.id === draggableId)
return {
...p,
target_date: destination.droppableId,
};
return p;
}),
false
);
else if (moduleId)
mutate<IIssue[]>(
MODULE_CALENDAR_ISSUES(projectId as string, moduleId as string),
(prevData) =>
(prevData ?? []).map((p) => {
if (p.id === draggableId)
return {
...p,
target_date: destination.droppableId,
};
return p;
}),
false
);
else
mutate<IIssue[]>(
PROJECT_CALENDAR_ISSUES(projectId as string),
(prevData) =>
(prevData ?? []).map((p) => {
if (p.id === draggableId)
return {
...p,
target_date: destination.droppableId,
};
return p;
}),
false
);
const fetchKey = cycleId
? CYCLE_CALENDAR_ISSUES(projectId as string, cycleId as string)
: moduleId
? MODULE_CALENDAR_ISSUES(projectId as string, moduleId as string)
: PROJECT_CALENDAR_ISSUES(projectId as string);

mutate<IIssue[]>(
fetchKey,
(prevData) =>
(prevData ?? []).map((p) => {
if (p.id === draggableId)
return {
...p,
target_date: destination.droppableId,
};
return p;
}),
false
);

issuesService.patchIssue(workspaceSlug as string, projectId as string, draggableId, {
target_date: destination?.droppableId,
Expand All @@ -216,6 +191,7 @@ export const CalendarView = () => {

const updateDate = (date: Date) => {
setCurrentDate(date);

setCalendarDateRange({
startDate: startOfWeek(date),
endDate: lastDayOfWeek(date),
Expand Down