/participant/add: try to auto-choose a group based on the provided url.

php-coder · php-coder · commit 7d31061256a0 · 2018-06-13T18:19:21.000+02:00
UX-related change.
diff --git a/src/main/java/ru/mystamps/web/Url.java b/src/main/java/ru/mystamps/web/Url.java
@@ -89,12 +89,13 @@ public final class Url {
 	public static final String ADD_SERIES_WITH_COUNTRY_PAGE   = "/series/add/country/{slug}";
 	
 	// MUST be updated when any of our resources were modified
-	public static final String RESOURCES_VERSION      = "v0.3.7";
+	public static final String RESOURCES_VERSION      = "v0.3.8";
 	
-	// CheckStyle: ignore LineLength for next 6 lines
+	// CheckStyle: ignore LineLength for next 7 lines
 	public static final String MAIN_CSS               = "/static/" + RESOURCES_VERSION + "/styles/main.min.css";
 	public static final String CATALOG_UTILS_JS       = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";    // NOPMD: AvoidDuplicateLiterals
 	public static final String DATE_UTILS_JS          = "/public/js/" + RESOURCES_VERSION + "/DateUtils.min.js";       // NOPMD: AvoidDuplicateLiterals
+	public static final String PARTICIPANT_ADD_JS     = "/public/js/" + RESOURCES_VERSION + "/participant/add.min.js"; // NOPMD: AvoidDuplicateLiterals
 	public static final String SERIES_ADD_JS          = "/public/js/" + RESOURCES_VERSION + "/series/add.min.js";      // NOPMD: AvoidDuplicateLiterals
 	public static final String SERIES_INFO_JS         = "/public/js/" + RESOURCES_VERSION + "/series/info.min.js";     // NOPMD: AvoidDuplicateLiterals
 	public static final String COLLECTION_INFO_JS     = "/public/js/" + RESOURCES_VERSION + "/collection/info.min.js"; // NOPMD: AvoidDuplicateLiterals
@@ -173,6 +174,7 @@ public static Map<String, String> asMap(boolean production) {
 			map.put("GET_IMAGE_PREVIEW_PAGE", GET_IMAGE_PREVIEW_PAGE);
 			map.put("JQUERY_JS", JQUERY_JS);
 			map.put("MAIN_CSS", MAIN_CSS);
+			map.put("PARTICIPANT_ADD_JS", PARTICIPANT_ADD_JS);
 			map.put("SELECTIZE_CSS", SELECTIZE_CSS);
 			map.put("SELECTIZE_JS", SELECTIZE_JS);
 			map.put("SERIES_ADD_JS", SERIES_ADD_JS);
@@ -187,6 +189,7 @@ public static Map<String, String> asMap(boolean production) {
 			map.put("GET_IMAGE_PAGE", STATIC_RESOURCES_URL + GET_IMAGE_PAGE);
 			map.put("GET_IMAGE_PREVIEW_PAGE", STATIC_RESOURCES_URL + GET_IMAGE_PREVIEW_PAGE);
 			map.put("MAIN_CSS", STATIC_RESOURCES_URL + MAIN_CSS);
+			map.put("PARTICIPANT_ADD_JS", STATIC_RESOURCES_URL + PARTICIPANT_ADD_JS);
 			map.put("SERIES_ADD_JS", STATIC_RESOURCES_URL + SERIES_ADD_JS);
 			map.put("SERIES_INFO_JS", STATIC_RESOURCES_URL + SERIES_INFO_JS);
 			
diff --git a/src/main/javascript/participant/add.js b/src/main/javascript/participant/add.js
@@ -0,0 +1,30 @@
+//
+// IMPORTANT:
+// You must update Url.RESOURCES_VERSION each time whenever you're modified this file!
+//
+
+function initPage() {
+	$('#url').on('change', function tryToSetParticipantGroup() {
+		var currentGroup = $('#group option:selected').val();
+		if (currentGroup != '') {
+			// don't change what has been selected already to prevent
+			// overwriting user's choice
+			return;
+		}
+		
+		try {
+			var url = new URL($(this).val());
+			var newGroupName = url.hostname.replace(/^www\./, '');
+			$('#group option')
+				.filter(function findGroupByName() {
+					return this.text.replace(/^www\./, '') == newGroupName;
+				})
+				.prop('selected', true);
+			
+		} catch (ignoredError) {
+			// if we aren't able to parse URL, it's a non-fatal error: maybe
+			// user provided an invalid URL? Anyway, user always can select
+			// group manually.
+		}
+	});
+}
diff --git a/src/main/webapp/WEB-INF/views/participant/add.html b/src/main/webapp/WEB-INF/views/participant/add.html
@@ -14,7 +14,7 @@
 		<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
 		<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
 	</head>
-	<body>
+	<body onload="initPage()">
 		<div class="container-fluid">
 			<div class="row" id="header">
 				<div id="logo" class="col-sm-9 vcenter">
@@ -118,7 +118,7 @@ <h3 th:text="${#strings.capitalize(header)}">
 									</option>
 									/*/-->
 									<!--/*-->
-									<option value="1">Musicians</option>
+									<option value="1">example.com</option>
 									<!--*/-->
 								</select>
 								<!--/*/
@@ -171,5 +171,6 @@ <h3 th:text="${#strings.capitalize(header)}">
 		<!-- Placed at the end of the document so the pages load faster -->
 		<script src="http://yandex.st/jquery/1.9.1/jquery.min.js" th:src="${JQUERY_JS}"></script>
 		<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" th:src="${BOOTSTRAP_JS}"></script>
+		<script src="../../../../javascript/participant/add.js" th:src="${PARTICIPANT_ADD_JS}"></script>
 	</body>
 </html>
