Create new user account page refactor

CHANGELOG.md

@@ -2,6 +2,7 @@
 # Changelog
 
 ## [Unreleased]
+* [Developer/UI]: Refreshed the create new user account page. See [PR 1285](https://github.com/phac-nml/irida/pull/1285) for more.
 
 ## [22.05.1] - 2022/06/01
 * [UI]: Fixed bug where samples could not be removed from share page. See [PR 1296](https://github.com/phac-nml/irida/pull/1296) for more.

doc/_includes/tutorials/common/creating-a-user-account.md

@@ -2,7 +2,7 @@ Fill in the user details fields. All fields are required for a user account in I
 
 ![User details form.]({{ site.baseurl }}/images/tutorials/common/users/user-details-form.png)
 
-By default, a user will be issued a randomly-generated, one-time-use key to activate their account. The first time the user logs in, they will be required to change their password. You may manually enter a user password by unchecking "Require User Activation":
+By default, a user will be issued a randomly-generated, one-time-use key to activate their account. The first time the user logs in, they will be required to change their password. You may manually enter a user password by unchecking "Send Activation Email":
 
 ![Manual password entry.]({{ site.baseurl }}/images/tutorials/common/users/manual-user-password.png)
 
@@ -16,8 +16,8 @@ When you click "Create User", an e-mail will be sent to the user (to the e-mail
 
 ![User welcome e-mail.]({{ site.baseurl }}/images/tutorials/common/users/user-welcome-email.png)
 
-On successfully creating a new user account, you will see the user details that you entered:
+On successfully creating a new user account, you will be redirected back to the admin users table and see a successful notification pop-up:
 
-![User details page.]({{ site.baseurl }}/images/tutorials/common/users/user-details-page.png)
+![User details page.]({{ site.baseurl }}/images/tutorials/common/users/create-user-success.png)
 
 **Note**: Only announcements created within the last month will be shown to new users.

src/main/java/ca/corefacility/bioinformatics/irida/model/user/User.java

@@ -60,7 +60,8 @@ public class User extends IridaRepresentationModel implements MutableIridaThing,
 	// longer than 1024 (who's going to remember a password that long anyway?)
 	// to prevent DOS attacks on our password hashing.
 	@Size(min = 8, max = 1024, message = "{user.password.size}")
-	@Pattern.List({ @Pattern(regexp = "^.*[A-Z].*$", message = "{user.password.uppercase}"),
+	@Pattern.List({
+			@Pattern(regexp = "^.*[A-Z].*$", message = "{user.password.uppercase}"),
 			@Pattern(regexp = "^.*[0-9].*$", message = "{user.password.number}"),
 			@Pattern(regexp = "^.*[a-z].*$", message = "{user.password.lowercase}"),
 			@Pattern(regexp = "^.*[!@#$%^&*()+?/<>=.\\\\{}].*$", message = "{user.password.special}") })
@@ -74,7 +75,6 @@ public class User extends IridaRepresentationModel implements MutableIridaThing,
 	@Size(min = 2, message = "{user.lastName.size}")
 	private String lastName;
 
-	@NotNull(message = "{user.phoneNumber.notnull}")
 	@Size(min = 4, message = "{user.phoneNumber.size}")
 	private String phoneNumber;
 

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/exceptions/UIUserFormException.java

@@ -0,0 +1,19 @@
+package ca.corefacility.bioinformatics.irida.ria.web.exceptions;
+
+import java.util.Map;
+
+/**
+ * Exception to be thrown by the UI when a user cannot be created or updated.
+ */
+public class UIUserFormException extends Exception {
+	private final Map<String, String> errors;
+
+	public UIUserFormException(Map<String, String> errors) {
+		super("User Form Exception");
+		this.errors = errors;
+	}
+
+	public Map<String, String> getErrors() {
+		return this.errors;
+	}
+}

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/exceptions/UIUserStatusException.java

@@ -0,0 +1,10 @@
+package ca.corefacility.bioinformatics.irida.ria.web.exceptions;
+
+/**
+ * Exception to throw if there is an error updating the user status
+ */
+public class UIUserStatusException extends Exception {
+	public UIUserStatusException(String message) {
+		super(message);
+	}
+}

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/services/UISettingsService.java

@@ -9,6 +9,7 @@
 
 import ca.corefacility.bioinformatics.irida.config.services.IridaApiServicesConfig;
 import ca.corefacility.bioinformatics.irida.model.user.Role;
+import ca.corefacility.bioinformatics.irida.service.EmailController;
 
 import com.google.common.collect.ImmutableList;
 
@@ -17,14 +18,17 @@
  */
 @Component
 public class UISettingsService {
-	private final MessageSource messageSource;
 	private final List<Locale> locales;
+	private final EmailController emailController;
+	private final MessageSource messageSource;
 	private final List<Role> SYSTEM_ROLES = ImmutableList.of(Role.ROLE_ADMIN, Role.ROLE_MANAGER, Role.ROLE_USER,
 			Role.ROLE_TECHNICIAN, Role.ROLE_SEQUENCER);
 
-	public UISettingsService(IridaApiServicesConfig.IridaLocaleList locales, MessageSource messageSource) {
-		this.messageSource = messageSource;
+	public UISettingsService(IridaApiServicesConfig.IridaLocaleList locales, EmailController emailController,
+			MessageSource messageSource) {
 		this.locales = locales.getLocales();
+		this.emailController = emailController;
+		this.messageSource = messageSource;
 	}
 
 	/**
@@ -51,4 +55,13 @@ public List<ca.corefacility.bioinformatics.irida.ria.web.settings.dto.Role> getS
 						messageSource.getMessage("systemRole." + role.getName(), new Object[] {}, locale)))
 				.collect(Collectors.toList());
 	}
+
+	/**
+	 * Get if email is configured.
+	 *
+	 * @return if email is configured.
+	 */
+	public Boolean getEmailConfigured() {
+		return emailController.isMailConfigured();
+	}
 }