Skip to content

[bot] Fast-forward for 26.6.0#1157

Merged
github-actions[bot] merged 5 commits into
release26.6from
26.6_ff_bot_26.6.0
Jun 22, 2026
Merged

[bot] Fast-forward for 26.6.0#1157
github-actions[bot] merged 5 commits into
release26.6from
26.6_ff_bot_26.6.0

Conversation

@github-actions

Copy link
Copy Markdown

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.6_ff_bot_26.6.0

labkey-martyp and others added 5 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.
…vation/Score editor (#1145)

## Rationale

The bulk edit dialog for the clinical observations grid offered only a
plain text field for Observation/Score regardless of the selected
Category, while the grid's cell editor adapts that field to the
category's configured editor. This makes the bulk edit dialog offer the
same category-dependent editor as the grid, so the data type and options
match.

## Related Pull Requests

- LabKey/nircEHRModules#706

## Changes

- New `EHR.plugin.ClinicalObservationsBulkEdit` plugin that rebuilds the
Observation/Score field from the selected category's `editorconfig`,
preserving the field's enable/disable toggle state and re-registering it
with the databind plugin.
- `EHR.panel.BulkEditPanel` accepts panel plugins contributed via
`formConfig.bulkEditPlugins`, keeping the panel itself free of
observation-specific logic; the label click-to-toggle behavior is
extracted into a reusable `addLabelToggle` method.
- `EHR.grid.ClinicalObservationGridPanel` registers the new plugin
through its `formConfig`.
- The shared observation types store now tracks `hasLoadedOnce` so
consumers can distinguish a pending initial load from an empty result.
@github-actions github-actions Bot merged commit 6f09282 into release26.6 Jun 22, 2026
16 checks passed
@github-actions github-actions Bot deleted the 26.6_ff_bot_26.6.0 branch June 22, 2026 16:40
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