Stop relying on npm to have the UI static files available in the server

.gitignore

@@ -6,3 +6,5 @@ target
 
 /flamegraph*.svg
 /perf.data*
+
+/static

Cargo.toml

@@ -122,12 +122,12 @@ trustify-module-importer = { path = "modules/importer" }
 trustify-module-ingestor = { path = "modules/ingestor" }
 trustify-module-search = { path = "modules/search" }
 trustify-module-storage = { path = "modules/storage" }
-trustify-module-ui = { path = "modules/ui", default-features = false }
+trustify-module-ui = { path = "modules/ui" }
 trustify-module-advisory = { path = "modules/advisory" }
 trustify-module-organization = { path = "modules/organization" }
 trustify-module-vulnerability = { path = "modules/vulnerability" }
 trustify-server = { path = "server", default-features = false }
-trustify-ui = { git = "https://github.com/trustification/trustify-ui.git" }
+trustify-ui = { git = "https://github.com/carlosthe19916/trustify-ui", branch = "static-ui" }
 
 [patch.crates-io]
 #csaf-walker = { git = "https://github.com/ctron/csaf-walker", rev = "7b6e64dd56e4be79e184b053ef754a42e1496fe0" }

README.md

@@ -18,8 +18,19 @@ cargo run --bin trustd --no-default-features
 
 That will create its own database on your local filesystem.
 
-* The first command also contains **UI** so point your browser at <http://localhost:8080>.
-* The second runs without **UI** then you can go at <http://localhost:8080/swagger-ui/> to view the API.
+* You can go at <http://localhost:8080> to view the UI.
+* You can go at <http://localhost:8080/swagger-ui/> to view the API.
+
+### Running server with the latest version of the UI
+
+- The server renders the UI from the `./static-local` folder
+- If the `./static` directory exists then it will be used for serving the UI
+
+Copy the UI static files executing:
+
+```shell
+podman cp $(docker create --name ui-download ghcr.io/trustification/trustify-ui:latest):/opt/app-root/dist/client/dist static && podman rm ui-download
+```
 
 ### Running containerized UI
 

modules/ui/Cargo.toml

@@ -7,8 +7,13 @@ edition = "2021"
 actix-web = { workspace = true }
 log = { workspace = true }
 actix-web-static-files = { workspace = true }
-trustify-ui = { workspace = true, optional = true }
+trustify-ui = { workspace = true }
 
-[features]
-default = [ "ui" ]
-ui = ["trustify-ui"]
+static-files = "0.2.1"
+serde_json = "1.0.117"
+tera = "1.19.1"
+base64 = "0.22.1"
+serde = { version = "1.0.201", features = ["derive"] }
+
+[build-dependencies]
+static-files = "0.2.1"

modules/ui/build.rs

@@ -0,0 +1,13 @@
+use static_files::resource_dir;
+use std::path::Path;
+
+static STATIC_DIR: &str = "../../static";
+static STATIC_LOCAL_DIR: &str = "../../static-local";
+
+pub fn main() {
+    if Path::new(STATIC_DIR).exists() {
+        resource_dir(STATIC_DIR).build().unwrap();
+    } else {
+        resource_dir(STATIC_LOCAL_DIR).build().unwrap();
+    }
+}

modules/ui/src/endpoints.rs

@@ -1,7 +1,8 @@
+use crate::ui::ui_resources;
 use actix_web::web;
 use actix_web_static_files::ResourceFiles;
-use trustify_ui::{trustify_ui, UI};
+use trustify_ui::UI;
 
 pub fn configure(config: &mut web::ServiceConfig, ui: &UI) {
-    config.service(ResourceFiles::new("/", trustify_ui(ui)).resolve_not_found_to(""));
+    config.service(ResourceFiles::new("/", ui_resources(ui)).resolve_not_found_to(""));
 }

modules/ui/src/lib.rs

