Merge pull request #13479 from SORMAS-Foundation/13466-error-when-opening-the-sample-directory-as-environmental-surveillance-user

Validating disease for environment samples

Author: obinna-h-n

sormas-backend/src/main/java/de/symeda/sormas/backend/customizableenum/CustomizableEnumFacadeEjb.java

@@ -277,7 +277,8 @@ private CustomizableEnumValueIndexDto toIndexDto(CustomizableEnumValue entity) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T extends CustomizableEnum> T getEnumValue(CustomizableEnumType type, Disease disease, String value) {
-		if (!enumValues.get(type).getOrDefault(disease, Collections.emptyList()).contains(value)) {
+		//As of today diseases are not applicable for environment.
+		if (disease!=null && !enumValues.get(type).getOrDefault(disease, Collections.emptyList()).contains(value)) {
 			throw new IllegalArgumentException(String.format("Invalid enum value %s for customizable enum type %s", value, type.toString()));
 		}
 
@@ -360,7 +361,8 @@ private <T extends CustomizableEnum> T buildCustomizableEnum(
 			T enumValue = enumClass.getDeclaredConstructor().newInstance();
 			enumValue.setValue(value);
 			enumValue.setCaption(enumValuesByLanguage.get(enumClass).get(language).get(value));
-			enumValue.setProperties(getEnumInfo(type, disease, value).getProperties());
+			// set the properties if the disease is not null, this disease check is happening in the getEnumInfo method
+			enumValue.setProperties(getEnumInfo(type, disease, value)!=null?getEnumInfo(type, disease, value).getProperties():null);
 			return enumValue;
 		} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
 			throw new RuntimeException(e);

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataView.java

@@ -254,11 +254,12 @@ protected void initView(String params) {
 			layout.addSidePanelComponent(new SideComponentLayout(specialAccessListComponent), SPECIAL_ACCESSES_LOC);
 		}
 
-		SelfReportListComponent selfReportListComponent =
-			new SelfReportListComponent(SelfReportType.CASE, new SelfReportCriteria().setCaze(new CaseReferenceDto(caze.getUuid())));
-		SelfReportListComponentLayout selfReportListComponentLayout = new SelfReportListComponentLayout(selfReportListComponent);
-		layout.addSidePanelComponent(selfReportListComponentLayout, SELF_REPORT_LOC);
-
+		if (UiUtil.permitted(FeatureType.SELF_REPORTING)) {
+			SelfReportListComponent selfReportListComponent =
+					new SelfReportListComponent(SelfReportType.CASE, new SelfReportCriteria().setCaze(new CaseReferenceDto(caze.getUuid())));
+			SelfReportListComponentLayout selfReportListComponentLayout = new SelfReportListComponentLayout(selfReportListComponent);
+			layout.addSidePanelComponent(selfReportListComponentLayout, SELF_REPORT_LOC);
+		}
 		if (UiUtil.permitted(FeatureType.SURVEYS)) {
 			SurveyListComponentLayout surveyList = new SurveyListComponentLayout(
 				caze.toReference(),