task: rewrite AddCatalogNumbersForm to HTMX

Closes #1488

Part of #1671

Author: php-coder

src/main/frontend/src/components/AddCatalogNumbersForm.js

@@ -8,7 +8,6 @@ module.exports = {
         'utils/CatalogUtils':               './src/utils/CatalogUtils.js',
         'utils/DateUtils':                  './src/utils/DateUtils.js',
 
-        'components/AddCatalogNumbersForm': './src/components/AddCatalogNumbersForm.js',
         'components/AddCatalogPriceForm':   './src/components/AddCatalogPriceForm.js',
         'components/AddReleaseYearForm':    './src/components/AddReleaseYearForm.js',
         'components/HideImageForm':         './src/components/HideImageForm.js',

src/main/frontend/webpack.config.js

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2009-2025 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.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class AddCatalogNumbersForm {
+	@NotNull
+	private StampsCatalog catalogName;
+	
+	// @todo #1339 Update series: add validation for catalog numbers
+	@NotBlank
+	private String catalogNumbers;
+}

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

@@ -42,10 +42,15 @@ public class HtmxSeriesController {
 	private final SeriesService seriesService;
 
 	@InitBinder("addCommentForm")
-	protected void initBinder(WebDataBinder binder) {
+	protected void initBinderForComments(WebDataBinder binder) {
 		binder.registerCustomEditor(String.class, "comment", new StringTrimmerEditor(true));
 	}
 
+	@InitBinder("addCatalogNumbersForm")
+	protected void initBinderForCatalogNumbers(WebDataBinder binder) {
+		binder.registerCustomEditor(String.class, "catalogNumbers", new StringTrimmerEditor(true));
+	}
+	
 	@PatchMapping(
 		path = SeriesUrl.INFO_SERIES_PAGE,
 		headers = "HX-Trigger=add-comment-form"
@@ -83,5 +88,49 @@ public String updateSeriesComment(
 		model.addAttribute("comment", comment);
 		return "series/partial/comment";
 	}
+
+	@PatchMapping(
+		path = SeriesUrl.INFO_SERIES_PAGE,
+		headers = "HX-Trigger=add-catalog-numbers-form"
+	)
+	public String addCatalogNumbers(
+		@PathVariable("id") Integer seriesId,
+		@Valid AddCatalogNumbersForm form,
+		BindingResult result,
+		@AuthenticationPrincipal CustomUserDetails currentUser,
+		Model model,
+		HttpServletResponse response
+	) throws IOException {
+		
+		if (seriesId == null) {
+			response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		
+		if (!seriesService.isSeriesExist(seriesId)) {
+			response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		
+		if (result.hasErrors()) {
+			response.setStatus(HttpStatus.UNPROCESSABLE_ENTITY.value());
+			model.addAttribute("isHtmx", true);
+			model.addAttribute("seriesId", seriesId);
+			return "series/info :: AddCatalogNumbersForm";
+		}
+		
+		Integer currentUserId = currentUser.getUserId();
+		seriesService.addCatalogNumbers(
+			form.getCatalogName(),
+			seriesId,
+			form.getCatalogNumbers(),
+			currentUserId
+		);
+		
+		// @todo #1671 AddCatalogNumbersForm: update a page without full reload
+		response.addHeader("HX-Refresh", "true");
+		
+		return null;
+	}
 
 }

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

@@ -46,7 +46,6 @@ class RestSeriesController {
 	private final SeriesService seriesService;
 	private final SeriesImageService seriesImageService;
 
-	// @todo #1339 Update series: add validation for catalog numbers
 	// @todo #1340 Update series: add validation for a price
 	// @todo #1343 Update series: add validation for a release year
 	@PatchMapping(SeriesUrl.INFO_SERIES_PAGE)
@@ -91,19 +90,6 @@ public ResponseEntity<Void> updateSeries(
 						currentUserId
 					);
 					break;
-				case "/michel_numbers":
-				case "/scott_numbers":
-				case "/yvert_numbers":
-				case "/gibbons_numbers":
-				case "/solovyov_numbers":
-				case "/zagorski_numbers":
-					seriesService.addCatalogNumbers(
-						extractCatalog(path),
-						seriesId,
-						patch.getValue(),
-						currentUserId
-					);
-					break;
 				default:
 					// @todo #785 Update series: properly fail on invalid path
 					break;

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

@@ -43,7 +43,6 @@ public final class ResourceUrl {
 	private static final String SALE_IMPORT_FORM_JS     = "/public/js/" + RESOURCES_VERSION + "/components/SeriesSaleImportForm.min.js";
 	private static final String SIMILAR_SERIES_FORM_JS  = "/public/js/" + RESOURCES_VERSION + "/components/SimilarSeriesForm.min.js";
 	private static final String CATALOG_PRICE_FORM_JS   = "/public/js/" + RESOURCES_VERSION + "/components/AddCatalogPriceForm.min.js";
-	private static final String CATALOG_NUMBERS_FORM_JS = "/public/js/" + RESOURCES_VERSION + "/components/AddCatalogNumbersForm.min.js";
 	private static final String RELEASE_YEAR_FORM_JS    = "/public/js/" + RESOURCES_VERSION + "/components/AddReleaseYearForm.min.js";
 	private static final String HIDE_IMAGE_FORM_JS      = "/public/js/" + RESOURCES_VERSION + "/components/HideImageForm.min.js";
 	private static final String SERIES_SALES_LIST_JS    = "/public/js/" + RESOURCES_VERSION + "/components/SeriesSalesList.min.js";
@@ -83,7 +82,6 @@ public static void exposeResourcesToView(Map<String, String> resources, String h
 		put(resources, host, "SALE_IMPORT_FORM_JS", SALE_IMPORT_FORM_JS);
 		put(resources, host, "SIMILAR_SERIES_FORM_JS", SIMILAR_SERIES_FORM_JS);
 		put(resources, host, "CATALOG_PRICE_FORM_JS", CATALOG_PRICE_FORM_JS);
-		put(resources, host, "CATALOG_NUMBERS_FORM_JS", CATALOG_NUMBERS_FORM_JS);
 		put(resources, host, "RELEASE_YEAR_FORM_JS", RELEASE_YEAR_FORM_JS);
 		put(resources, host, "HIDE_IMAGE_FORM_JS", HIDE_IMAGE_FORM_JS);
 		put(resources, host, "SERIES_SALES_LIST_JS", SERIES_SALES_LIST_JS);

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

@@ -173,6 +173,7 @@ t_similar_series = Similar series
 t_mark_as_similar = Mark as similar
 t_could_not_import_info = Could not import information from this page
 t_comment = Comment
+t_numbers = Numbers
 
 # category/info.html
 t_category_info = Category info
@@ -231,6 +232,3 @@ t_seller_group = Seller group
 # series/import/list.html
 t_no_import_requests = No import requests
 t_import_requests = import requests
-
-# AddCatalogNumbersForm.js
-t_numbers = Numbers

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -172,6 +172,7 @@ t_similar_series = Похожие серии
 t_mark_as_similar = Отметить как похожую
 t_could_not_import_info = Не удалось импортировать информацию с этой страницы
 t_comment = Комментарий
+t_numbers = Номера
 
 # category/info.html
 t_category_info = Информация о категории
@@ -230,6 +231,3 @@ t_seller_group = Группа продавца
 # series/import/list.html
 t_no_import_requests = Нет запросов на импорт
 t_import_requests = запросы на импорт
-
-# AddCatalogNumbersForm.js
-t_numbers = Номера