Skip to content

[bot] Merge 26.7 to 26.9 (Conflicts) - #3188

Merged
github-actions[bot] merged 2 commits into
release26.9-SNAPSHOTfrom
26.9_fb_bot_merge_26.7
Sep 8, 2026
Merged

[bot] Merge 26.7 to 26.9 (Conflicts)#3188
github-actions[bot] merged 2 commits into
release26.9-SNAPSHOTfrom
26.9_fb_bot_merge_26.7

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 8, 2026

Copy link
Copy Markdown

Automatic merge failed! Please merge 26.7 into 26.9_fb_bot_merge_26.7 and resolve conflicts manually.

git fetch
git checkout 26.9_fb_bot_merge_26.7
git reset --hard origin/release26.9-SNAPSHOT
git merge a2651b78e0342328e3c43bc41a7bdcb795896614 -m "Merge 26.7 to 26.9"

Resolve all conflicts (using IntelliJ or git mergetool)

git commit
git push --force

Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.9_fb_bot_merge_26.7

…3183)

## Rationale
A single-jump Selenium drag can lift and drop having registered no
movement, so the reorder silently does nothing. Some of the changes in
this PR are already in develop due to previous test fixes.

## Related Pull Requests
- LabKey/platform#8015

## Changes
- `WebDriverWrapper.keyboardDragAndDrop(WebElement, int)` drives the
library's keyboard sensor instead of the mouse: Space to lift, one Arrow
per step, Space to drop.
- Overload taking a target element derives the step count from the two
handles' sibling indexes, so call sites read like the existing
`dragAndDrop(from, to)`.
- `FieldSelectionDialog.repositionField` delegates to the shared helper
instead of its own copy.
- `LoginConfigRow.getDragHandle()` exposes a row's drag handle. On the
authentication configuration page `dragHandleProps` sit on the row
wrapper rather than the visible `.domain-row-handle` icon, so the handle
is an ancestor of the row's component element.

<!-- list of standard tasks (remove this comment to enable)
## Tasks
- [ ] Claude Code Review
- [ ] Manual Testing
- [ ] Test Automation
- [ ] Verify Fix
-->
@DariaBod
DariaBod force-pushed the 26.9_fb_bot_merge_26.7 branch from f4d7551 to 1a12d43 Compare September 8, 2026 16:39
@github-actions
github-actions Bot merged commit 1a12d43 into release26.9-SNAPSHOT Sep 8, 2026
8 checks passed
@github-actions
github-actions Bot deleted the 26.9_fb_bot_merge_26.7 branch September 8, 2026 19:51
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