improve mini dashboard routing
@@ -15,16 +15,17 @@ pub use option::Opt;
#[macro_export]
macro_rules! create_app {
- ($data:expr, $enable_frontend:expr) => {{
+ ($data:expr, $enable_frontend:expr) => {
+ {
use actix_cors::Cors;
use actix_web::middleware::TrailingSlash;
- use actix_web::App;
+ use actix_web::{App, HttpResponse};
use actix_web::{middleware, web};
use meilisearch_http::error::payload_error_handler;
use meilisearch_http::routes::*;
#[cfg(feature = "mini-dashboard")]
- use actix_web_static_files::ResourceFiles;
+ use actix_web_static_files::Resource;
#[cfg(feature = "mini-dashboard")]
mod dashboard {
@@ -53,9 +54,24 @@ macro_rules! create_app {
.configure(dump::services);
#[cfg(feature = "mini-dashboard")]
let app = if $enable_frontend {
+ let mut app = app;
let generated = dashboard::generate();
- let service = ResourceFiles::new("/", generated);
- app.service(service)
+ let mut scope = web::scope("/");
+ // Generate routes for mini-dashboard assets
+ for (path, resource) in generated.into_iter() {
+ let Resource {mime_type, data, ..} = resource;
+ // Redirect index.html to /
+ if path == "index.html" {
+ app = app.service(web::resource("/").route(web::get().to(move || {
+ HttpResponse::Ok().content_type(mime_type).body(data)
+ })));
+ } else {
+ scope = scope.service(web::resource(path).route(web::get().to(move || {
+ HttpResponse::Ok().content_type(mime_type).body(data)
+ })));
+ }
+ }
+ app.service(scope)
} else {
app.service(running)
};
@@ -74,5 +90,8 @@ macro_rules! create_app {
.wrap(middleware::Logger::default())
.wrap(middleware::Compress::default())
.wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
- }};
+ .default_service(
+ web::route().to(|| HttpResponse::NotFound()))
+ }
+ };
}
