task: rewrite AddCommentForm to HTMX

Closes #1489
Closes #1500
Closes #1544

Part of #1671

Author: php-coder

.github/dependabot.yml

@@ -17,6 +17,7 @@ updates:
       - dependency-name: "org.liquibase:liquibase-core"
       - dependency-name: "org.projectlombok:lombok"
       - dependency-name: "org.hibernate.validator:hibernate-validator"
+      - dependency-name: "org.webjars.npm:htmx.org"
     # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore
     ignore:
       - dependency-name: "org.hibernate.validator:hibernate-validator"

pom.xml

@@ -299,6 +299,13 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.webjars.npm</groupId>
+			<artifactId>htmx.org</artifactId>
+			<version>${htmx.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.webjars.npm</groupId>
 			<artifactId>react</artifactId>
@@ -575,6 +582,9 @@
 		<!-- Redefine default value from spring-boot-dependencies -->
 		<htmlunit.version>2.70.0</htmlunit.version>
 
+		<!-- Don't forget to update version in the ResourceUrl class and in the src/main/webapp/WEB-INF/views/series/info.html -->
+		<htmx.version>2.0.4</htmx.version>
+		
 		<!-- Redefine default value from spring-boot-dependencies -->
 		<jakarta-mail.version>1.6.7</jakarta-mail.version>
 
@@ -987,6 +997,10 @@
 					<nonCriticalTags>
 						<!-- Allow to tests with this tag to fail without changing final status -->
 						<nonCriticalTag>unstable</nonCriticalTag>
+						<!--
+							@todo #1671 Fix integration tests because of unsupported HTMX in htmlunit
+						-->
+						<nonCriticalTag>htmx</nonCriticalTag>
 					</nonCriticalTags>
 				</configuration>
 				<dependencies>

src/main/frontend/src/components/AddCommentForm.js

@@ -10,7 +10,6 @@ module.exports = {
 
         'components/AddCatalogNumbersForm': './src/components/AddCatalogNumbersForm.js',
         'components/AddCatalogPriceForm':   './src/components/AddCatalogPriceForm.js',
-        'components/AddCommentForm':        './src/components/AddCommentForm.js',
         'components/AddReleaseYearForm':    './src/components/AddReleaseYearForm.js',
         'components/HideImageForm':         './src/components/HideImageForm.js',
         'components/SeriesSaleImportForm':  './src/components/SeriesSaleImportForm.js',

src/main/frontend/src/components/AddCommentForm.test.js

@@ -130,6 +130,8 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 			.addResourceLocations("classpath:/META-INF/resources/webjars/axios/");
 		registry.addResourceHandler("/public/bootstrap/**")
 			.addResourceLocations("classpath:/META-INF/resources/webjars/bootstrap/");
+		registry.addResourceHandler("/public/htmx/**")
+			.addResourceLocations("classpath:/META-INF/resources/webjars/htmx.org/");
 		registry.addResourceHandler("/public/jquery/**")
 			.addResourceLocations("classpath:/META-INF/resources/webjars/jquery/");
 		registry.addResourceHandler("/public/react/**")

src/main/frontend/webpack.config.js

@@ -0,0 +1,35 @@
+/*
+ * 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.Size;
+
+import static ru.mystamps.web.feature.series.SeriesValidation.MAX_SERIES_COMMENT_LENGTH;
+
+@Getter
+@Setter
+public class AddCommentForm {
+	@NotBlank
+	@Size(max = MAX_SERIES_COMMENT_LENGTH, message = "{value.too-long}")
+	private String comment;
+}

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -0,0 +1,87 @@
+/*
+ * 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.RequiredArgsConstructor;
+import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import ru.mystamps.web.support.spring.security.CustomUserDetails;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+
+@Controller
+@RequiredArgsConstructor
+public class HtmxSeriesController {
+	
+	private final SeriesService seriesService;
+	
+	@InitBinder("addCommentForm")
+	protected void initBinder(WebDataBinder binder) {
+		binder.registerCustomEditor(String.class, "comment", new StringTrimmerEditor(true));
+	}
+	
+	@PatchMapping(
+		path = SeriesUrl.INFO_SERIES_PAGE,
+		headers = "HX-Trigger=add-comment-form"
+	)
+	public String updateSeriesComment(
+		@PathVariable("id") Integer seriesId,
+		@Valid AddCommentForm 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()) {
+			model.addAttribute("isHtmx", true);
+			model.addAttribute("seriesId", seriesId);
+			response.sendError(HttpStatus.UNPROCESSABLE_ENTITY.value());
+			return "series/info :: AddCommentForm";
+		}
+		
+		String comment = form.getComment();
+		Integer currentUserId = currentUser.getUserId();
+		seriesService.addComment(seriesId, currentUserId, comment);
+		
+		model.addAttribute("comment", comment);
+		return "series/partial/comment";
+	}
+	
+}

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

@@ -75,9 +75,6 @@ public ResponseEntity<Void> updateSeries(
 			Integer currentUserId = currentUser.getUserId();
 			String path = patch.getPath();
 			switch (path) {
-				case "/comment":
-					seriesService.addComment(seriesId, currentUserId, patch.getValue());
-					break;
 				case "/release_year":
 					seriesService.addReleaseYear(seriesId, patch.integerValue(), currentUserId);
 					break;