Fix mime type for js files

Author: GuillaumeGomez

src/web/page/templates.rs

@@ -311,7 +311,7 @@ impl IconType {
             IconType::Brand => font_awesome_as_a_crate::Type::Brands,
         };
 
-        let icon_file_string = font_awesome_as_a_crate::svg(type_, &icon_name[..]).unwrap_or("");
+        let icon_file_string = font_awesome_as_a_crate::svg(type_, icon_name).unwrap_or("");
 
         let mut classes = vec!["fa-svg"];
         if fw {

src/web/page/web_page.rs

@@ -1,4 +1,3 @@
-use super::TemplateData;
 use crate::web::{csp::Csp, error::AxumNope};
 use axum::{
     body::Body,
@@ -25,7 +24,7 @@ macro_rules! impl_axum_webpage {
         $(, cpu_intensive_rendering = $cpu_intensive_rendering:expr)?
         $(,)?
     ) => {
-        impl crate::web::page::web_page::AddCspNonce for $page {
+        impl $crate::web::page::web_page::AddCspNonce for $page {
             fn render_with_csp_nonce(&mut self, csp_nonce: String) -> rinja::Result<String> {
                 self.csp_nonce = csp_nonce;
                 self.render()
@@ -103,7 +102,6 @@ pub(crate) struct DelayedTemplateRender {
 
 fn render_response(
     mut response: AxumResponse,
-    bla: Arc<TemplateData>,
     csp_nonce: String,
 ) -> BoxFuture<'static, AxumResponse> {
     async move {
@@ -138,7 +136,6 @@ fn render_response(
                     } else {
                         return render_response(
                             AxumNope::InternalError(err.into()).into_response(),
-                            bla,
                             csp_nonce,
                         )
                         .await;
@@ -159,12 +156,6 @@ fn render_response(
 }
 
 pub(crate) async fn render_templates_middleware(req: AxumRequest, next: Next) -> AxumResponse {
-    let templates: Arc<TemplateData> = req
-        .extensions()
-        .get::<Arc<TemplateData>>()
-        .expect("template data request extension not found")
-        .clone();
-
     let csp_nonce = req
         .extensions()
         .get::<Arc<Csp>>()
@@ -174,5 +165,5 @@ pub(crate) async fn render_templates_middleware(req: AxumRequest, next: Next) ->
 
     let response = next.run(req).await;
 
-    render_response(response, templates, csp_nonce).await
+    render_response(response, csp_nonce).await
 }

src/web/releases.rs

@@ -1657,12 +1657,13 @@ mod tests {
         wrapper(|env| {
             let web = env.frontend();
 
-            let empty_data = format!("data: [{}]", vec!["0"; 30].join(","));
+            let empty_data = format!("data: [{}]", vec!["0"; 30].join(", "));
 
             // no data / only zeros without releases
             let response = web.get("/releases/activity/").send()?;
             assert!(response.status().is_success());
-            assert_eq!(response.text().unwrap().matches(&empty_data).count(), 2);
+            let text = response.text();
+            assert_eq!(text.unwrap().matches(&empty_data).count(), 2);
 
             env.fake_release().name("some_random_crate").create()?;
             env.fake_release()
@@ -1690,9 +1691,9 @@ mod tests {
             assert!(response.status().is_success());
             let text = response.text().unwrap();
             // counts contain both releases
-            assert!(text.contains(&format!("data: [{},2]", vec!["0"; 29].join(","))));
+            assert!(text.contains(&format!("data: [{}, 2]", vec!["0"; 29].join(", "))));
             // failures only one
-            assert!(text.contains(&format!("data: [{},1]", vec!["0"; 29].join(","))));
+            assert!(text.contains(&format!("data: [{}, 1]", vec!["0"; 29].join(", "))));
 
             Ok(())
         })

src/web/statics.rs

@@ -26,7 +26,8 @@ fn build_static_css_response(content: &'static str) -> impl IntoResponse {
 }
 
 async fn set_needed_static_headers(req: Request, next: Next) -> Response {
-    let is_opensearch_xml = req.uri().path().ends_with("/opensearch.xml");
+    let req_path = req.uri().path();
+    let is_opensearch_xml = req_path.ends_with("/opensearch.xml");
 
     let mut response = next.run(req).await;