fix: preserve staging-only fixes before staging reset (#767, #768, #774)#836
Open
Kevin Loftus (kevin-loftus-dept) wants to merge 3 commits into
Open
fix: preserve staging-only fixes before staging reset (#767, #768, #774)#836Kevin Loftus (kevin-loftus-dept) wants to merge 3 commits into
Kevin Loftus (kevin-loftus-dept) wants to merge 3 commits into
Conversation
4 tasks
Ignacio Nistal (ignacionistal)
approved these changes
Jul 10, 2026
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
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
These three fixes previously lived only on
stagingand were not present ondevelopment(normain).stagingis being reset tomainso a hotfix can be tested, which would have dropped these commits. This PR cherry-picks them ontodevelopmentso the work is preserved and flows back through the normal integration path.Cherry-picked commits (original authorship retained):
fix: organizations table org switch with context(introducesuseSwitchOrganizationcomposable)fix: dialog component break word instead of all(break-all→break-wordsinEGDialog.vue)fix: redirect to correct laboratory when org changed(addsensure-lab-in-active-org.tsutil + call sites)Conflict resolutions
developmenthad diverged fromstaging, so three merges were resolved manually:orgs/index.vue— kept both dev'sdefinePageMeta({ fullWidthContent: true })and theOrganizationimport.EGDialog.vue— applied thebreak-wordsfix onto dev's currenth2/titleIdheading line.EGLabView.vue— kept both dev'susePageTitleblock and the newredirectIfLabOrgMismatch/ensureLabInActiveOrglogic.Test plan
useSwitchOrganization,EGSwitchOrgModal,EGOrgsList) —developmentimplements org switching differently, so confirm no regression.EGLabView, run/run-pipeline/run-workflow pages).Made with Cursor