UY-1409, UY-1408 fixes

Author: ppiernik

vaadin23-elements/src/main/java/io/imunity/vaadin23/elements/NotificationPresenter.java

@@ -9,6 +9,7 @@
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.icon.Icon;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.Notification;
@@ -43,9 +44,8 @@ public void showError(String caption, String description)
 
 	public void showWarning(String caption, String description)
 	{
-		ErrorNotification errorNotification = new ErrorNotification(caption, description);
-		errorNotification.addThemeVariants(NotificationVariant.LUMO_CONTRAST);
-		errorNotification.open();
+		NoticeNotification warnNotification = new NoticeNotification(caption, description);
+		warnNotification.open();
 	}
 
 	private static class ErrorNotification extends Notification
@@ -74,4 +74,26 @@ private ErrorNotification(String header, String description)
 			setPosition(MIDDLE);
 		}
 	}
+	
+	private static class NoticeNotification extends Notification
+	{
+		private NoticeNotification(String header, String description)
+		{
+			Button closeButton = new Button(new Icon("lumo", "cross"));
+			closeButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
+			closeButton.getElement().setAttribute("aria-label", "Close");
+			closeButton.addClickListener(event -> close());
+
+			Span label = new Span(header);
+			label.getStyle().set("font-weight", "bold");
+			HorizontalLayout layout = new HorizontalLayout(
+					new VerticalLayout(label, new Text(description)),
+					closeButton
+			);
+			layout.setAlignItems(FlexComponent.Alignment.CENTER);
+
+			add(layout);
+			setPosition(MIDDLE);
+		}
+	}
 }

vaadin23-elements/src/main/java/io/imunity/vaadin23/elements/SubmitButton.java

@@ -7,18 +7,33 @@
 
 
 import com.vaadin.flow.component.Key;
+import com.vaadin.flow.component.ShortcutRegistration;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 
 import java.util.function.Function;
 
 public class SubmitButton extends Button
 {
+	private ShortcutRegistration enterShortcut;
+	
 	public SubmitButton(Function<String, String> messageGetter)
 	{
 		super(messageGetter.apply("OK"));
 		addClassName(Vaadin23ClassNames.SUBMIT_BUTTON.getName());
 		addThemeVariants(ButtonVariant.LUMO_PRIMARY);
-		addClickShortcut(Key.ENTER);
+		addEnterShortcut();	}
+	
+	public void addEnterShortcut()
+	{
+		enterShortcut = addClickShortcut(Key.ENTER);
+	}
+	
+	public void removeEnterShortcut()
+	{
+		if (enterShortcut != null)
+		{
+			enterShortcut.remove();
+		}
 	}
 }

web-upman/src/main/java/io/imunity/upman/front/views/invitations/InvitationForm.java

@@ -13,8 +13,10 @@
 import java.util.List;
 import java.util.Locale;
 
+import com.vaadin.flow.component.BlurNotifier.BlurEvent;
+import com.vaadin.flow.component.ComponentEventListener;
+import com.vaadin.flow.component.FocusNotifier.FocusEvent;
 import com.vaadin.flow.component.HtmlContainer;
-import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.datetimepicker.DateTimePicker;
 import com.vaadin.flow.component.formlayout.FormLayout;
@@ -52,7 +54,6 @@ public InvitationForm(MessageSource msg, ProjectGroup projectGroup, List<GroupTr
 		emailsTextArea.setPlaceholder(msg.getMessage("NewInvitationDialog.emailsPrompt"));
 		emailsTextArea.setWidth("24em");
 		emailsTextArea.focus();
-		emailsTextArea.addKeyPressListener(Key.ENTER, e -> emailsTextArea.setValue(emailsTextArea.getValue() + "\n"));
 		TooltipAttacher.attachTooltip(msg.getMessage("NewInvitationDialog.emailsDesc"), emailsTextArea, container);
 
 		allowModifyGroupsCheckbox = new Checkbox(msg.getMessage("NewInvitationDialog.allowModifyGroups"));
@@ -142,4 +143,14 @@ private void setLabels()
 		addFormItem(allowModifyGroupsCheckbox, "");
 		addFormItem(expirationDateTimePicker, new FormLayoutLabel(msg.getMessage("NewInvitationDialog.invitationLivetime")));
 	}
+	
+	void addEmailFieldFocusListener(ComponentEventListener<FocusEvent<TextArea>> listener)
+	{
+		emailsTextArea.addFocusListener(listener);
+	}
+	
+	void addEmailFieldBlurListener(ComponentEventListener<BlurEvent<TextArea>> listener)
+	{
+		emailsTextArea.addBlurListener(listener);
+	}
 }

web-upman/src/main/java/io/imunity/upman/front/views/invitations/InvitationsView.java

@@ -90,7 +90,7 @@ private Dialog createInvitationDialog()
 		InvitationForm invitationForm = new InvitationForm(msg, projectGroup, projectService.getProjectGroups(projectGroup).getAllOffspring(), getContent());
 		dialog.add(invitationForm);
 
-		Button saveButton = new SubmitButton(msg::getMessage);
+		SubmitButton saveButton = new SubmitButton(msg::getMessage);
 		saveButton.addClickListener(event ->
 		{
 			if(invitationForm.isValid())
@@ -100,7 +100,9 @@ private Dialog createInvitationDialog()
 				loadData();
 			}
 		});
-
+		invitationForm.addEmailFieldBlurListener(e -> saveButton.addEnterShortcut());
+		invitationForm.addEmailFieldFocusListener(e -> saveButton.removeEnterShortcut());
+		
 		dialog.getFooter().add(saveButton);
 		return dialog;
 	}