Merge pull request #13327 from SORMAS-Foundation/feature-13293-adapt_message_directory_ui

#13293 - Adapt ExternalMessage and Message Directory UI

Author: raulbob

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java

@@ -99,13 +99,13 @@ public ExternalMessageGrid(ExternalMessageCriteria criteria) {
 		addComponentColumn(this::buildDownloadButton).setId(COLUMN_DOWNLOAD).setSortable(false);
 
 		String[] columns = new String[] {
-			SHOW_MESSAGE,
-			ExternalMessageIndexDto.UUID };
+			SHOW_MESSAGE };
 		if (!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
-			columns = ArrayUtils.add(columns, ExternalMessageIndexDto.TYPE);
+			columns = ArrayUtils.add(columns, ExternalMessageIndexDto.UUID);
 		}
 		columns = ArrayUtils.addAll(
 			columns,
+			ExternalMessageIndexDto.TYPE,
 			ExternalMessageIndexDto.MESSAGE_DATE_TIME,
 			ExternalMessageIndexDto.REPORTER_NAME,
 			ExternalMessageIndexDto.REPORTER_POSTAL_CODE,
@@ -121,7 +121,9 @@ public ExternalMessageGrid(ExternalMessageCriteria criteria) {
 			COLUMN_DOWNLOAD);
 		setColumns(columns);
 
-		((Column<ExternalMessageIndexDto, String>) getColumn(ExternalMessageIndexDto.UUID)).setRenderer(new UuidRenderer());
+		if (!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
+			((Column<ExternalMessageIndexDto, String>) getColumn(ExternalMessageIndexDto.UUID)).setRenderer(new UuidRenderer());
+		}
 		((Column<ExternalMessageIndexDto, Date>) getColumn(ExternalMessageIndexDto.MESSAGE_DATE_TIME))
 			.setRenderer(new DateRenderer(DateHelper.getLocalDateTimeFormat(I18nProperties.getUserLanguage())));
 		((Column<ExternalMessageIndexDto, Date>) getColumn(ExternalMessageIndexDto.PERSON_BIRTH_DATE))

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGridFilterForm.java

@@ -99,10 +99,7 @@ protected void addFields() {
 		assignee.addItems(FacadeProvider.getUserFacade().getUsersByRegionAndRights(user.getRegion(), null, UserRight.EXTERNAL_MESSAGE_PROCESS));
 		assignee.setNullSelectionAllowed(true);
 
-		if (!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
-			addField(FieldConfiguration.pixelSized(ExternalMessageDto.TYPE, 140), ComboBox.class);
-		}
-
+		addField(FieldConfiguration.pixelSized(ExternalMessageDto.TYPE, 140), ComboBox.class);
 		addField(FieldConfiguration.pixelSized(ExternalMessageCriteria.DISEASE, 140));
 		addField(FieldConfiguration.pixelSized(CaseDataDto.DISEASE_VARIANT, 140), ComboBox.class);