webapp: urls, settings

typhon-ci · Oct 16, 2023 · 1e50191 · 1e50191
1 parent 1eb8816
commit 1e50191
Show file tree

Hide file tree

Showing 15 changed files with 261 additions and 347 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/nix/packages/webapp.nix b/nix/packages/webapp.nix
@@ -37,6 +37,5 @@ in
     trunkIndexPath = "typhon-webapp/index.html";
     preBuild = ''
       ln -s ${nodeDependencies}/lib/node_modules typhon-webapp/node_modules
-      echo "build.public_url = \"WEBROOT\"" >> Trunk.toml
     '';
   }
diff --git a/nix/packages/webroot.nix b/nix/packages/webroot.nix
@@ -22,17 +22,18 @@ in
       baseurl ? "127.0.0.1:8000/api",
       https ? false,
     }: let
-      settings = pkgs.writeTextFile {
-        name = "settings.json";
-        text = builtins.toJSON {inherit baseurl https;};
-      };
+      settings = builtins.toJSON {inherit baseurl https;};
     in
       pkgs.stdenv.mkDerivation {
         name = "typhon-webroot";
         src = webapp;
         buildPhase = ''
-          substituteInPlace ./index.html --replace "WEBROOT" "${webroot}/"
-          cp ${settings} settings.json
+          substituteInPlace ./index.html --replace \
+              '<base href="/">' \
+              '<base href="${webroot}/">'
+          substituteInPlace ./index.html --replace \
+              '<script type="application/json" id="settings">null</script>' \
+              '<script type="application/json" id="settings">${settings}</script>'
           cp ${tarball} source.tar.gz
         '';
         installPhase = ''

diff --git a/typhon-webapp/Cargo.toml b/typhon-webapp/Cargo.toml
@@ -19,7 +19,6 @@ gloo-console.workspace = true
 gloo-net.workspace = true
 gloo-storage.workspace = true
 gloo-utils.workspace = true
-once_cell.workspace = true
 seed.workspace = true
 serde-wasm-bindgen.workspace = true
 serde.workspace = true

diff --git a/typhon-webapp/index.html b/typhon-webapp/index.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8" />
+    <base href="/">
     <title>Typhon</title>
     <link data-trunk rel="copy-dir" href="node_modules/@fontsource" data-target-path="@fontsource" />
     <link data-trunk rel="sass" href="index.scss" />
+    <script type="application/json" id="settings">null</script>
   </head>
   <body>
     <div id="app"></div>

diff --git a/typhon-webapp/src/appurl.rs b/typhon-webapp/src/appurl.rs
diff --git a/typhon-webapp/src/drv_log.rs b/typhon-webapp/src/drv_log.rs
@@ -21,7 +21,7 @@ pub fn init(_orders: &mut impl Orders<Msg>) -> Model {
 pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
     use crate::get_token;
     use crate::streams;
-    use crate::SETTINGS;
+    use crate::Settings;
 
     use gloo_net::http;
 
@@ -31,10 +31,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             model.drv = Some(drv.clone());
             model.log = Vec::new();
 
-            let settings = SETTINGS.get().unwrap();
-            let req =
-                http::RequestBuilder::new(&format!("{}/drv-log{}", settings.api_server.url(), drv))
-                    .method(http::Method::GET);
+            let settings = Settings::load();
+            let req = http::RequestBuilder::new(&format!("{}/drv-log{}", settings.url(), drv))
+                .method(http::Method::GET);
             let req = match get_token() {
                 None => req,
                 Some(token) => req.header(&"token", &token),

diff --git a/typhon-webapp/src/evaluation.rs b/typhon-webapp/src/evaluation.rs
@@ -1,18 +1,16 @@
-use crate::{appurl::AppUrl, perform_request, view_error};
+use crate::perform_request;
+use crate::view_error;
 use seed::{prelude::*, *};
 use typhon_types::*;
 
+struct_urls!();
+
 pub struct Model {
     error: Option<responses::ResponseError>,
     handle: handles::Evaluation,
     info: Option<responses::EvaluationInfo>,
     log: Option<String>,
-}
-
-impl Model {
-    pub fn app_url(&self) -> AppUrl {
-        Vec::<String>::from(self.handle.clone()).into()
-    }
+    base_url: Url,
 }
 
 #[derive(Clone, Debug)]
@@ -28,13 +26,14 @@ pub enum Msg {
     Noop,
 }
 
-pub fn init(orders: &mut impl Orders<Msg>, handle: handles::Evaluation) -> Model {
+pub fn init(base_url: Url, orders: &mut impl Orders<Msg>, handle: handles::Evaluation) -> Model {
     orders.send_msg(Msg::FetchInfo);
     Model {
         error: None,
         handle: handle.clone(),
         info: None,
         log: None,
+        base_url,
     }
 }
 
@@ -93,21 +92,23 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
 }
 
 fn view_evaluation(model: &Model) -> Node<Msg> {
+    let urls_1 = crate::Urls::new(model.base_url.clone());
+    let urls_2 = crate::Urls::new(model.base_url.clone());
     div![
         h2![
             "Evaluation",
             " ",
             a![
                 &model.handle.jobset.project.name,
                 attrs! {
-                    At::Href => crate::Urls::project(&model.handle.jobset.project),
+                    At::Href => urls_1.project(&model.handle.jobset.project),
                 },
             ],
             ":",
             a![
                 &model.handle.jobset.name,
                 attrs! {
-                    At::Href => crate::Urls::jobset(&model.handle.jobset),
+                    At::Href => urls_2.jobset(&model.handle.jobset),
                 },
             ],
             ":",
@@ -125,19 +126,22 @@ fn view_evaluation(model: &Model) -> Node<Msg> {
                 if info.status == "success" {
                     div![
                         h3!["Jobs"],
-                        ul![info.jobs.iter().map(|job| li![a![
-                            job.system.clone(),
-                            " / ",
-                            job.name.clone(),
-                            attrs! {
-                                At::Href => crate::Urls::job(
-                                    &handles::Job {
-                                        evaluation: model.handle.clone(),
-                                        system: job.system.clone(),
-                                        name: job.name.clone(),
-                                    })
-                            }
-                        ]])]
+                        ul![info.jobs.iter().map(|job| {
+                            let urls = crate::Urls::new(model.base_url.clone());
+                            li![a![
+                                job.system.clone(),
+                                " / ",
+                                job.name.clone(),
+                                attrs! {
+                                    At::Href => urls.job(
+                                        &handles::Job {
+                                            evaluation: model.handle.clone(),
+                                            system: job.system.clone(),
+                                            name: job.name.clone(),
+                                        })
+                                }
+                            ]]
+                        })]
                     ]
                 } else {
                     empty![]
@@ -162,7 +166,7 @@ pub fn view(model: &Model, admin: bool) -> Node<Msg> {
     model
         .error
         .as_ref()
-        .map(|err| view_error(err, Msg::ErrorIgnored))
+        .map(|err| view_error(&model.base_url, err, Msg::ErrorIgnored))
         .unwrap_or(div![
             view_evaluation(model),
             if admin { view_admin() } else { empty![] },

diff --git a/typhon-webapp/src/home.rs b/typhon-webapp/src/home.rs
@@ -1,18 +1,16 @@
-use crate::{appurl::AppUrl, perform_request, view_error};
+use crate::perform_request;
+use crate::view_error;
 use seed::{prelude::*, *};
 use typhon_types::*;
 
+struct_urls!();
+
 #[derive(Clone, Default)]
 pub struct Model {
     error: Option<responses::ResponseError>,
     projects: Vec<(String, responses::ProjectMetadata)>,
     new_project: (String, String, bool),
-}
-
-impl From<Model> for AppUrl {
-    fn from(_: Model) -> AppUrl {
-        AppUrl::default()
-    }
+    base_url: Url,
 }
 
 #[derive(Debug, Clone)]
@@ -29,9 +27,14 @@ pub enum Msg {
     UpdateNewProjectFlake,
 }
 
-pub fn init(orders: &mut impl Orders<Msg>) -> Model {
+pub fn init(base_url: Url, orders: &mut impl Orders<Msg>) -> Model {
     orders.send_msg(Msg::FetchProjects);
-    Model::default()
+    Model {
+        error: None,
+        projects: Vec::new(),
+        new_project: ("".to_string(), "".to_string(), false),
+        base_url,
+    }
 }
 
 pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
@@ -91,14 +94,17 @@ fn view_home(model: &Model, admin: bool) -> Node<Msg> {
         h2!["Projects"],
         table![
             tr![th!["Id"], th!["Name"], th!["Description"],],
-            model.projects.iter().map(|(name, meta)| tr![
-                td![a![
-                    name,
-                    attrs! { At::Href => crate::Urls::project(&handles::project(name.into())) }
-                ]],
-                td![String::from(meta.title.clone())],
-                td![String::from(meta.description.clone())],
-            ])
+            model.projects.iter().map(|(name, meta)| {
+                let urls = crate::Urls::new(model.base_url.clone());
+                tr![
+                    td![a![
+                        name,
+                        attrs! { At::Href => urls.project(&handles::project(name.into())) }
+                    ]],
+                    td![String::from(meta.title.clone())],
+                    td![String::from(meta.description.clone())],
+                ]
+            })
         ],
         admin.then(|| {
             let empty = model.new_project == <_>::default();
@@ -157,6 +163,6 @@ pub fn view(model: &Model, admin: bool) -> Node<Msg> {
     model
         .error
         .as_ref()
-        .map(|err| view_error(err, Msg::ErrorIgnored))
+        .map(|err| view_error(&model.base_url, err, Msg::ErrorIgnored))
         .unwrap_or_else(|| view_home(model, admin))
 }