fix(region-admin): resolve stale merge markers in CreateCenterDialog.tsx - #7
Open
TheBoomerDev wants to merge 1 commit into
Open
fix(region-admin): resolve stale merge markers in CreateCenterDialog.tsx#7TheBoomerDev wants to merge 1 commit into
TheBoomerDev wants to merge 1 commit into
Conversation
…rge markers App.test.tsx fixture compilation crashed on esbuild's 'Unexpected <<' because src/components/region-admin/CreateCenterDialog.tsx:14-26 contained unresolved git merge-conflict markers from prior WIP. This single-file fix removes the 3 marker lines + the empty 'origin/main' branch and adopts the existing UserWithRegion interface in .filter()/.map() (previously Record<string, unknown>, which had TS errors hidden by the markers).
TheBoomerDev
force-pushed
the
chore/faseD-vitest-hygiene
branch
from
June 30, 2026 22:23
12945e1 to
b5d0d18
Compare
TheBoomerDev
changed the title
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
1 participant
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.
App.test.tsx fixture compilation was crashing on esbuild
Unexpected "<<"becausesrc/components/region-admin/CreateCenterDialog.tsxline 14-26 contained unresolved git merge-conflict markers from prior WIP. Same root cause hides two pre-existing TS errors (TS6196 + TS2339) that only surfaced once the markers stopped blocking tsc.Fix (single file, +12/-3)
origin/mainbranch.UserWithRegioninterface in BOTH.filter()and.map()callbacks (previously typed asRecord<string, unknown>).Validation on PR branch vs origin/main
npx tsc -b --noEmitnpx vitest run src/App.test.tsxOut of scope (deferred require source-feature co-landing)
ExerciseForm.test.tsx— jest→vi migration + latent test-logic fix.CreateUserDialog.test.tsx— tighter partial-mock cast.These reference source modules (
ExerciseForm.tsx,CreateUserDialog.tsx) not onorigin/mainyet. They land with their source-feature PRs or as a follow-up combined hygiene+source batch.PlatformPresets.test.tsx+SecurityMonitoringDashboard.export.test.tsxcleanup modernization — already modernized at HEAD, no PR change needed.