feat: Add a data conflict resolution modal#673
Open
mhlas7 wants to merge 1 commit into
Open
Conversation
…alues, open a merge conflict modal and ask the user which values they want to keep
Contributor
|
Label error. Requires exactly 1 of: changelog:.*. Found: Web |
|
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
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.



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.
Note
Add per-field conflict resolution modal for flight lookup results
buildMergeFieldStates,getFetchedSources,isConflict) to classify fields as conflicting, equal, or fetched-only.applyLookupResultin FlightNumber.svelte to auto-apply non-conflicting fetched values and show the modal only when conflicts exist.Macroscope summarized 1d4fec6.