Skip to content

fix: preserve staging-only fixes before staging reset (#767, #768, #774)#836

Open
Kevin Loftus (kevin-loftus-dept) wants to merge 3 commits into
developmentfrom
fix/staging-only-preserved-fixes
Open

fix: preserve staging-only fixes before staging reset (#767, #768, #774)#836
Kevin Loftus (kevin-loftus-dept) wants to merge 3 commits into
developmentfrom
fix/staging-only-preserved-fixes

Conversation

@kevin-loftus-dept

Copy link
Copy Markdown
Contributor

Summary

These three fixes previously lived only on staging and were not present on development (nor main). staging is being reset to main so a hotfix can be tested, which would have dropped these commits. This PR cherry-picks them onto development so the work is preserved and flows back through the normal integration path.

Cherry-picked commits (original authorship retained):

Conflict resolutions

development had diverged from staging, so three merges were resolved manually:

  • orgs/index.vue — kept both dev's definePageMeta({ fullWidthContent: true }) and the Organization import.
  • EGDialog.vue — applied the break-words fix onto dev's current h2 / titleId heading line.
  • EGLabView.vue — kept both dev's usePageTitle block and the new redirectIfLabOrgMismatch / ensureLabInActiveOrg logic.

Test plan

  • Repo pre-commit suite (lint + 491 backend unit tests) passes on each cherry-picked commit locally.
  • Functional review of the org-switch flow (useSwitchOrganization, EGSwitchOrgModal, EGOrgsList) — development implements org switching differently, so confirm no regression.
  • Functional review of lab redirect on org mismatch (EGLabView, run/run-pipeline/run-workflow pages).
  • Verify dialog long-title wrapping renders as expected.

Made with Cursor

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.

2 participants