task: implement a basic controller and client-server communication

Part of #1383

Author: php-coder

src/main/frontend/src/components/HideImageForm.js

@@ -20,8 +20,12 @@ class HideImageForm extends React.PureComponent {
 
 	handleChange(event) {
 		event.preventDefault();
+		const id = parseInt(event.target.value, 10);
+		if (isNaN(id)) {
+			return;
+		}
 		this.setState({
-			comment: event.target.value
+			imageId: id
 		});
 	}
 
@@ -34,45 +38,46 @@ class HideImageForm extends React.PureComponent {
 			validationErrors: []
 		});
 
-		axios.patch(
-			this.props.url, [
-				{
-					op: 'add',
-					path: '/comment',
-					value: this.state.imageId
-				}
-			],
+		axios.post(
+			this.props.url,
+			{
+				'action': 'HIDE',
+				'imageId': this.state.imageId
+			},
 			{
 				headers: {
 					[this.props.csrfHeaderName]: this.props.csrfTokenValue,
 					'Cache-Control': 'no-store'
 				},
-				validateStatus: status => {
+				validateStatus: (status) => {
 					return status == 204 || status == 400;
 				}
-			})
-			.then(response => {
-				const data = response.data;
+			}
+		).then(response => {
+			const data = response.data;
 
-				if (data.hasOwnProperty('fieldErrors')) {
-					const fieldErrors = [];
-					if (data.fieldErrors.value) {
-						fieldErrors.push(...data.fieldErrors.value);
-					}
-					this.setState({
-						isDisabled: false,
-						validationErrors: fieldErrors
-					});
-					return;
+			if (data.hasOwnProperty('fieldErrors')) {
+				const fieldErrors = [];
+				if (data.fieldErrors.action) {
+					fieldErrors.push(...data.fieldErrors.action);
 				}
+				if (data.fieldErrors.imageId) {
+					fieldErrors.push(...data.fieldErrors.imageId);
+				}
+				this.setState({
+					isDisabled: false,
+					validationErrors: fieldErrors
+				});
+				return;
+			}
 
-				// no need to reset the state as page will be reloaded
-				window.location.reload();
-			})
-			.catch(error => {
-				console.error(error);
-				this.setState({ isDisabled: false, hasServerError: true });
-			});
+			// no need to reset the state as page will be reloaded
+			window.location.reload();
+		})
+		.catch(error => {
+			console.error(error);
+			this.setState({ isDisabled: false, hasServerError: true });
+		});
 	}
 	render() {
 		return (
@@ -118,7 +123,7 @@ class HideImageFormView extends React.PureComponent {
 								<option value="">{ l10n['t_not_chosen'] || 'Not chosen' }</option>
 								{
 									this.props.imageIds.map(imageId =>
-										<option key={ imageId } value="{ imageId }">{ imageId }</option>
+										<option key={ imageId } value={ imageId }>{ imageId }</option>
 									)
 								}
 							</select>

src/main/java/ru/mystamps/web/feature/series/ModifySeriesImageForm.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2009-2021 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.feature.series;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class ModifySeriesImageForm {
+	
+	@NotNull
+	private ModifySeriesImageAction action;
+	
+	@NotNull
+	private Integer imageId;
+	
+	public enum ModifySeriesImageAction {
+		HIDE
+	}
+	
+}

src/main/java/ru/mystamps/web/feature/series/RestSeriesController.java

@@ -23,6 +23,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import ru.mystamps.web.support.spring.mvc.PatchRequest;
@@ -112,6 +113,21 @@ public ResponseEntity<Void> updateSeries(
 		return ResponseEntity.noContent().build();
 	}
 
+	@PostMapping(path = SeriesUrl.ADD_IMAGE_SERIES_PAGE)
+	public ResponseEntity<Void> modifySeriesImage(
+		@PathVariable("id") Integer seriesId,
+		@RequestBody @Valid ModifySeriesImageForm form,
+		HttpServletResponse response
+	) throws IOException {
+		
+		if (seriesId == null) {
+			response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		
+		return ResponseEntity.noContent().build();
+	}
+	
 	private static StampsCatalog extractCatalog(String path) {
 		// "/catalog_something" => "catalog" => "CATALOG"
 		String catalogName = StringUtils.substringBetween(path, "/", "_")

src/main/java/ru/mystamps/web/feature/series/SeriesController.java

@@ -23,6 +23,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Controller;
@@ -349,7 +350,11 @@ public String processImageWithImageUrl(
 	}
 
 	@SuppressWarnings("checkstyle:parameternumber")
-	@PostMapping(path = SeriesUrl.ADD_IMAGE_SERIES_PAGE, params = "!imageUrl")
+	@PostMapping(
+		path = SeriesUrl.ADD_IMAGE_SERIES_PAGE,
+		params = "!imageUrl",
+		consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE
+	)
 	public String processImage(
 		@Validated({
 			AddImageForm.RequireImageCheck.class,

src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java

@@ -32,7 +32,7 @@ public final class ResourceUrl {
 	public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
 
 	// MUST be updated when any of our resources were modified
-	public static final String RESOURCES_VERSION = "v0.4.5.4";
+	public static final String RESOURCES_VERSION = "v0.4.5.5";
 
 	// CheckStyle: ignore LineLength for next 17 lines
 	private static final String CATALOG_UTILS_JS      = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";

src/main/webapp/WEB-INF/views/series/info.html

@@ -917,6 +917,20 @@ <h5 th:text="#{t_add_info_who_selling_series}">Add info about selling/buying thi
 								data: {}
 							}
 						},
+						'/series/100/image': {
+							'failOnField': {
+								status: 400,
+								data: {
+									'fieldErrors': {
+										'imageId': [ 'Invalid image id' ]
+									}
+								}
+							},
+							'success': {
+								status: 204,
+								data: {}
+							}
+						},
 						'/series/sales/import': {
 							'failOnField': {
 								status: 400,
@@ -1344,7 +1358,7 @@ <h5 th:text="#{t_add_info_who_selling_series}">Add info about selling/buying thi
 		<script th:inline="javascript">
 			/*[+
 			var hideImageProps = {
-				'url': [[ '__@{${INFO_SERIES_PAGE}(id=${series.id})}__' ]],
+				'url': [[ '__@{${ADD_IMAGE_SERIES_PAGE}(id=${series.id})}__' ]],
 				'imageIds': [[ ${series.imageIds} ]],
 				'csrfHeaderName': [[ ${_csrf.headerName} ]],
 				'csrfTokenValue': [[ ${_csrf.token} ]],
@@ -1359,7 +1373,7 @@ <h5 th:text="#{t_add_info_who_selling_series}">Add info about selling/buying thi
 
 			/*[- */
 			var hideImageProps = {
-				'url': '/series/100',
+				'url': '/series/100/image',
 				'l10n': {},
 				'imageIds': [ 1 ]
 			};