fix: resolve merge conflicts between dev and main#423
Merged
Conversation
dev to main week of march 17 2025
dev → main beta access param
Dev → Main July 2025
dev -> main -- resolve build issues
feat: dev to main, map and sidebar updates, e2e testing
feat: Dev to Main December 2025
* Begin draft of annotation logic * Continue draft * Update Draft * Begin incorporating typescript * Finish initial typescript setup * Add logic for submission * Rearrange and add comments for variables * Rearrange and add comments for computed variables * Rearrange and add comments for types * Rearrange and add comments for helpers * Rearrange and add comments for control logic * Rearrange and add comments for handlers * Rearrange and add comments for request logic * Add `Name` suffix to model variables * Add Confirm submit emit and variable reset functionality * Add fontAwesome icons * Add reset logic for Location, Agency, Record Type components * Refine reset logic * Correct attribute `name` -> `text` * Add key to img attribute * Add docstrings to modules * Update merge and lock * Refresh package lock * Fix typo Co-authored-by: Joshua D. Graber <68428039+joshuagraber@users.noreply.github.com> * Remove `Type` suffixes to types * Commit package-lock.json * Add logic for handling null `next_annotation` * Add console logs and handling for when no annotations found * Add auth logic * Adjust URL placement * Add warning for anonymous users * Adjust text size * Begin draft of contributions section * Incorporate PDAP Design System and refactor * Add Hints & Notes and Record Type Reference * Add URL Type descriptions and make formatting tweaks. * fix: december release regressions (#388) * fix: skip record-creating e2e tests in prod * fix: december release regressions * fix: stabilize e2e * fix: lint script * chore(deps): eslint missing a11y package * Revert "chore(deps): eslint missing a11y package" This reverts commit 1dec0e2. * Revert "fix: lint script" This reverts commit 220c9f1. * chore: eslint packages * fix: linting config --------- Co-authored-by: Josh <30379833+josh-chamberlain@users.noreply.github.com> * fix: lint and format fix * chore: migrate to plural route names keep redirects on the singulars for backward compat * Bug fixes, refactor, and mobile optimizations * Remove unused variable * Fix inexplicable `Select` text in typeaheads * Add mobile optimizations * feat: templatize portal (#395) * Add anonymous session persistence with cookies (#398) * Add bug fixes, cookies (#399) * Remove unused variable * Fix inexplicable `Select` text in typeaheads * Add mobile optimizations * Remove unnecessary style sections and inline single-use classes * Add cookie for saving session * Add migration logic and minor refinements * Add logic for cookie reminder and content warning * Change position of URL info to below screenshot * Solve bug with submission spinner not showing * chore(REVERT THIS): test dynamic transparency seal * Revert "chore(REVERT THIS): test dynamic transparency seal" This reverts commit 9453d98. * feat: collapsible footer (#401) * chore(deps): bump design-system (#403) * hide annotate nav link * fix: update favicon to production asset path (#402) * fix: skip record-creating e2e tests in prod * fix: update favicon paths to use production asset location Replace broken node_modules paths with working /assets/favicon.png path. The previous paths pointed to development dependencies that don't exist in production builds, causing the favicon to not display. - Remove: node_modules/pdap-design-system/*/favicon.png references - Remove: node_modules/pdap-design-system/*/webclip.gif reference - Add: /assets/favicon.png (verified to exist and work in production) Fixes favicon display issue on pdap.io production site. --------- Co-authored-by: Josh <30379833+josh-chamberlain@users.noreply.github.com> Co-authored-by: Joshua D. Graber <code+gh@joshuadgraber.com> * Revert "hide annotate nav link" This reverts commit 8c26af0. --------- Co-authored-by: Joshua D. Graber <68428039+joshuagraber@users.noreply.github.com> Co-authored-by: Josh <30379833+josh-chamberlain@users.noreply.github.com> Co-authored-by: Joshua D. Graber <code+gh@joshuadgraber.com> Co-authored-by: labradorite-dev <250898349+labradorite-dev@users.noreply.github.com>
Resolve 28 conflicts from merging main into dev: - CI workflows: keep dev's Node 24 and setup-node@v4 - Annotate components: keep dev's latest refined versions - DataSourceMapSidebar: take main's formatting fix for followStatusQueryEnabled - _data-fetchers: use main's .data?.data accessor for correct API response shape - locationFormatters: use main's fallback logic (display_name in default case, 'United States' fallback) - constants: use main's 'Annotate' nav link text - package-lock.json: regenerated from dev Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Corrects three conflict resolutions that incorrectly took main's versions: - _data-fetchers: use .data (not .data?.data) - constants: nav link text is 'Label' (not 'Annotate') - locationFormatters: restore display_name early return, use empty string fallback (not 'United States') Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
joshuagraber
approved these changes
Mar 10, 2026
maxachis
added a commit
that referenced
this pull request
Apr 13, 2026
Strategy matches PR #423: keep dev's versions for annotate components, workflows (Node 24), data-fetchers, locationFormatters, constants. Regenerate package-lock from dev's dependencies.
4 tasks
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
3 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.
Summary
Resolves the 28 merge conflicts blocking PR #422 (dev → main) by merging main into dev on a separate branch.
Conflict resolutions:
setup-node@v4followStatusQueryEnabledindentation_data-fetchers.js: kept dev's.dataaccessor (not main's.data?.data)locationFormatters.js: kept dev's version —display_nameearly return, empty string fallback (intentionally removed'United States'fallback)constants.js: kept dev's'Label'nav link textpackage-lock.json: regenerated from dev's dependenciesTest plan
_data-fetchers.jsandlocationFormatters.jschanges)🤖 Generated with Claude Code