Skip to content

Commit 5d37810

Browse files
mikecaomikecao
authored
Merge pull request #2903 from umami-software/dev
v2.13.1
2 parents 47a6170 + bba584a commit 5d37810

12 files changed

Lines changed: 75 additions & 52 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "umami",
3-
"version": "2.13.0",
3+
"version": "2.13.1",
44
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
55
"author": "Umami Software, Inc. <hello@umami.is>",
66
"license": "MIT",

‎public/intl/messages/ca-ES.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@
476476
"label.first-seen": [
477477
{
478478
"type": 0,
479-
"value": "First seen"
479+
"value": "Vist per primer cop"
480480
}
481481
],
482482
"label.funnel": [
@@ -656,7 +656,7 @@
656656
"label.last-seen": [
657657
{
658658
"type": 0,
659-
"value": "Last seen"
659+
"value": "Vist per últim cop"
660660
}
661661
],
662662
"label.leave": [
@@ -876,13 +876,13 @@
876876
"label.path": [
877877
{
878878
"type": 0,
879-
"value": "Path"
879+
"value": "Camí"
880880
}
881881
],
882882
"label.paths": [
883883
{
884884
"type": 0,
885-
"value": "Paths"
885+
"value": "Camins"
886886
}
887887
],
888888
"label.powered-by": [
@@ -922,7 +922,7 @@
922922
"label.properties": [
923923
{
924924
"type": 0,
925-
"value": "Properties"
925+
"value": "Propietats"
926926
}
927927
],
928928
"label.property": [
@@ -1042,19 +1042,19 @@
10421042
"label.revenue": [
10431043
{
10441044
"type": 0,
1045-
"value": "Revenue"
1045+
"value": "Ingressos"
10461046
}
10471047
],
10481048
"label.revenue-description": [
10491049
{
10501050
"type": 0,
1051-
"value": "Look into your revenue across time."
1051+
"value": "Observi els seus ingressos al llarg del temps."
10521052
}
10531053
],
10541054
"label.revenue-property": [
10551055
{
10561056
"type": 0,
1057-
"value": "Revenue Property"
1057+
"value": "Propietat d'Ingressos"
10581058
}
10591059
],
10601060
"label.role": [
@@ -1114,7 +1114,7 @@
11141114
"label.session": [
11151115
{
11161116
"type": 0,
1117-
"value": "Session"
1117+
"value": "Sessió"
11181118
}
11191119
],
11201120
"label.sessions": [
@@ -1180,7 +1180,7 @@
11801180
"label.team-manager": [
11811181
{
11821182
"type": 0,
1183-
"value": "Team manager"
1183+
"value": "Responsable d'Equip"
11841184
}
11851185
],
11861186
"label.team-member": [
@@ -1288,7 +1288,7 @@
12881288
"label.transactions": [
12891289
{
12901290
"type": 0,
1291-
"value": "Transactions"
1291+
"value": "Transaccions"
12921292
}
12931293
],
12941294
"label.transfer": [
@@ -1330,7 +1330,7 @@
13301330
"label.uniqueCustomers": [
13311331
{
13321332
"type": 0,
1333-
"value": "Unique Customers"
1333+
"value": "Clients Únics"
13341334
}
13351335
],
13361336
"label.unknown": [
@@ -1372,7 +1372,7 @@
13721372
"label.user-property": [
13731373
{
13741374
"type": 0,
1375-
"value": "User Property"
1375+
"value": "Propietat d'Usuari"
13761376
}
13771377
],
13781378
"label.username": [

‎src/components/hooks/queries/useRealtime.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
import { useTimezone } from 'components/hooks';
2+
import { REALTIME_INTERVAL } from 'lib/constants';
13
import { RealtimeData } from 'lib/types';
24
import { useApi } from './useApi';
3-
import { REALTIME_INTERVAL } from 'lib/constants';
45

56
export function useRealtime(websiteId: string) {
67
const { get, useQuery } = useApi();
8+
const { timezone } = useTimezone();
79
const { data, isLoading, error } = useQuery<RealtimeData>({
8-
queryKey: ['realtime', websiteId],
10+
queryKey: ['realtime', { websiteId, timezone }],
911
queryFn: async () => {
10-
return get(`/realtime/${websiteId}`);
12+
return get(`/realtime/${websiteId}`, { timezone });
1113
},
1214
enabled: !!websiteId,
1315
refetchInterval: REALTIME_INTERVAL,

‎src/lang/ca-ES.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"label.filter-combined": "Combinat",
7979
"label.filter-raw": "En cru",
8080
"label.filters": "Filtres",
81-
"label.first-seen": "First seen",
81+
"label.first-seen": "Vist per primer cop",
8282
"label.funnel": "Embut",
8383
"label.funnel-description": "Entengui la taxa de conversió i abandonament dels usuaris.",
8484
"label.goal": "Meta",
@@ -104,7 +104,7 @@
104104
"label.last-days": "Últims {x} dies",
105105
"label.last-hours": "Últimes {x} hores",
106106
"label.last-months": "Últims {x} mesos",
107-
"label.last-seen": "Last seen",
107+
"label.last-seen": "Vist per últim cop",
108108
"label.leave": "Abandonar",
109109
"label.leave-team": "Abandonar equip",
110110
"label.less-than": "Menor que",
@@ -134,14 +134,14 @@
134134
"label.pageTitle": "Títol de la pàgina",
135135
"label.pages": "Pàgines",
136136
"label.password": "Contrasenya",
137-
"label.path": "Path",
138-
"label.paths": "Paths",
137+
"label.path": "Camí",
138+
"label.paths": "Camins",
139139
"label.powered-by": "Funciona amb {name}",
140140
"label.previous": "Anterior",
141141
"label.previous-period": "Període anterior",
142142
"label.previous-year": "Any anterior",
143143
"label.profile": "Perfil",
144-
"label.properties": "Properties",
144+
"label.properties": "Propietats",
145145
"label.property": "Propietat",
146146
"label.queries": "Consultes",
147147
"label.query": "Consulta",
@@ -161,9 +161,9 @@
161161
"label.reset-website": "Restableix estadístiques",
162162
"label.retention": "Retenció",
163163
"label.retention-description": "Mesuri la retenció del seu lloc web fent un seguiment de la freqüència amb què tornen els usuaris.",
164-
"label.revenue": "Revenue",
165-
"label.revenue-description": "Look into your revenue across time.",
166-
"label.revenue-property": "Revenue Property",
164+
"label.revenue": "Ingressos",
165+
"label.revenue-description": "Observi els seus ingressos al llarg del temps.",
166+
"label.revenue-property": "Propietat d'Ingressos",
167167
"label.role": "Rol",
168168
"label.run-query": "Executar consulta",
169169
"label.save": "Desa",
@@ -173,7 +173,7 @@
173173
"label.select-date": "Seleccionar data",
174174
"label.select-role": "Seleccionar rol",
175175
"label.select-website": "Seleccionar lloc web",
176-
"label.session": "Session",
176+
"label.session": "Sessió",
177177
"label.sessions": "Sessions",
178178
"label.settings": "Configuració",
179179
"label.share-url": "Enllaç per compartir",
@@ -184,7 +184,7 @@
184184
"label.tablet": "Tauleta",
185185
"label.team": "Equip",
186186
"label.team-id": "ID del equip",
187-
"label.team-manager": "Team manager",
187+
"label.team-manager": "Responsable d'Equip",
188188
"label.team-member": "Membre de l'equip",
189189
"label.team-name": "Nom de l'equip",
190190
"label.team-owner": "Propietari de l'equip",
@@ -202,21 +202,21 @@
202202
"label.total": "Total",
203203
"label.total-records": "Total de registres",
204204
"label.tracking-code": "Codi de seguiment",
205-
"label.transactions": "Transactions",
205+
"label.transactions": "Transaccions",
206206
"label.transfer": "Transferir",
207207
"label.transfer-website": "Transferir lloc web",
208208
"label.true": "Cert",
209209
"label.type": "Tipus",
210210
"label.unique": "Únic",
211211
"label.unique-visitors": "Visitants únics",
212-
"label.uniqueCustomers": "Unique Customers",
212+
"label.uniqueCustomers": "Clients Únics",
213213
"label.unknown": "Desconegut",
214214
"label.untitled": "Sense títol",
215215
"label.update": "Actualitzar",
216216
"label.url": "URL",
217217
"label.urls": "URLs",
218218
"label.user": "Usuari",
219-
"label.user-property": "User Property",
219+
"label.user-property": "Propietat d'Usuari",
220220
"label.username": "Nom d'usuari",
221221
"label.users": "Usuaris",
222222
"label.utm": "UTM",

‎src/lib/prisma.ts‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@ import { filtersToArray } from './params';
1212
const log = debug('umami:prisma');
1313

1414
const MYSQL_DATE_FORMATS = {
15-
minute: '%Y-%m-%dT%H:%i:00Z',
16-
hour: '%Y-%m-%dT%H:00:00Z',
17-
day: '%Y-%m-%dT00:00:00Z',
18-
month: '%Y-%m-01T00:00:00Z',
19-
year: '%Y-01-01T00:00:00Z',
15+
minute: '%Y-%m-%dT%H:%i:00',
16+
hour: '%Y-%m-%d %H:00:00',
17+
day: '%Y-%m-%d',
18+
month: '%Y-%m-01',
19+
year: '%Y-01-01',
20+
};
21+
22+
const POSTGRESQL_DATE_FORMATS = {
23+
minute: 'YYYY-MM-DD HH24:MI:00',
24+
hour: 'YYYY-MM-DD HH24:00:00',
25+
day: 'YYYY-MM-DD',
26+
month: 'YYYY-MM-01',
27+
year: 'YYYY-01-01',
2028
};
2129

2230
function getAddIntervalQuery(field: string, interval: string): string {
@@ -60,31 +68,30 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
6068

6169
if (db === POSTGRESQL) {
6270
if (timezone) {
63-
return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
71+
return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
6472
}
65-
return `date_trunc('${unit}', ${field})`;
73+
return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
6674
}
6775

6876
if (db === MYSQL) {
6977
if (timezone) {
7078
const tz = moment.tz(timezone).format('Z');
71-
7279
return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
7380
}
74-
7581
return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
7682
}
7783
}
7884

79-
function getDateWeeklySQL(field: string) {
85+
function getDateWeeklySQL(field: string, timezone?: string) {
8086
const db = getDatabaseType();
8187

8288
if (db === POSTGRESQL) {
83-
return `concat(extract(dow from ${field}), ':', to_char(${field}, 'HH24'))`;
89+
return `concat(extract(dow from (${field} at time zone '${timezone}')), ':', to_char((${field} at time zone '${timezone}'), 'HH24'))`;
8490
}
8591

8692
if (db === MYSQL) {
87-
return `date_format(${field}, '%w:%H')`;
93+
const tz = moment.tz(timezone).format('Z');
94+
return `date_format(convert_tz(${field},'+00:00','${tz}'), '%w:%H')`;
8895
}
8996
}
9097

‎src/pages/api/realtime/[websiteId].ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ import { methodNotAllowed, ok, unauthorized } from 'next-basics';
77
import { getRealtimeData } from 'queries';
88
import * as yup from 'yup';
99
import { REALTIME_RANGE } from 'lib/constants';
10+
import { TimezoneTest } from 'lib/yup';
1011

1112
export interface RealtimeRequestQuery {
1213
websiteId: string;
14+
timezone?: string;
1315
}
1416

1517
const schema = {
1618
GET: yup.object().shape({
1719
websiteId: yup.string().uuid().required(),
20+
timezone: TimezoneTest,
1821
}),
1922
};
2023

@@ -23,15 +26,15 @@ export default async (req: NextApiRequestQueryBody<RealtimeRequestQuery>, res: N
2326
await useValidate(schema, req, res);
2427

2528
if (req.method === 'GET') {
26-
const { websiteId } = req.query;
29+
const { websiteId, timezone } = req.query;
2730

2831
if (!(await canViewWebsite(req.auth, websiteId))) {
2932
return unauthorized(res);
3033
}
3134

3235
const startDate = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
3336

34-
const data = await getRealtimeData(websiteId, { startDate });
37+
const data = await getRealtimeData(websiteId, { startDate, timezone });
3538

3639
return ok(res, data);
3740
}

‎src/pages/api/websites/[websiteId]/sessions/weekly.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ import { NextApiResponse } from 'next';
66
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
77
import { pageInfo } from 'lib/schema';
88
import { getWebsiteSessionsWeekly } from 'queries';
9+
import { TimezoneTest } from 'lib/yup';
910

1011
export interface ReportsRequestQuery extends PageParams {
1112
websiteId: string;
13+
timezone?: string;
1214
}
1315

1416
const schema = {
1517
GET: yup.object().shape({
1618
websiteId: yup.string().uuid().required(),
1719
startAt: yup.number().integer().required(),
1820
endAt: yup.number().integer().min(yup.ref('startAt')).required(),
21+
timezone: TimezoneTest,
1922
...pageInfo,
2023
}),
2124
};
@@ -28,7 +31,7 @@ export default async (
2831
await useAuth(req, res);
2932
await useValidate(schema, req, res);
3033

31-
const { websiteId, startAt, endAt } = req.query;
34+
const { websiteId, startAt, endAt, timezone } = req.query;
3235

3336
if (req.method === 'GET') {
3437
if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -38,7 +41,7 @@ export default async (
3841
const startDate = new Date(+startAt);
3942
const endDate = new Date(+endAt);
4043

41-
const data = await getWebsiteSessionsWeekly(websiteId, { startDate, endDate });
44+
const data = await getWebsiteSessionsWeekly(websiteId, { startDate, endDate, timezone });
4245

4346
return ok(res, data);
4447
}

‎src/queries/analytics/getRealtimeData.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getRealtimeActivity, getPageviewStats, getSessionStats } from 'queries/index';
1+
import { getPageviewStats, getRealtimeActivity, getSessionStats } from 'queries/index';
22

33
function increment(data: object, key: string) {
44
if (key) {
@@ -10,9 +10,12 @@ function increment(data: object, key: string) {
1010
}
1111
}
1212

13-
export async function getRealtimeData(websiteId: string, criteria: { startDate: Date }) {
14-
const { startDate } = criteria;
15-
const filters = { startDate, endDate: new Date(), unit: 'minute' };
13+
export async function getRealtimeData(
14+
websiteId: string,
15+
criteria: { startDate: Date; timezone: string },
16+
) {
17+
const { startDate, timezone } = criteria;
18+
const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
1619
const [activity, pageviews, sessions] = await Promise.all([
1720
getRealtimeActivity(websiteId, filters),
1821
getPageviewStats(websiteId, filters),

‎src/queries/analytics/pageviews/getPageviewStats.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
3131
and event_type = {{eventType}}
3232
${filterQuery}
3333
group by 1
34+
order by 1
3435
`,
3536
params,
3637
);

0 commit comments

Comments
 (0)