Merge pull request #5460 from Sage-Bionetworks/release-506

package.json

@@ -51,6 +51,7 @@
     "eslint": "^8.0.1",
     "husky": ">=6",
     "lint-staged": ">=10",
+    "npm-run-all": "^4.1.5",
     "prettier": "^3.2.5",
     "prettier-plugin-java": "2.5.0",
     "typescript": "5.1.6",
@@ -61,6 +62,9 @@
   },
   "scripts": {
     "build": "mvn -B package --file pom.xml",
+    "dev": "npm-run-all --parallel dev:tomcat dev:codeserver",
+    "dev:tomcat": "docker pull tomcat:9.0; docker run --name swc-dev --rm -p 8888:8080 -v \"/$(pwd)/target/portal-develop-SNAPSHOT/:/usr/local/tomcat/webapps/ROOT/\" -v \"/$HOME/.m2/settings.xml\":/root/.m2/settings.xml tomcat:9.0",
+    "dev:codeserver": "mvn gwt:run-codeserver -Dgwt.compiler.skip=true -Dnoserver=true -Dwar=/$(pwd)/target/portal-develop-SNAPSHOT -Dstyle=PRETTY",
     "docker:start": "docker pull tomcat:9.0; docker run --name swc-tomcat -d --rm -p 8888:8080 -v \"/$(pwd)/target/portal-develop-SNAPSHOT.war:/usr/local/tomcat/webapps/ROOT.war\" -v \"/$(pwd)/e2e_workflow/settings.xml\":/root/.m2/settings.xml tomcat:9.0",
     "docker:stop": "docker stop swc-tomcat",
     "prepare": "husky install",

src/main/java/org/sagebionetworks/web/server/servlet/filter/JavaScriptContentTypeFilter.java

@@ -0,0 +1,45 @@
+package org.sagebionetworks.web.server.servlet.filter;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class JavaScriptContentTypeFilter implements Filter {
+
+  @Override
+  public void init(FilterConfig config) throws ServletException {}
+
+  @Override
+  public void destroy() {
+    // nothing to do
+  }
+
+  @Override
+  public void doFilter(
+    ServletRequest request,
+    ServletResponse response,
+    FilterChain chain
+  ) throws IOException, ServletException {
+    // Cast the request and response to HttpServletRequest and HttpServletResponse
+    HttpServletRequest httpRequest = (HttpServletRequest) request;
+    HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+    // Get the requested URI
+    String requestURI = httpRequest.getRequestURI();
+
+    // Check if the request is for a JavaScript file
+    if (requestURI.endsWith(".js")) {
+      // Some of our JavaScript files are UTF-8; without this, the browser may interpret them as ASCII
+      httpResponse.setContentType("application/javascript; charset=UTF-8");
+    }
+
+    // Continue the filter chain
+    chain.doFilter(request, response);
+  }
+}

src/main/webapp/WEB-INF/web.xml

@@ -30,6 +30,12 @@
       org.sagebionetworks.web.server.servlet.filter.GWTAllCacheFilter
     </filter-class>
   </filter>
+  <filter>
+    <filter-name>jsContentTypeFilter</filter-name>
+    <filter-class>
+      org.sagebionetworks.web.server.servlet.filter.JavaScriptContentTypeFilter
+    </filter-class>
+  </filter>
   <filter>
     <filter-name>hstsFilter</filter-name>
     <filter-class>
@@ -71,6 +77,10 @@
     <url-pattern>/images/*</url-pattern>
     <url-pattern>/research/*</url-pattern>
   </filter-mapping>
+  <filter-mapping>
+    <filter-name>jsContentTypeFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
   <filter-mapping>
     <filter-name>sslFilter</filter-name>
@@ -92,7 +102,7 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-  <!-- This is where we register the ServerModule containing all of the mapping 
+  <!-- This is where we register the ServerModule containing all of the mapping
 		with Guice. -->
   <listener>
     <listener-class>