Skip to content

refactor: simplify internalization resource assignments - #484

Draft
nabalone wants to merge 2 commits into
developfrom
internalize_changes_part2
Draft

refactor: simplify internalization resource assignments#484
nabalone wants to merge 2 commits into
developfrom
internalize_changes_part2

Conversation

@nabalone

Copy link
Copy Markdown
Collaborator

Summary

  • centralize project resource assignment logic
  • simplify section selection data construction and update desktop/mobile artifact flows
  • add unit coverage for section rows and resource assignments

Test plan

  • Targeted internalization Jest tests pass
  • Renderer TypeScript check passes
  • GitHub automated checks pass

🤖 Generated with Claude Code

Made with Cursor

@gtryus
gtryus force-pushed the develop branch 2 times, most recently from 88b8855 to c2ddd39 Compare August 21, 2026 03:26
Automated conflict resolution by a scheduled Claude Code routine.
Resolved:
- src/renderer/src/components/PassageDetail/Internalization/SelectSections.tsx:
  kept this branch's `Checkbox` MUI import (develop dropped it because develop's
  version of the component no longer renders one; this branch's version does, in
  the passage-row cell). Also ported the two remaining button call sites onto
  develop's unified Button, which replaced AltButton/PriButton in the #537
  button overhaul: AltButton -> <Button>, PriButton -> <Button color="primary">,
  matching that PR's own conversion of every other cancel/confirm pair, and
  removed AltButton/PriButton from the control barrel import.
@nabalone

Copy link
Copy Markdown
Collaborator Author

Merged develop into this branch and resolved the conflict (automated scheduled routine, commit 8ac4f03).

Internalization/SelectSections.tsx — the conflict itself was the MUI import list: you added Checkbox, develop dropped it. Kept Checkbox, since your version of the component renders one in the passage-row cell (develop's version doesn't, which is why develop removed the import).

One thing worth flagging, since it wasn't a conflict marker but would have broken the build: develop's #537 button overhaul deleted AltButton and PriButton in favour of a unified Button, and git auto-merged your side of this file, which still used both. I ported the two call sites following that PR's own convention across all 144 files it touched — AltButton<Button>, PriButton<Button color="primary"> — and removed them from the control barrel import. The visual result comes from develop's new theme defaults (variant: 'contained', color: 'secondary'), so give the Cancel/Next row a look to confirm it reads the way you want.

npm run typecheck is clean apart from three pre-existing errors for gitignored local config this environment doesn't have (auth0-variables.json, buildDate.json). Prettier is clean. No tests run.


Generated by Claude Code

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant