UY-1571 upgrade change status dialog

Author: ppiernik

console/src/main/java/io/imunity/console/views/directory_browser/identities/ChangeEntityStateDialog.java

@@ -4,20 +4,25 @@
  */
 package io.imunity.console.views.directory_browser.identities;
 
+import static io.imunity.vaadin.elements.CssClassNames.MEDIUM_VAADIN_FORM_ITEM_LABEL;
+
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.flow.component.checkbox.Checkbox;
+import com.vaadin.flow.component.confirmdialog.ConfirmDialog;
 import com.vaadin.flow.component.datetimepicker.DateTimePicker;
 import com.vaadin.flow.component.formlayout.FormLayout;
 import com.vaadin.flow.component.formlayout.FormLayout.FormItem;
+import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.select.Select;
 
 import io.imunity.console.views.directory_browser.EntityWithLabel;
 import io.imunity.vaadin.elements.DialogWithActionFooter;
+import io.imunity.vaadin.endpoint.common.api.HtmlTooltipFactory;
 import pl.edu.icm.unity.base.entity.EntityInformation;
 import pl.edu.icm.unity.base.entity.EntityScheduledOperation;
 import pl.edu.icm.unity.base.entity.EntityState;
@@ -28,6 +33,7 @@ class ChangeEntityStateDialog extends DialogWithActionFooter
 {
 	private static final Locale EUROPEAN_TIME_FORMAT = Locale.forLanguageTag("DE");
 
+	private final HtmlTooltipFactory htmlTooltipFactory;
 	private final MessageSource msg;
 	private final EntityWithLabel entity;
 	private final Callback callback;
@@ -37,14 +43,16 @@ class ChangeEntityStateDialog extends DialogWithActionFooter
 	private Select<EntityScheduledOperation> entityScheduledChange;
 	private DateTimePicker changeTime;
 	private DateTimePicker removalTime;
-	private FormLayout.FormItem changeTimeFormItem;
+	private FormItem changeTimeFormItem;
 
 	private FormItem removalFormItem;
 
-	ChangeEntityStateDialog(MessageSource msg, EntityWithLabel entity, Callback callback)
+	ChangeEntityStateDialog(MessageSource msg, HtmlTooltipFactory htmlTooltipFactory, EntityWithLabel entity,
+			Callback callback)
 	{
 		super(msg::getMessage);
 		this.msg = msg;
+		this.htmlTooltipFactory = htmlTooltipFactory;
 		this.entity = entity;
 		this.callback = callback;
 		setHeaderTitle(msg.getMessage("ChangeEntityStateDialog.caption"));
@@ -113,18 +121,16 @@ private FormLayout getContents()
 		});
 
 		FormLayout main = new FormLayout();
+		main.addClassName(MEDIUM_VAADIN_FORM_ITEM_LABEL.getName());
 		main.setResponsiveSteps(new FormLayout.ResponsiveStep("0", 1));
-		FormLayout embedded = new FormLayout();
-		embedded.setResponsiveSteps(new FormLayout.ResponsiveStep("0", 1));
-		embedded.addFormItem(entityScheduledChange, msg.getMessage("ChangeEntityStateDialog.scheduledOperation"));
-		changeTimeFormItem = embedded.addFormItem(changeTime,
-				msg.getMessage("ChangeEntityStateDialog.scheduledChangeTime"));
-		
 		main.addFormItem(entityState, msg.getMessage("ChangeEntityStateDialog.newState"));
-		removalFormItem = main.addFormItem(removalTime, msg.getMessage("ChangeEntityStateDialog.removalTime"));
+		removalFormItem = main.addFormItem(removalTime, msg.getMessage("ChangeEntityStateDialog.removalGracePeriodEnd"));
+		removalFormItem.add(htmlTooltipFactory.get(msg.getMessage("ChangeEntityStateDialog.removalGracePeriodEndDescription")));
 		removalFormItem.setVisible(false);
-		main.addFormItem(scheduleEnable, "");
-		main.addFormItem(embedded, "");
+		main.addFormItem(scheduleEnable, "");		
+		main.addFormItem(entityScheduledChange, msg.getMessage("ChangeEntityStateDialog.scheduledOperation"));
+		changeTimeFormItem = main.addFormItem(changeTime,
+				msg.getMessage("ChangeEntityStateDialog.scheduledChangeTime"));		
 		main.setSizeFull();
 
 
