fix: merge main into dev (third attempt) to unblock PR #422 — MUST merge-commit#430
Merged
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>
# Conflicts: # .github/workflows/e2e.yaml # .github/workflows/prod_health_check.yaml # .github/workflows/pull.yaml # index.html # package-lock.json # src/components/maps/DataSourceMapSidebar.vue # src/pages/annotate/_components/Confirm.vue # src/pages/annotate/_components/RecordType.vue # src/pages/annotate/_components/URLType.vue # src/pages/annotate/_components/_agency/Agency.vue # src/pages/annotate/_components/_agency/SearchAgencyForm.vue # src/pages/annotate/_components/_header/Header.vue # src/pages/annotate/_components/_index/AnonWarning.vue # src/pages/annotate/_components/_index/Modal.vue # src/pages/annotate/_components/_index/Reminder.vue # src/pages/annotate/_components/_index/SupplementalInfo.vue # src/pages/annotate/_components/_index/TabControls.vue # src/pages/annotate/_components/_index/TabsHeader.vue # src/pages/annotate/_components/_location/Location.vue # src/pages/annotate/_components/_location/SearchLocationForm.vue # src/pages/annotate/_components/_location/types.ts # src/pages/annotate/_components/_name/EditableRadioGroup.vue # src/pages/annotate/_components/_name/Name.vue # src/pages/annotate/_components/_shared/AnnotationSpan.vue # src/pages/annotate/_components/_shared/RadioForm.vue # src/pages/annotate/_components/_shared/helpers.ts # src/pages/annotate/index.vue # src/pages/data-requests/_constants.js # src/pages/index.vue # src/pages/portals/_components/PortalTemplate.vue # src/pages/search/_data-fetchers.js # src/util/__tests__/locationFormatters.test.js # src/util/constants.js # src/util/locationFormatters.js
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
4 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
Third attempt at resolving the conflicts blocking PR #422.
PR #423 was squash-merged, dropping the merge ancestry. PR #428 was created to fix that and explicitly said "MUST use Create a merge commit — NOT squash, NOT rebase" — but it was also squash-merged, recreating the same problem. PR #422 still shows
mergeable_state: dirty.Verification of the root cause on current
dev:devHEADdfae4aahas one parent, not two — it's a squash, not a merge commitgit merge-base origin/main origin/dev=91c3730(January), not main's HEAD304c983This PR creates a true merge commit so the merge-base advances to main's HEAD.
MUST use "Create a merge commit" — NOT squash, NOT rebase.
Squashing or rebasing will flatten the merge ancestry and recreate the exact problem this PR exists to fix. This will be the third time it has happened if it happens again. If the "Create a merge commit" option isn't available on the merge button, enable it under repo Settings → General → Pull Requests before merging.
Conflict resolutions
Same strategy as PR #428 (28 conflicts, all the same files):
e2e.yaml,prod_health_check.yaml,pull.yaml): kept dev's Node 24_data-fetchers.js,locationFormatters.js,locationFormatters.test.js,constants.js,index.html,index.vue,DataSourceMapSidebar.vue,PortalTemplate.vue: kept dev'sdata-requests/_constants.js: kept dev's (the olddata-request/_constants.jspath is already gone on dev)package-lock.json: kept dev's;package.jsonauto-merged to dev's content with no changes, so the lockfile is consistent (npm ciclean)Additionally reverted one auto-merge artifact:
.github/scripts/set-e2e-env.shhad v2 feature flag env vars re-introduced from main, but those flags were removed from dev in PR #426. Restored dev's version.Verification
dfae4aa(dev) and304c983(main)git merge-base origin/main HEAD==304c983(main's HEAD)npm cicleannpm run test:unit— 38/38 passingnpm run lint— cleanGenerated by Claude Code