Skip to content

feat: Add a data conflict resolution modal#673

Open
mhlas7 wants to merge 1 commit into
johanohly:mainfrom
mhlas7:data-merge
Open

feat: Add a data conflict resolution modal#673
mhlas7 wants to merge 1 commit into
johanohly:mainfrom
mhlas7:data-merge

Conversation

@mhlas7

@mhlas7 mhlas7 commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

When AeroDataBox returns data that conflicts with the current values, open a merge conflict modal and ask the user which values they want to keep. If there are no conflicts, this modal will not display and values will be filled in maintaining the existing behavior.

Screenshot_20260717_083724 Screenshot_20260717_084942

Note

Add per-field conflict resolution modal for flight lookup results

  • Adds FlightMergeConflictModal.svelte, a modal that shows conflicting fields side-by-side (current vs. fetched) with bulk and per-field selection, defaulting to fetched values.
  • Adds merge-fields.ts with domain types and functions (buildMergeFieldStates, getFetchedSources, isConflict) to classify fields as conflicting, equal, or fetched-only.
  • Rewrites applyLookupResult in FlightNumber.svelte to auto-apply non-conflicting fetched values and show the modal only when conflicts exist.
  • Behavioral Change: the previous blanket confirm-and-overwrite prompt is removed; conflicting fields are now preserved unless the user explicitly selects the fetched value and clicks Apply.

Macroscope summarized 1d4fec6.

…alues, open a merge conflict modal and ask the user which values they want to keep
@github-actions github-actions Bot added the Web label Jul 17, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Label error. Requires exactly 1 of: changelog:.*. Found: Web

@sonarqubecloud

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant