added support for thymeleaf - adding index.html to template folder

Author: sterlp

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.4.4 - (2025-01-08)
+
+-  Fixed UI routing
+-  added support for thymeleaf - adding index.html to template folder
+
 ## v1.4.3 - (2025-01-08)
 
 -  Scheduler service leaves current transaction before executing task

ui/pom.xml

@@ -101,6 +101,32 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-index-html</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>dist/templates/task-ui</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>dist/static/task-ui</directory>
+                                    <includes>
+                                        <include>index.html</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

ui/src/main/java/org/sterl/spring/persistent_tasks_ui/SpringPersistentTasksUIConfig.java

@@ -10,16 +10,20 @@
 
 @Configuration
 public class SpringPersistentTasksUIConfig implements WebMvcConfigurer {
+    private static final String BASE = "/task-ui";
+    private static final String INDEX_HTML = BASE + "/index.html";
+    
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/persistentTask-ui").setViewName("/persistentTask-ui/index.html");
-        //registry.addRedirectViewController("/persistentTask-ui/", "/persistentTask-ui");
+        registry.addViewController(BASE).setViewName("forward:" + INDEX_HTML);
+        registry.addViewController(BASE + "/{path:^(?!index\\.html$).*$}")
+                .setViewName("forward:" + INDEX_HTML);
     }
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/persistentTask-ui/assets/**") 
-            .addResourceLocations("classpath:/static/persistentTask-ui/assets/") 
+        registry.addResourceHandler(BASE + "/assets/**") 
+            .addResourceLocations("classpath:/static" + BASE +  "/assets/") 
             .setCacheControl(CacheControl.maxAge(90, TimeUnit.DAYS));
     }
 }