Content-Length: 5957 | pFad | http://github.com/postgresml/postgresml/pull/1194.patch

thub.com From d6e33e966c4966871aa40b770d83dc7390778169 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Mon, 27 Nov 2023 19:28:55 -0800 Subject: [PATCH 1/4] ya rly --- pgml-dashboard/src/components/navigation/tabs/mod.rs | 1 - pgml-dashboard/src/utils/config.rs | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pgml-dashboard/src/components/navigation/tabs/mod.rs b/pgml-dashboard/src/components/navigation/tabs/mod.rs index bdb089507..122d9b659 100644 --- a/pgml-dashboard/src/components/navigation/tabs/mod.rs +++ b/pgml-dashboard/src/components/navigation/tabs/mod.rs @@ -6,6 +6,5 @@ pub mod tab; pub use tab::Tab; // src/components/navigation/tabs/tabs -#[allow(clippy::module_inception)] pub mod tabs; pub use tabs::Tabs; diff --git a/pgml-dashboard/src/utils/config.rs b/pgml-dashboard/src/utils/config.rs index 8977975f6..0ae92ca7c 100644 --- a/pgml-dashboard/src/utils/config.rs +++ b/pgml-dashboard/src/utils/config.rs @@ -15,7 +15,7 @@ struct Config { deployment: String, dev_mode: bool, database_url: String, - git_sha: String, + git_sha: Option, github_stars: String, sentry_dsn: Option, signup_url: String, @@ -66,7 +66,7 @@ impl Config { Config { dev_mode, database_url: env_string_default("DATABASE_URL", "postgres://github.com/pgml"), - git_sha: env_string_required("GIT_SHA"), + git_sha: env_string_optional("GIT_SHA"), 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 Option { &CONFIG.git_sha } From 9452699869f35972cb4c5b14065927bc42dce444 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Mon, 27 Nov 2023 19:42:34 -0800 Subject: [PATCH 2/4] env! is not env::var! --- pgml-dashboard/src/components/navigation/tabs/mod.rs | 1 + pgml-dashboard/src/utils/config.rs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pgml-dashboard/src/components/navigation/tabs/mod.rs b/pgml-dashboard/src/components/navigation/tabs/mod.rs index 122d9b659..bdb089507 100644 --- a/pgml-dashboard/src/components/navigation/tabs/mod.rs +++ b/pgml-dashboard/src/components/navigation/tabs/mod.rs @@ -6,5 +6,6 @@ pub mod tab; pub use tab::Tab; // src/components/navigation/tabs/tabs +#[allow(clippy::module_inception)] pub mod tabs; pub use tabs::Tabs; diff --git a/pgml-dashboard/src/utils/config.rs b/pgml-dashboard/src/utils/config.rs index 0ae92ca7c..2d9a89882 100644 --- a/pgml-dashboard/src/utils/config.rs +++ b/pgml-dashboard/src/utils/config.rs @@ -15,7 +15,7 @@ struct Config { deployment: String, dev_mode: bool, database_url: String, - git_sha: Option, + git_sha: String, github_stars: String, sentry_dsn: Option, signup_url: String, @@ -66,7 +66,7 @@ impl Config { Config { dev_mode, database_url: env_string_default("DATABASE_URL", "postgres://github.com/pgml"), - git_sha: env_string_optional("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 Option { +pub fn git_sha<'a>() -> &'a String { &CONFIG.git_sha } From 3cd0909aa52ee4e17ce797bcfb22ce80488ff737 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Mon, 27 Nov 2023 19:45:23 -0800 Subject: [PATCH 3/4] remove dead code --- pgml-dashboard/src/utils/config.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pgml-dashboard/src/utils/config.rs b/pgml-dashboard/src/utils/config.rs index 2d9a89882..d3576f56d 100644 --- a/pgml-dashboard/src/utils/config.rs +++ b/pgml-dashboard/src/utils/config.rs @@ -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, From 35fe5a6219f247790058838c229df6eb952ab205 Mon Sep 17 00:00:00 2001 From: Montana Low Date: Mon, 27 Nov 2023 19:45:46 -0800 Subject: [PATCH 4/4] cargo fmt --- pgml-dashboard/src/utils/tabs.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pgml-dashboard/src/utils/tabs.rs b/pgml-dashboard/src/utils/tabs.rs index 7b271f00c..408eb462a 100644 --- a/pgml-dashboard/src/utils/tabs.rs +++ b/pgml-dashboard/src/utils/tabs.rs @@ -19,16 +19,17 @@ impl<'a> Tabs<'a> { ) -> anyhow::Result { 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);

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!