Draft
Conversation
frozenhelium
force-pushed
the
feat/show-events
branch
6 times, most recently
from
b0519ff to
b07d421
Compare
frozenhelium
force-pushed
the
feat/show-events
branch
from
b07d421 to
ebb8470
Compare
tnagorra
reviewed
Apr 19, 2026
| showDialog | ||
| > | ||
| <App /> | ||
| <GoogleOAuthProvider clientId={import.meta.env.APP_GOOGLE_OAUTH_CLIENT_ID ?? ''}> |
Member
There was a problem hiding this comment.
Why not define the Provider in src/App/index.tsx?
| Day View | ||
| </h4> | ||
| <Checkbox | ||
| name="showEvents" |
Member
There was a problem hiding this comment.
Suggested change
| name="showEvents" | |
| name="eventsEnabled" |
Comment on lines
-228
to
-239
| useEffect( | ||
| () => { | ||
| if (calendarRef.current && selectedDate) { | ||
| const selectedDateObj = new Date(selectedDate); | ||
| calendarRef.current.resetView( | ||
| selectedDateObj.getFullYear(), | ||
| selectedDateObj.getMonth(), | ||
| ); | ||
| } | ||
| }, | ||
| [selectedDate], | ||
| ); |
Member
There was a problem hiding this comment.
Why remove calendarRef reset logic?
Comment on lines
+54
to
+55
| showEvents: boolean, | ||
| googleCalendarEnabled: boolean, |
Member
There was a problem hiding this comment.
Suggested change
| showEvents: boolean, | |
| googleCalendarEnabled: boolean, | |
| eventsShown: boolean, | |
| googleCalendarEventsShown: boolean, |
Comment on lines
+152
to
+154
| useEffect(() => { | ||
| onMonthChange?.(year, month); | ||
| }, [onMonthChange, year, month]); |
Comment on lines
+200
to
+226
| const dateInfoMap = useMemo(() => { | ||
| const map = new Map<string, DateInfo>(); | ||
|
|
||
| calendarDataResult.data?.private.hoursPerDay.forEach((entry) => { | ||
| const dateStr = String(entry.date); | ||
| map.set(dateStr, { | ||
| totalMinutes: entry.totalMinutes, | ||
| targetMinutes: entry.targetMinutes, | ||
| isHoliday: entry.isHoliday, | ||
| leaveType: entry.leaveType, | ||
| wfhType: entry.wfhType, | ||
| hasEvent: false, | ||
| }); | ||
| }); | ||
|
|
||
| calendarDataResult.data?.private.allProjects.forEach((project) => { | ||
| project.deadlines.forEach((deadline) => { | ||
| const dateStr = String(deadline.endDate); | ||
| const existing = map.get(dateStr) ?? {}; | ||
| map.set(dateStr, { ...existing, hasEvent: true }); | ||
| }); | ||
| }); | ||
|
|
||
| calendarDataResult.data?.private.events.items.forEach((event) => { | ||
| if (event.dates.length > 0) { | ||
| event.dates.forEach((d) => { | ||
| const dateStr = String(d); |
Member
There was a problem hiding this comment.
Let's use listToMap function instead.
| const isPast = date <= fullDate; | ||
| const targetMinutes = info?.targetMinutes ?? 0; | ||
| const totalMinutes = info?.totalMinutes ?? 0; | ||
| const fillPct = isPast && targetMinutes > 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Depends on: toggle-corp/timur-backend#86