@@ -184,8 +190,23 @@ private void onConfirm()
 			newInfo.setScheduledOperationTime(zonedDate);
 		}
 
-		if (callback.onChanged(newInfo))
-			close();		
+		if (newInfo.getScheduledOperation() != null && newInfo.getRemovalByUserTime() != null)
+		{
+			ConfirmDialog confirm = new ConfirmDialog();
+			confirm.setConfirmButton(msg.getMessage("ok"), e ->
+			{
+				if (callback.onChanged(newInfo))
+					close();
+			});
+			confirm.setCancelable(true);
+			confirm.add(new Span(msg.getMessage("ChangeEntityStateDialog.warningScheduledChangeAndRemoval")));
+			confirm.open();
+
+		} else
+		{
+			if (callback.onChanged(newInfo))
+				close();
+		}
 	}
 
 	interface Callback 

console/src/main/java/io/imunity/console/views/directory_browser/identities/ChangeEntityStateHandler.java

@@ -13,6 +13,7 @@
 import io.imunity.console.views.directory_browser.EntityWithLabel;
 import io.imunity.vaadin.elements.NotificationPresenter;
 import io.imunity.vaadin.elements.grid.SingleActionHandler;
+import io.imunity.vaadin.endpoint.common.api.HtmlTooltipFactory;
 import pl.edu.icm.unity.base.entity.EntityInformation;
 import pl.edu.icm.unity.base.entity.EntityParam;
 import pl.edu.icm.unity.base.entity.EntityState;
@@ -25,13 +26,15 @@ class ChangeEntityStateHandler
 	private final EntityManagement identitiesMan;
 	private final MessageSource msg;
 	private final NotificationPresenter notificationPresenter;
-
+	private final HtmlTooltipFactory htmlTooltipFactory;
+	
 	ChangeEntityStateHandler(EntityManagement identitiesMan, MessageSource msg,
-			NotificationPresenter notificationPresenter)
+			NotificationPresenter notificationPresenter, HtmlTooltipFactory htmlTooltipFactory)
 	{
 		this.identitiesMan = identitiesMan;
 		this.msg = msg;
 		this.notificationPresenter = notificationPresenter;
+		this.htmlTooltipFactory = htmlTooltipFactory;
 	}
 
 	SingleActionHandler<IdentityEntry> getAction(Runnable refreshCallback)
@@ -47,7 +50,7 @@ SingleActionHandler<IdentityEntry> getAction(Runnable refreshCallback)
 	private void showDialog(Set<IdentityEntry> selection, Runnable refreshCallback)
 	{       
 		EntityWithLabel entity = selection.iterator().next().getSourceEntity();
-		new ChangeEntityStateDialog(msg, entity, newState -> 
+		new ChangeEntityStateDialog(msg, htmlTooltipFactory, entity, newState -> 
 			setEntityStatus(entity.getEntity().getId(), newState, refreshCallback)
 		).open();
 	}

console/src/main/resources/messages/console/messages.properties

@@ -1104,7 +1104,9 @@ ChangeEntityStateDialog.newState=New status:
 ChangeEntityStateDialog.enableScheduled=Schedule entity change in future
 ChangeEntityStateDialog.scheduledOperation=Scheduled operation:
 ChangeEntityStateDialog.scheduledChangeTime=Operation time:
-ChangeEntityStateDialog.removalTime=Removal time:
+ChangeEntityStateDialog.removalGracePeriodEnd=Removal grace period end:
+ChangeEntityStateDialog.removalGracePeriodEndDescription=This time is usually set by the user, when deleting own account. Entity will be removed after this time, unless user sings-in before. In such case the status of the entity will be reset to VALID.
+ChangeEntityStateDialog.warningScheduledChangeAndRemoval=Both user controlled account removal and admin-scheduled status change are set. Only the action with earlier time will be executed, unless user signs-in before this time.
 
 EntityCreation.caption=New entity creation
 EntityCreation.addToGroup=After creation add to group {0}
@@ -1324,7 +1326,7 @@ EntityScheduledOperation.DISABLE=Disable
 EntityState.valid=ENABLED
 EntityState.authenticationDisabled=LOGIN DISABLED
 EntityState.disabled=DISABLED
-EntityState.onlyLoginPermitted=DISABLED, ONLY LOGIN PERMITTED
+EntityState.onlyLoginPermitted=DISABLED, TO BE RMOVED
 
 IdentityDetails.entityDetailsCaption=Entity details
 IdentityDetails.id=Displayed name: