Merge pull request #13823 from SORMAS-Foundation/bug/13750-gdpr-modal

Fixes #13750: GDPR modal not in foreground.

Author: KarnaiahPesula

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/VaadinUiUtil.java

@@ -57,6 +57,8 @@
 
 public final class VaadinUiUtil {
 
+	public static final String FRONT_ELEMENT_STYLE_NAME = "front-element";
+
 	private VaadinUiUtil() {
 		// Hide Utility Class Constructor
 	}
@@ -71,6 +73,20 @@ public static Window createPopupWindow() {
 		return window;
 	}
 
+	/**
+	 * Enforces the popup to be in front of other modals.
+	 * Internally uses CSS's z-index to make it work.
+	 * 
+	 * @return Window that will stay at front.
+	 */
+	public static Window createForegroundPopupWindow() {
+		Window popupWindow = createPopupWindow();
+
+		popupWindow.setStyleName(FRONT_ELEMENT_STYLE_NAME);
+
+		return popupWindow;
+	}
+
 	public static Window showSimplePopupWindow(String caption, String contentText) {
 		return showSimplePopupWindow(caption, contentText, ContentMode.TEXT, null);
 	}
@@ -640,7 +656,7 @@ public static void showWarningPopup(String message) {
 
 	public static void addGdprMessageOnClick(TextArea textArea) {
 		AtomicBoolean gdprMessageTriggered = new AtomicBoolean(false);
-		Window subWindowGdpR = VaadinUiUtil.createPopupWindow();
+		Window subWindowGdpR = createForegroundPopupWindow();
 
 		textArea.addFocusListener(i -> {
 			showGdprWindow(textArea, gdprMessageTriggered, subWindowGdpR);
@@ -655,12 +671,11 @@ public static void addGdprMessageOnClick(TextArea textArea) {
 
 	public static void addGdprMessageOnClick(RichTextArea richTextArea) {
 		AtomicBoolean gdprMessageTriggered = new AtomicBoolean(false);
-		Window subWindowGdpR = VaadinUiUtil.createPopupWindow();
+		Window subWindowGdpR = VaadinUiUtil.createForegroundPopupWindow();
 
 		richTextArea.addValueChangeListener(event -> {
 			if (!gdprMessageTriggered.get()) {
 				showGdprWindow(richTextArea, gdprMessageTriggered, subWindowGdpR);
-				subWindowGdpR.focus();
 				gdprMessageTriggered.set(true);
 			}
 		});
@@ -696,6 +711,7 @@ private static void showGdprWindow(AbstractField<?> textArea, AtomicBoolean gdpr
 			buttonLayout.setComponentAlignment(buttonGdpr, Alignment.BOTTOM_RIGHT);
 			buttonLayout.setExpandRatio(buttonGdpr, 0);
 			UI.getCurrent().addWindow(subWindowGdpR);
+			subWindowGdpR.focus();
 		}
 	}
 }

sormas-ui/src/main/webapp/VAADIN/themes/sormas/global.scss

@@ -534,4 +534,8 @@
   .underline {
     text-decoration: underline;
   }
+
+  .front-element {
+    z-index: 99999 !important;
+  }
 }