mirror of
https://github.com/kremalicious/umami.git
synced 2024-11-15 09:45:04 +01:00
Merge branch 'dev' into feat/um-23-new-schema
This commit is contained in:
commit
4bc3d46efb
@ -12,17 +12,14 @@ export default function useRequireLogin() {
|
||||
async function loadUser() {
|
||||
setLoading(true);
|
||||
|
||||
const {
|
||||
ok,
|
||||
data: { user },
|
||||
} = await get('/auth/verify');
|
||||
const { ok, data } = await get('/auth/verify');
|
||||
|
||||
if (!ok) {
|
||||
await router.push('/login');
|
||||
return null;
|
||||
}
|
||||
|
||||
setUser(user);
|
||||
setUser(data.user);
|
||||
|
||||
setLoading(false);
|
||||
}
|
||||
|
@ -54,7 +54,7 @@ async function clickhouseQuery(
|
||||
const { filterQuery } = parseFilters(filters, params);
|
||||
|
||||
return rawQuery(
|
||||
`select ${field} x, count(*) y
|
||||
`select ${field} x, count(distinct session_id) y
|
||||
from event as x
|
||||
where website_id = $1
|
||||
and rev_id = $2
|
||||
|
Loading…
Reference in New Issue
Block a user