Skip to content

Fix sample-type visibility and AST commit crash (#14018, #14156, #14124) #14166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roldy merged 2 commits into from
Jul 8, 2026
Merged

Fix sample-type visibility and AST commit crash (#14018, #14156, #14124) #14166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87d0496
Fix sample-type visibility and AST commit crash (#14018, #14156, #14124)
roldy Jul 7, 2026
280ba79
Adds simple comment as per PR review #14124
roldy Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ public enum SampleMaterial {
PLEURAL_FLUID,

// Re-activated for RSV new samples (#14023): the RSV specimen requirements list Nasopharyngeal lavage.
// No canonical SNOMED-CT code on the specimen sheet, so its SNOMED export stays null.
// No canonical SNOMED-CT code on the specimen sheet, so its SNOMED export stays null.
@Diseases(value = {
Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
NASOPHARYNGEAL_LAVAGE,
Expand All @@ -367,11 +367,10 @@ public enum SampleMaterial {
Disease.SHIGELLOSIS }, hide = true)
AMNIOTIC_FLUID,

@Diseases(value = {
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
Disease.GIARDIASIS }, hide = true)
// Clinical Sample (Other) is offered for every disease (#14018) — no @Diseases means "visible for all".
CLINICAL_SAMPLE,

// Lux hide lifted so Peritoneal fluid shows for IPI on Luxembourg servers (#14156).
@Diseases(value = {
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
Expand All @@ -381,8 +380,6 @@ public enum SampleMaterial {
Disease.MALARIA,
Disease.DENGUE,
Disease.SALMONELLOSIS }, hide = true)
@HideForCountries(countries = {
CountryHelper.COUNTRY_CODE_LUXEMBOURG })
PERITONEAL_FLUID,

@Diseases(value = {
Expand Down
1 change: 0 additions & 1 deletion sormas-ui/src/main/java/de/symeda/sormas/ui/samples/diseasesection/ImiSectionComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,4 @@ protected void unbindLegacyFields() {
drugSusceptibilityField = null;
}
}

}
11 changes: 11 additions & 0 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/DrugSusceptibilityForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,17 @@ public void markAsDirty() {
super.markAsDirty();
}

@Override
public void commit() {
// When no DrugSusceptibilityDto is bound (e.g. after a disease-section swap nulls it), the internal
// field group has no item datasource, so committing its always-bound drug fields would throw
// "Property amikacinMic not bound to datasource" (#14124). Nothing to write, so skip the commit.
if (getValue() == null) {
return;
}
super.commit();
}

public void forceUpdateDrugSusceptibilityFields() {
final DrugSusceptibilityDto drugSusceptibilityDto = getValue();
if (drugSusceptibilityDto == null) {
Expand Down
Loading