Commit graph

125 commits

Author SHA1 Message Date
Mike Cao
1def80ba42 Merge remote-tracking branch 'origin/dev' into dev
Some checks are pending
Create docker images / Build, push, and deploy (push) Waiting to run
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
2025-10-02 16:57:23 -07:00
Mike Cao
da572864ac Added more function names to queries. 2025-10-02 16:56:56 -07:00
Francis Cao
1809959b99 fix event type queries for pixels/links. remove hardcoded event types 2025-10-01 12:29:31 -07:00
Mike Cao
581ddc0233 Merge remote-tracking branch 'origin/dev' into dev
Some checks are pending
Create docker images / Build, push, and deploy (push) Waiting to run
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
2025-09-30 16:18:48 -07:00
Mike Cao
8a977b0164 Updated pixel/link endpoints. Added name to rawQuery. 2025-09-30 16:11:21 -07:00
Francis Cao
89d3cd4f5a add timezone to revenue chartData. Fix min/max date for 7day value 2025-09-30 13:11:11 -07:00
Francis Cao
bf99068bd7 Remove tables result set from getRevenue. Fix min/max date for revenuechart 2025-09-30 12:03:15 -07:00
Mike Cao
b9fbbc6453 Split queries into prisma and sql.
Some checks are pending
Create docker images / Build, push, and deploy (push) Waiting to run
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
2025-09-29 16:55:07 -07:00
Francis Cao
9d49eaebac fix cohort query for retention report, add filters to weekly traffic route 2025-09-24 10:06:34 -07:00
Mike Cao
04c06443a8 Merge branch 'master' into dev
# Conflicts:
#	.github/workflows/ci.yml
#	src/lang/es-ES.json
#	src/lang/sl-SI.json
#	src/lib/constants.ts
#	src/lib/detect.ts
#	src/queries/sql/reports/getRevenue.ts
2025-09-16 21:11:12 -07:00
Mike Cao
433ce98719 Allow getting team websites. 2025-09-12 08:21:29 -07:00
Mike Cao
e610de383a Fix for schema selection in pg adapter.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
2025-09-11 12:37:24 -07:00
Francis Cao
f3125c2add clean up funnel migration and report errors 2025-09-10 16:38:51 -07:00
Mike Cao
56af91950a Updated components build. 2025-09-01 15:59:06 -07:00
Mike Cao
bab4f8ebcc Cohort selection. 2025-08-28 23:29:42 -07:00
Mike Cao
08f9adaddf Updated expanded view. Some style fixes. 2025-08-23 03:05:21 -07:00
Mike Cao
c8fe93dd9d Refactored tables. 2025-08-23 01:12:37 -07:00
Francis Cao
2f1f704728 implement filtering and cohorts to all relevant queries 2025-08-19 15:26:41 -07:00
Mike Cao
0ac8bd41b6 Pixel route. 2025-08-18 15:49:10 -07:00
Mike Cao
3c5c1e48e9 Refactored settings. Updated sidebar. 2025-08-15 22:16:28 -07:00
Mike Cao
d130242a0a Pixel editing. 2025-08-15 13:04:13 -07:00
Francis Cao
69aa4ca035 cleanup cohort/filtering for some queries 2025-08-12 16:13:44 -07:00
Francis Cao
6829d96862 update UTM report to use new UTM columns 2025-08-12 11:30:46 -07:00
Francis Cao
38f251ead5 finish expanded queries and ui. 2025-08-07 09:47:18 -07:00
Francis Cao
0a0c1f27c6 implement pageviews, events, and channels queries 2025-08-05 00:37:44 -07:00
Francis Cao
c1cad16cb9 implement sessions metric expanded queries 2025-08-04 18:27:31 -07:00
Francis Cao
c8b4ee8ca5 update psql getChannelMetrics 2025-07-31 09:45:19 -07:00
Mike Cao
554c627a58 Merge branch 'dev' into jajaja
# Conflicts:
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/queries/sql/getChannelMetrics.ts
2025-07-29 19:15:55 -07:00
Francis Cao
86e0fc2262 convert clickhouse getChannels to SQL query 2025-07-28 17:13:13 -07:00
Mike Cao
45c9ea9c22 Merge branch 'dev' into jajaja
# Conflicts:
#	db/mysql/schema.prisma
#	package.json
#	pnpm-lock.yaml
#	src/app/(main)/reports/[reportId]/ReportBody.tsx
#	src/app/(main)/reports/[reportId]/ReportPage.tsx
#	src/app/(main)/reports/utm/UTMView.tsx
#	src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
#	src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
#	src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
#	src/app/api/reports/[reportId]/route.ts
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/components/hooks/queries/useReport.ts
#	src/components/icons.ts
#	src/components/messages.ts
#	src/components/metrics/MetricsTable.module.css
#	src/components/metrics/MetricsTable.tsx
#	src/queries/sql/events/getEventMetrics.ts
#	src/queries/sql/reports/getUTM.ts
2025-07-23 23:39:28 -07:00
Francis Cao
e8ff32b063 Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2025-07-23 09:38:59 -07:00
Francis Cao
2203ba1fe7 move parseParameters to UTMView 2025-07-23 09:38:39 -07:00
Francis Cao
4dd4d66a3b Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2025-07-21 10:56:08 -07:00
Francis Cao
a81b144cd6 fix get event metrics card and create it's own query 2025-07-21 10:49:48 -07:00
Mike Cao
25f96f6b6b Fixed nav display. 2025-07-20 00:38:15 -07:00
Mike Cao
2f7f8911cd Merge branch 'dev' into jajaja
# Conflicts:
#	pnpm-lock.yaml
#	src/queries/sql/getWebsiteStats.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/sessions/getWebsiteSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
#	src/queries/sql/sessions/getWebsiteSessionsWeekly.ts
2025-07-18 10:13:21 -07:00
Francis Cao
90682b79d2 Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2025-07-17 11:22:21 -07:00
Mike Cao
01bfd7f52e New properties screens. New website nav. 2025-07-17 01:18:31 -07:00
Francis Cao
954404f8df route to view or raw table based on filters 2025-07-15 16:26:03 -07:00
Mike Cao
a9a9b57f80 Merge branch 'dev' into jajaja
# Conflicts:
#	pnpm-lock.yaml
#	src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
#	src/components/messages.ts
#	src/lib/constants.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
2025-07-15 13:01:50 -07:00
Mike Cao
5e6799a715 Fixed properties queries. 2025-07-15 01:31:08 -07:00
Francis Cao
2dcb9e21bd change pagestable to visitors and update clickhouse hostname column to array 2025-07-13 22:44:09 -07:00
Mike Cao
465a03f987 Fixed paging in events/sessions. 2025-07-13 21:10:59 -07:00
Mike Cao
8c26e310f7 Fixed editing and navigation issues. 2025-07-13 00:37:43 -07:00
Mike Cao
bf6c9395c6 Revert Prisma build. 2025-07-12 15:18:01 -07:00
Mike Cao
87449ece9e Merge branch 'dev' into jajaja
# Conflicts:
#	db/postgresql/schema.prisma
#	pnpm-lock.yaml
#	src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
#	src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
#	src/app/api/reports/route.ts
#	src/app/api/websites/[websiteId]/events/series/route.ts
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/app/api/websites/[websiteId]/pageviews/route.ts
#	src/app/api/websites/[websiteId]/sessions/stats/route.ts
#	src/app/api/websites/[websiteId]/stats/route.ts
#	src/app/api/websites/[websiteId]/values/route.ts
#	src/components/hooks/useFields.ts
#	src/components/hooks/useFilterParams.ts
#	src/lang/vi-VN.json
#	src/lib/clickhouse.ts
#	src/lib/detect.ts
#	src/lib/prisma.ts
#	src/lib/request.ts
#	src/lib/schema.ts
#	src/lib/types.ts
#	src/queries/sql/events/getEventDataFields.ts
#	src/queries/sql/events/getEventDataProperties.ts
#	src/queries/sql/events/getEventDataStats.ts
#	src/queries/sql/events/getEventDataValues.ts
#	src/queries/sql/events/getEventMetrics.ts
#	src/queries/sql/events/getWebsiteEvents.ts
#	src/queries/sql/getChannelMetrics.ts
#	src/queries/sql/getRealtimeActivity.ts
#	src/queries/sql/getWebsiteStats.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/pageviews/getPageviewStats.ts
#	src/queries/sql/reports/getBreakdown.ts
#	src/queries/sql/sessions/getSessionDataProperties.ts
#	src/queries/sql/sessions/getSessionDataValues.ts
#	src/queries/sql/sessions/getSessionMetrics.ts
#	src/queries/sql/sessions/getSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
2025-07-08 22:03:55 -07:00
Mike Cao
cdf391d5c2 Refactor part 2: Electric Boogaloo. Standardize way of passing filter parameters. 2025-07-04 01:23:11 -07:00
Francis Cao
e75d009df3 implement cohorts to clickhouse/pg library and all relevant queries 2025-07-03 12:06:49 -07:00
Mike Cao
ee6c68d27c Refactor filter handling for queries. 2025-07-02 01:44:12 -07:00
Mike Cao
8b64029409 Made filters work for all reports. 2025-06-29 23:57:11 -07:00