feat: new settings ui

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

Cargo.lock

@@ -14,34 +14,34 @@ name="liwan"
 path="src/main.rs"
 
 [dependencies]
+# async/concurrency
 tokio={version="1.38", default-features=false, features=["rt-multi-thread"]}
 tokio-util={version="0.7", features=["io"]}
 futures-util="0.3"
-
+crossbeam="0.8"
 
 # encoding
 hex={version="0.4"}
-bs58="0.5.1"
+bs58="0.5"
 serde={version="1.0", features=["derive"]}
 serde_json={version="1.0"}
 md-5="0.10"
+async-compression="0.4"
+tokio-tar={package="krata-tokio-tar", version="0.4"}
+sha3={version="0.10"}
+argon2={version="0.5"}
 
-# utils
-cached="0.53"
+# general
 argh={version="0.1"}
 eyre={version="0.6"}
 rand={version="0.8"}
-time={version="0.3"}
+cached="0.53"
 itertools={version="0.13"}
+time={version="0.3"}
 colored={version="2.1"}
 figment={version="0.10", features=["toml", "env"]}
-sha3={version="0.10"}
-argon2={version="0.5"}
-crossbeam="0.8"
 tracing="0.1"
 tracing-subscriber={version="0.3", features=["env-filter"]}
-async-compression="0.4.12"
-tokio-tar={package="krata-tokio-tar", version="0.4.0"}
 
 # web
 poem={version="3.1", default-features=false, features=[
@@ -52,12 +52,11 @@ poem={version="3.1", default-features=false, features=[
     "compression",
     "tower-compat",
 ]}
-
-poem-openapi={version="5.0", default-features=false, features=["time"]}
+poem-openapi={version="5.1", default-features=false, features=["time"]}
 tower={version="0.5", default-features=false, features=["limit"]}
 uaparser="0.6"
 mime_guess={version="2.0"}
-rust-embed="8.4"
+rust-embed="8.5"
 reqwest={version="0.12", default-features=false, features=[
     "json",
     "stream",
@@ -73,7 +72,7 @@ duckdb={version="1.0", git="https://github.com/explodingcamera/duckdb-rs", featu
 ]}
 rusqlite={version="0.32", features=["bundled", "time"]}
 r2d2={version="0.8"}
-r2d2_sqlite="0.25.0"
+r2d2_sqlite="0.25"
 refinery={version="0.8"}
 refinery-core="0.8"
 maxminddb={version="0.24", optional=true}

Cargo.toml

@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 use std::fmt::{Debug, Display};
 
 use crate::app::DuckDBConn;
-use crate::utils::validate;
 use crate::web::routes::dashboard::GraphValue;
 use duckdb::{params_from_iter, ToSql};
 use eyre::Result;
@@ -364,11 +363,6 @@ pub fn dimension_report(
     filters: &[DimensionFilter],
     metric: &Metric,
 ) -> Result<ReportTable> {
-    // recheck the validity of the entity IDs to be super sure there's no SQL injection
-    if !entities.iter().all(|entity| validate::is_valid_id(entity.as_ref())) {
-        return Err(eyre::eyre!("Invalid entity ID"));
-    }
-
     let mut params: Vec<Box<dyn ToSql>> = Vec::new();
     let entity_vars = repeat_vars(entities.len());
     let (filters_sql, filters_params) = filter_sql(filters)?;

PLANS.md

@@ -178,7 +178,7 @@ impl AdminAPI {
         Data(app): Data<&Liwan>,
         SessionUser(session_user): SessionUser,
     ) -> ApiResult<EmptyResponse> {
-        if session_user.role != UserRole::Admin {
+        if session_user.role != UserRole::Admin || username != session_user.username {
             http_bail!(StatusCode::FORBIDDEN, "Forbidden")
         }
 

cliff.toml

@@ -37,7 +37,7 @@
 		"@types/react": "^18.3.5",
 		"@types/react-dom": "^18.3.0",
 		"@types/react-simple-maps": "^3.0.6",
-		"astro": "^4.15.4",
+		"astro": "^4.15.6",
 		"bun-types": "^1.1.27",
 		"rollup-plugin-license": "^3.5.2",
 		"typescript": "^5.6.2"

src/app/core/reports.rs

@@ -17,5 +17,14 @@ export function useQuery<
 	TData = TQueryFnData,
 	TQueryKey extends QueryKey = QueryKey,
 >(options: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, c?: QueryClient): UseQueryResult<TData, TError> {
-	return _useQuery(options, c || queryClient);
+	return _useQuery(
+		{
+			enabled(query) {
+				if (typeof window === "undefined") return false;
+				return typeof options.enabled === "function" ? options.enabled(query) : (options.enabled ?? true);
+			},
+			...options,
+		},
+		c || queryClient,
+	);
 }

src/web/routes/admin.rs

@@ -11,6 +11,18 @@
 .new {
   padding: 0.4rem 0.5rem;
   height: fit-content;
+  animation: newLoad 0.4s ease;
+}
+
+@keyframes newLoad {
+  from {
+    opacity: 0;
+    transform: translateY(0.2rem);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
 .danger {