Montana/norly (#1194)

montanalow · montanalow · commit 259ba1310db4 · 2023-11-27T20:39:49.000-08:00
diff --git a/pgml-dashboard/src/utils/config.rs b/pgml-dashboard/src/utils/config.rs
@@ -49,8 +49,8 @@ impl Config {
             _ => "2.0K".to_string(),
         };
 
-        let css_version = env_string_default("CSS_VERSION", "");
-        let js_version = env_string_default("JS_VERSION", "1");
+        let css_version = env!("CSS_VERSION");
+        let js_version = env!("JS_VERSION");
 
         let css_extension = if dev_mode {
             "css".to_string()
@@ -66,7 +66,7 @@ impl Config {
         Config {
             dev_mode,
             database_url: env_string_default("DATABASE_URL", "postgres:///pgml"),
-            git_sha: env_string_required("GIT_SHA"),
+            git_sha: env!("GIT_SHA").to_string(),
             sentry_dsn: env_string_optional("SENTRY_DSN"),
             static_dir: env_path_default("DASHBOARD_STATIC_DIRECTORY", "static"),
             cms_dir: env_path_default("DASHBOARD_CMS_DIRECTORY", "../pgml-cms"),
@@ -92,7 +92,7 @@ pub fn database_url<'a>() -> &'a str {
     &CONFIG.database_url
 }
 
-pub fn git_sha<'a>() -> &'a str {
+pub fn git_sha<'a>() -> &'a String {
     &CONFIG.git_sha
 }
 
@@ -150,12 +150,6 @@ fn env_is_set(name: &str) -> bool {
     var(name).is_ok()
 }
 
-fn env_string_required(name: &str) -> String {
-    var(name)
-        .unwrap_or_else(|_| panic!("{} env variable is required for proper configuration", name))
-        .to_string()
-}
-
 fn env_string_default(name: &str, default: &str) -> String {
     match var(name) {
         Ok(value) => value,
diff --git a/pgml-dashboard/src/utils/tabs.rs b/pgml-dashboard/src/utils/tabs.rs
@@ -19,16 +19,17 @@ impl<'a> Tabs<'a> {
     ) -> anyhow::Result<Self> {
         let default = match default {
             Some(default) => default,
-            _ => tabs
-                .get(0)
-                .ok_or(anyhow!("There must be at least one tab."))?
-                .name,
+            _ => {
+                tabs.get(0)
+                    .ok_or(anyhow!("There must be at least one tab."))?
+                    .name
+            }
         };
 
         let active = active
             .and_then(|name| {
                 let found = tabs.iter().find(|tab| tab.name == name);
-                
+
                 found.map(|tab| tab.name)
             })
             .unwrap_or(default);
