Repository navigation
[KAN-675] fix(ui/voyage): align Voyage Lifecycle Control Center UI with Luxury Maritime design system #113
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.
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
huytran2005
merged 3 commits into
main
from
bugfix/KAN-675-voyage-luxury-maritime-design
Nov 15, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
770aeca
[KAN-675] fix(ui/voyage): align Voyage Lifecycle Control Center UI wi…
huytran2005 6affdbe
fix(ui/voyage): address CodeRabbit feedback on timezone persistence, …
huytran2005 e80ba19
Merge branch 'main' into bugfix/KAN-675-voyage-luxury-maritime-design
huytran2005 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keep the schedule fetch separate from the form-initialization guard.
The initialization effect cancels the schedule request whenever port, timezone, or offset changes. The guard then skips the replacement fetch. If a synchronization updates those fields while the initial request is pending,
loadingSchedulecan staytrue. The clock then shows "Synchronizing Clock..." until the modal is reopened.handleSyncSubmitdoes not clear that flag.Move the schedule fetch into its own effect. Key that effect on the open state and voyage number only. The form-initialization effect keeps its session guard and does not reset edited fields.
Suggested fix
setSchedule(null); setScheduleError(null); - - let cancelled = false; - const fetchSchedule = async () => { - try { - setLoadingSchedule(true); - const res = await voyageLifecycleService.getTimezoneSchedule(voyage.voyageNumber); - if (!cancelled && res) setSchedule(res); - } catch { - if (!cancelled) setScheduleError('Failed to load timezone schedule'); - } finally { - if (!cancelled) setLoadingSchedule(false); - } - }; - void fetchSchedule(); - return () => { - cancelled = true; - }; } return undefined; }, [ isOpen, voyage?.voyageNumber, voyage?.currentPortName, voyage?.currentTimezone, voyage?.vesselClockOffsetMinutes, ]); + + React.useEffect(() => { + if (!isOpen || !voyage) return undefined; + + let cancelled = false; + const fetchSchedule = async () => { + try { + setLoadingSchedule(true); + const res = await voyageLifecycleService.getTimezoneSchedule(voyage.voyageNumber); + if (!cancelled && res) setSchedule(res); + } catch { + if (!cancelled) setScheduleError('Failed to load timezone schedule'); + } finally { + if (!cancelled) setLoadingSchedule(false); + } + }; + void fetchSchedule(); + return () => { + cancelled = true; + }; + }, [isOpen, voyage?.voyageNumber]);