Provide default GSP layout for Turbo Frame

rainboyan · rainboyan · commit 158c47dc9793 · 2024-05-15T16:39:00.000+08:00
diff --git a/plugins/turbo/app/views/layouts/turbo/frame.gsp b/plugins/turbo/app/views/layouts/turbo/frame.gsp
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <g:layoutHead/>
+  </head>
+  <body>
+    <g:layoutBody/>
+  </body>
+</html>
diff --git a/plugins/turbo/build.gradle b/plugins/turbo/build.gradle
@@ -10,6 +10,7 @@ ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile
 ext.isReleaseVersion = !projectVersion.endsWith("SNAPSHOT")
 
 ext {
+    grailsVersion = '5.1.0'
     springBootVersion = '2.6.6'
     servletVersion = '4.0.1'
 }
@@ -22,6 +23,7 @@ apply plugin: "idea"
 apply plugin: "groovy"
 apply plugin: "org.graceframework.asset-pipeline"
 apply plugin: "org.graceframework.grace-plugin"
+apply plugin: "org.graceframework.grace-gsp"
 apply plugin: "maven-publish"
 apply plugin: "signing"
 
@@ -33,7 +35,9 @@ dependencies {
     compileOnly "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
     compileOnly "javax.servlet:javax.servlet-api:$servletVersion"
     compileOnly "org.graceframework:grace-core:$graceVersion"
-    compileOnly "org.graceframework:grace-web-common:$graceVersion"
+    compileOnly "org.grails:grails-web-common:$grailsVersion"
+    compileOnly "org.grails:grails-web-gsp:$grailsVersion"
+    compileOnly "org.grails:grails-web-sitemesh:$grailsVersion"
 }
 
 tasks.withType(Sign) {
diff --git a/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboRequestFilter.java b/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboRequestFilter.java
@@ -23,8 +23,7 @@
 
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import grails.web.http.HttpHeaders;
-import grails.web.mime.MimeType;
+import org.grails.web.sitemesh.GrailsLayoutDecoratorMapper;
 import org.grails.web.util.GrailsApplicationAttributes;
 
 /**
@@ -36,21 +35,29 @@
  */
 public class TurboRequestFilter extends OncePerRequestFilter {
 
+    private static final String TURBO_FRAME_LAYOUT = "turbo/frame";
+
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
             throws ServletException, IOException {
 
-        request.setAttribute(GrailsApplicationAttributes.CONTENT_FORMAT, TurboMimeType.TURBO_STREAM_FORMAT);
-        request.setAttribute(GrailsApplicationAttributes.RESPONSE_FORMAT, TurboMimeType.TURBO_STREAM_FORMAT);
-        request.setAttribute(GrailsApplicationAttributes.RESPONSE_MIME_TYPE, TurboMimeType.TURBO_STREAM);
-        response.setContentType(TurboMimeType.TURBO_STREAM.getName());
+        if (HttpServletRequestExtension.isTurboStream(request)) {
+            request.setAttribute(GrailsApplicationAttributes.CONTENT_FORMAT, TurboMimeType.TURBO_STREAM_FORMAT);
+            request.setAttribute(GrailsApplicationAttributes.RESPONSE_FORMAT, TurboMimeType.TURBO_STREAM_FORMAT);
+            request.setAttribute(GrailsApplicationAttributes.RESPONSE_MIME_TYPE, TurboMimeType.TURBO_STREAM);
+            response.setContentType(TurboMimeType.TURBO_STREAM.getName());
+        }
+
+        if (HttpServletRequestExtension.isTurboFrame(request)) {
+            request.setAttribute(GrailsLayoutDecoratorMapper.LAYOUT_ATTRIBUTE, TURBO_FRAME_LAYOUT);
+        }
 
         filterChain.doFilter(request, response);
     }
 
     @Override
     protected boolean shouldNotFilter(HttpServletRequest request) {
-        return !HttpServletRequestExtension.isTurboStream(request);
+        return !HttpServletRequestExtension.isTurboRequest(request);
     }
 
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +<html>
 +  <head>
 +    <g:layoutHead/>
 +  </head>
 +  <body>
 +    <g:layoutBody/>
 +  </body>
 +</html>