diff --git a/backend/windmill-common/src/db.rs b/backend/windmill-common/src/db.rs index eea9a12802..8c80dcaf96 100644 --- a/backend/windmill-common/src/db.rs +++ b/backend/windmill-common/src/db.rs @@ -80,6 +80,15 @@ impl UserDB { let mut folders_read = folders_read.clone(); folders_read.extend(folders_write.clone()); + tracing::debug!( + "Setting role to {} {:?} {:?} {:?} {:?}", + user, + authed.username(), + authed.groups(), + folders_read, + folders_write + ); + let mut tx = self.db.begin().await?; sqlx::query(&format!("SET LOCAL ROLE {}", user)) diff --git a/backend/windmill-common/src/stats.rs b/backend/windmill-common/src/stats.rs index b79c0a21eb..b18fb95918 100644 --- a/backend/windmill-common/src/stats.rs +++ b/backend/windmill-common/src/stats.rs @@ -104,7 +104,7 @@ pub async fn send_stats( let uid = get_uid(db).await?; let jobs_usage = sqlx::query_as::<_, JobsUsage>( - "SELECT language, COUNT(*) as count, SUM(duration_ms)::BIGINT as total_duration FROM completed_job GROUP BY language", + "SELECT language, COUNT(*) as count, SUM(duration_ms)::BIGINT as total_duration FROM completed_job WHERE started_at > NOW() - INTERVAL '4 weeks' GROUP BY language LIMIT 100000", ) .fetch_all(db) .await?; diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs index 0c14d41fe0..a7420fedbe 100644 --- a/backend/windmill-worker/src/worker.rs +++ b/backend/windmill-worker/src/worker.rs @@ -1342,7 +1342,7 @@ pub async fn run_worker { add_time!(timing, loop_start, "post pull"); - tracing::debug!("pulled job: {:?}", job.as_ref().ok().and_then(|x| x.as_ref().map(|y| y.id))); + // tracing::debug!("pulled job: {:?}", job.as_ref().ok().and_then(|x| x.as_ref().map(|y| y.id))); let duration_pull_s = timer.elapsed().as_secs_f64(); let err_pull = job.is_ok(); let empty = job.as_ref().is_ok_and(|x| x.is_none()); diff --git a/frontend/src/lib/components/apps/components/display/table/AppTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppTable.svelte index 19d641a239..ca7d8f60a9 100644 --- a/frontend/src/lib/components/apps/components/display/table/AppTable.svelte +++ b/frontend/src/lib/components/apps/components/display/table/AppTable.svelte @@ -103,7 +103,6 @@ let selectedRowIndex = -1 function toggleRow(row: Record, force: boolean = false) { - console.log(row) let data = { ...row.original } let index = data['__index'] delete data['__index'] @@ -141,9 +140,10 @@ if (searchValue === '') { return result } - return result.filter((row) => - Object.values(row).some((value) => value?.toString()?.includes(searchValue)) - ) + return result.filter((row) => { + // console.log(Object.values(row).map((value) => value?.toString())) + return Object.values(row).some((value) => value?.toString()?.includes(searchValue)) + }) } function renderCell(x: any, props: any): any { @@ -157,6 +157,7 @@ let filteredResult: Array> = [] function setFilteredResult() { + console.log('setting filtered result') const wIndex = Array.isArray(result) ? (result as any[]).map((x, i) => ({ ...x, __index: i })) : [{ error: 'input was not an array' }] diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts index fe83e0f3dc..a19d29ded1 100644 --- a/frontend/src/lib/utils.ts +++ b/frontend/src/lib/utils.ts @@ -470,7 +470,7 @@ export function addWhitespaceBeforeCapitals(word?: string): string { } export function isObject(obj: any) { - return typeof obj === 'object' + return obj != null && typeof obj === 'object' } export function debounce(func: (...args: any[]) => any, wait: number) {