@@ -1,5 +1,2 @@
-#[cfg(feature = "ui")]
-pub use trustify_ui::UI;
-
-#[cfg(feature = "ui")]
 pub mod endpoints;
+pub mod ui;

modules/ui/src/ui.rs

@@ -0,0 +1,11 @@
+use std::collections::HashMap;
+
+use static_files::Resource;
+use trustify_ui::{trustify_ui, UI};
+
+include!(concat!(env!("OUT_DIR"), "/generated.rs"));
+
+pub fn ui_resources(ui: &UI) -> HashMap<&'static str, Resource> {
+    let resources = generate();
+    trustify_ui(ui, resources)
+}

server/Cargo.toml

@@ -32,10 +32,7 @@ url = "2"
 utoipa = { workspace = true, features = ["actix_extras"] }
 utoipa-swagger-ui = { workspace = true, features = ["actix-web"] }
 walker-common = { workspace = true }
+trustify-ui = { workspace = true }
 
 [dev-dependencies]
 urlencoding = { workspace = true }
-
-[features]
-default = [ "ui" ]
-ui = ["trustify-module-ui/ui"]

server/src/lib.rs

@@ -39,12 +39,10 @@ use trustify_module_importer::server::importer;
 use trustify_module_ingestor::graph::Graph;
 use trustify_module_storage::service::dispatch::DispatchBackend;
 use trustify_module_storage::service::fs::FileSystemBackend;
+use trustify_ui::UI;
 use utoipa::OpenApi;
 use utoipa_swagger_ui::SwaggerUi;
 
-#[cfg(feature = "ui")]
-use trustify_module_ui::UI;
-
 /// Run the API server
 #[derive(clap::Args, Debug)]
 pub struct Run {
@@ -82,7 +80,6 @@ struct InitData {
     http: HttpServerConfig<Trustify>,
     tracing: Tracing,
     swagger_oidc: Option<Arc<SwaggerUiOidc>>,
-    #[cfg(feature = "ui")]
     ui: UI,
 }
 
@@ -152,7 +149,6 @@ impl InitData {
 
         let storage = DispatchBackend::Filesystem(FileSystemBackend::new(storage).await?);
 
-        #[cfg(feature = "ui")]
         let ui = UI {
             // TODO: where/how should we configure these details?
             version: env!("CARGO_PKG_VERSION").to_string(),
@@ -173,7 +169,6 @@ impl InitData {
             tracing: run.infra.tracing,
             swagger_oidc,
             storage,
-            #[cfg(feature = "ui")]
             ui,
         })
     }
@@ -212,7 +207,6 @@ impl InitData {
                             trustify_module_storage::endpoints::configure(svc, storage.clone());
                             // I think the UI must come last due to
                             // its use of `resolve_not_found_to`
-                            #[cfg(feature = "ui")]
                             trustify_module_ui::endpoints::configure(svc, &self.ui);
                         });
                 })

static-local/branding/strings.json

@@ -0,0 +1,21 @@
+{
+  "application": {
+    "title": "Trustification",
+    "name": "Trustification UI",
+    "description": "Trustification UI"
+  },
+  "about": {
+    "displayName": "Trustification",
+    "imageSrc": "<%= brandingRoot %>/images/masthead-logo.svg",
+    "documentationUrl": "https://trustification.io/"
+  },
+  "masthead": {
+    "leftBrand": {
+      "src": "<%= brandingRoot %>/images/masthead-logo.svg",
+      "alt": "brand",
+      "height": "40px"
+    },
+    "leftTitle": null,
+    "rightBrand": null
+  }
+}

static-local/index.html.ejs

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <title>Trustify</title>
+  <body>
+    <h1>Welcome</h1>
+  </body>
+</html>

trustd/Cargo.toml

@@ -22,7 +22,3 @@ serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 url = { workspace = true }
-
-[features]
-default = ["ui"]
-ui = ["trustify-server/ui"]