Skip to content

[bot] Merge 26.6 to develop#1153

Merged
github-actions[bot] merged 4 commits into
developfrom
fb_bot_merge_26.6
Jun 17, 2026
Merged

[bot] Merge 26.6 to develop#1153
github-actions[bot] merged 4 commits into
developfrom
fb_bot_merge_26.6

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Merging changes from: 4db6003
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=fb_bot_merge_26.6

labkey-martyp and others added 4 commits June 15, 2026 05:51
## Rationale

Submitting the EHR "Save As Template" dialog with every field unchecked
threw an uncaught `TypeError: Cannot read properties of undefined
(reading 'length')`. The checkboxgroup's `getValue().fields` is
`undefined` when nothing is selected, so reading `.length` crashed
`onSubmit` — the user got a silent failure (the template was never
saved) plus a console error, instead of any guidance.

## Related Pull Requests

None.

## Changes

- Guard the selected-field list before reading `.length`, so an empty
selection no longer throws.
- Evaluate the record-selector `'none'` case before the field check, so
a section the user intends to save is distinguished from one explicitly
excluded.
- When no fields are selected, show a clear validation message ("At
least one field is required and none are selected. Note: The field can
be blank.") instead of the generic "No records selected" alert.
…1147)

## Rationale

kinship2's QP-based alignment (align=TRUE) can fail with "constraints
are inconsistent, no solution!" on deep or looped pedigrees, which
aborts the entire Pedigree report so no image renders at all.

## Related Pull Requests

None.

## Changes

- Wrap the kinship2 `plot()` call in the Pedigree report in `tryCatch`,
retrying once with `align=FALSE` when the alignment error is detected so
the report still renders. Any other error is re-raised unchanged.
@github-actions github-actions Bot merged commit 26ae16d into develop Jun 17, 2026
6 of 11 checks passed
@github-actions github-actions Bot deleted the fb_bot_merge_26.6 branch June 17, 2026 21:53
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.

3 participants