Commit Graph

299 Commits

Author SHA1 Message Date
Brian Cao
1bdaf4aca2 Always record string. 2023-07-10 15:30:34 -07:00
Mike Cao
97c57696ff Hide other reports. 2023-07-10 09:54:51 -07:00
Mike Cao
cabff7924e Show event data values. 2023-07-10 05:46:45 -07:00
Mike Cao
c865f43b11 Metrics components refactoring. New event data page. 2023-07-10 04:35:19 -07:00
Mike Cao
f9d09c8b54 Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 20:39:56 -07:00
Mike Cao
827102d907 Scaffolding for insights report. 2023-07-07 20:38:43 -07:00
Brian Cao
0a3ee2277a Fix numeric to number. 2023-07-06 21:02:56 -07:00
Mike Cao
2f4d669836 More updates to event data report. 2023-07-04 22:51:23 -07:00
Mike Cao
7c467db27e Merge remote-tracking branch 'origin/dev' into dev 2023-07-01 22:03:01 -07:00
Mike Cao
9d7862cbd6 Event data report UI. 2023-07-01 22:02:49 -07:00
Mike Cao
f8ededb31e
Merge pull request #2044 from abhilakshbansal2001/abhilaksh
Fixed user delete error 500
2023-06-30 05:45:33 -07:00
Brian Cao
414854b064 Fix funnel report. 2023-06-20 10:22:12 -07:00
Francis Cao
a00972748f remove >= website created at logic 2023-06-14 22:32:06 -07:00
Mike Cao
22d477b98b Updates to reports. 2023-06-02 23:10:59 -07:00
Brian Cao
b484286523
Feat/um 305 unique session ch (#2065)
* Add session_data / session redis to CH.

* Add mysql migration.
2023-05-31 21:46:49 -07:00
Francis Cao
0d567ebe60 Delete event_data on website reset 2023-05-29 21:19:53 -07:00
Mike Cao
bfb52eb678 Added report context. Removed report store. 2023-05-28 21:37:34 -07:00
Brian Cao
4df7d6a2a1 Add userReport api 2023-05-18 13:13:18 -07:00
Brian Cao
de509e7ccc checkpoint 2023-05-18 11:17:35 -07:00
Abhilaksh Bansal
416fee0f53 Fixed user delete error 500 2023-05-17 15:31:41 +05:30
Brian Cao
b5f84159d2 funnel checkpoint 2023-05-15 14:03:42 -07:00
Brian Cao
1130bca195 Funnel form. 2023-05-11 16:42:58 -07:00
Brian Cao
dd2db308ee Merge branch 'dev' into feat/um-285-report-schema 2023-05-08 23:47:25 -07:00
Brian Cao
d01aa5cd52 Add funnel queries 2023-05-08 23:46:58 -07:00
Mike Cao
e92d958b24 Updated redis client. Soft deletes reset username. 2023-05-05 21:16:13 -07:00
Brian Cao
9e2a478001 Add user usage. 2023-05-03 17:17:57 -07:00
Brian Cao
65ebb26a70 Fix boolean event data. 2023-04-30 22:55:54 -07:00
Francis Cao
cce966c48c Fix realtime countries / visitors 2023-04-20 12:07:04 -07:00
Mike Cao
03ba225587 More resetDate conversion. 2023-04-19 21:16:56 -07:00
Mike Cao
e63591e35d resetDate should be a Date object. 2023-04-19 21:08:52 -07:00
Francis Cao
2cd1f5541b add event type to getWebsiteStats 2023-04-19 09:13:16 -07:00
Mike Cao
43a4357729 Updated subdivision save. 2023-04-13 23:32:28 -07:00
Francis Cao
06649c2e31 at null check for subdivision save 2023-04-13 22:59:04 -07:00
Francis Cao
9dd9ab1325 concatenate subdivision saves 2023-04-13 22:40:48 -07:00
Brian Cao
0335fd3529 Remove webisite.teamId related code. Clean up queries. 2023-04-13 20:57:22 -07:00
Brian Cao
ef324fdf73 Fix update user. 2023-04-13 12:08:53 -07:00
Mike Cao
e2fcd40c2b Added SettingsTable. 2023-04-12 13:40:19 -07:00
Brian Cao
9eff565e7a Fix teamWebsite / teamUser. 2023-04-09 16:04:28 -07:00
Brian Cao
f45995e8b5 Merge remote-tracking branch 'origin/dev' into dev 2023-04-07 22:45:49 -07:00
Brian Cao
7b07de7a98 Api work for remove user. 2023-04-07 22:45:46 -07:00
Francis Cao
7a1ac22dde add referrer_domain to getEvent 2023-04-07 14:37:22 -07:00
Francis Cao
24ac7d6be0 fix urlPath clickhouse 2023-04-07 14:23:38 -07:00
Mike Cao
6424100223 Fixed typo in query. 2023-04-07 11:48:43 -07:00
Brian Cao
f4f657b666 Merge remote-tracking branch 'origin/dev' into dev 2023-04-07 11:40:30 -07:00
Brian Cao
6b0d6c0d1c Delete event_data on website reset/delete. 2023-04-07 11:40:28 -07:00
Francis Cao
05ece6a4d0 fix some components in realtime data 2023-04-06 18:31:16 -07:00
Mike Cao
2713e3316a Fixed font. 2023-04-02 10:00:28 -07:00
Mike Cao
728e4cff5b Updated queries to use cache. 2023-04-01 17:38:35 -07:00
Mike Cao
74192cd695 Refactored filter logic. 2023-04-01 15:44:30 -07:00
Brian Cao
d2687b6580 Fix metrics. 2023-03-31 14:53:48 -07:00
Mike Cao
358519dddd Removed filters from pages. 2023-03-29 23:29:37 -07:00
Brian Cao
44e6bff6b1 Remove sensitive user information. 2023-03-29 20:54:54 -07:00
Francis Cao
3b7000a436 fix active bug 2023-03-29 11:16:02 -07:00
Francis Cao
95ed8a09aa update CH event to website_event 2023-03-29 11:06:12 -07:00
Francis Cao
33bf2ccb5e add referrer to saveEvent 2023-03-28 16:34:14 -07:00
Francis Cao
4d6abc4529 remove unused ref columns 2023-03-27 15:54:37 -07:00
Francis Cao
17c8cc07e4 we Merge branch 'dev' into feat/um-209-implement-reset-date 2023-03-27 15:51:54 -07:00
Francis Cao
fbe35f4c97 fixed relational query to get reset_at 2023-03-27 12:11:06 -07:00
Francis Cao
14e4a090bb update schema and queries to implement reset_at 2023-03-27 11:25:16 -07:00
Mike Cao
cdacb640c6 Updated tracker and collect. 2023-03-26 04:15:08 -07:00
Brian Cao
9979672de5
Feat/um 202 event data new (#1841)
* Add event_data base.

* Add url_path.

* Add eventData back.

* Finish event_data relational.

* resolve comments.
2023-03-23 14:01:15 -07:00
Mike Cao
c2789d70bc Added SideNav component. 2023-03-23 11:46:49 -07:00
Francis Cao
a8cd0932d8 fixed send message for new url/referrer columns 2023-03-21 11:30:11 -07:00
Francis Cao
790e71cc14 Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-200-fix-referrer-filters 2023-03-15 16:40:13 -07:00
Mike Cao
c1d3e9ec67 Upgraded Chart.js to v4. Updated charts. 2023-03-14 22:37:50 -07:00
Francis Cao
7596f42545 update pageview, event save 2023-03-14 18:59:19 -07:00
Brian Cao
701bde53b7 Hook up teamMemberDelete and teamDelete. 2023-03-09 23:21:19 -08:00
Brian Cao
8a9532f213
Feat/um 197 hook up teams (#1825)
* Link up teams UI.

* Fix auth order.

* PR touchups.
2023-03-09 12:42:12 -08:00
Brian Cao
7b9abd72f8 Limit metrics. 2023-03-05 13:30:21 -08:00
Francis Cao
3325df0d84 Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-191-fix-redis-auth-misc-bug 2023-03-03 10:38:34 -08:00
Brian Cao
8684781624 Clean up teams on user delete. 2023-03-02 22:48:30 -08:00
Francis Cao
c9cacbb0e2 add types back to event / pageview. fix non-redis auth 2023-03-02 12:56:38 -08:00
Brian Cao
82f0bc3d2b
remove event_data. (#1804) 2023-03-01 16:42:47 -08:00
Francis Cao
a777b2916f Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-171-cloud-mode-env-variable 2023-03-01 11:40:34 -08:00
Francis Cao
93650a2f66 add pagetitle to queries 2023-03-01 10:53:57 -08:00
Mike Cao
4cb5a14de9 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-02-28 20:04:17 -08:00
Mike Cao
3ac560dc0f Added checks for CLOUD_MODE. 2023-02-28 20:04:07 -08:00
Brian Cao
84430e38eb
Check deletedAt. (#1796) 2023-02-27 16:01:34 -08:00
Mike Cao
7d3334ccce Fixed realtime logs. 2023-02-22 20:59:59 -08:00
Francis Cao
55a586fe27 add subdivision1/2, cities to query logic 2023-02-20 09:04:20 -08:00
Mike Cao
802c262cd9 Fixed realtime chart display. 2023-02-17 21:42:42 -08:00
Mike Cao
93b77672f3 More updates to realtime. 2023-02-15 02:27:18 -08:00
Francis Cao
9f8ea060b6 implement cloud mode logic 2023-02-09 10:13:50 -08:00
Mike Cao
0ce2d1fbfc Team delete functionality. 2023-02-02 11:59:38 -08:00
Mike Cao
835289a1f8 Fixed team websites query. 2023-02-02 03:30:09 -08:00
Mike Cao
22aeaf7166 Added owner column to teams table. 2023-02-02 02:54:43 -08:00
Mike Cao
e5b57f63cd Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-02-01 18:40:04 -08:00
Mike Cao
656df4f846 Update teams features. 2023-02-01 18:39:54 -08:00
Francis Cao
5fd946cfde add schema changes for TeamWebsite, update deleted logic for team tables 2023-02-01 17:08:16 -08:00
Mike Cao
7725b5c129 Refactored intl messages. 2023-01-25 07:42:46 -08:00
Brian Cao
1eb9e10d94 Re-write CH queries to use query params. 2023-01-12 00:02:12 -08:00
Brian Cao
b4bd988e4e WebsiteId query param. Fix Prisma filters. 2023-01-11 11:01:44 -08:00
Brian Cao
fcb1767eb1
Feat/um 145 re add events (#1733)
* Re-add events. Fix event_type queries.

* Re-add eventData

* revert CSS.
2023-01-05 19:39:29 -08:00
Mike Cao
796c65fa29 Updated login check method. 2023-01-04 21:20:24 -08:00
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -08:00
Brian Cao
a91386434d Remove snake_case. 2022-12-26 17:36:48 -08:00
Mike Cao
0a6ecfe3d2 Implement react-basics styles. Fix queries. 2022-12-08 23:43:43 -08:00
Mike Cao
b57ecf33e6 Updated roles and permissions logic. 2022-12-06 18:36:41 -08:00
Mike Cao
4781a0cc8c Added lib/types. 2022-12-02 14:15:24 -08:00
Brian Cao
06bebadbb9
Feat/um 114 roles and permissions (#1683)
* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions
2022-12-01 20:53:37 -08:00
Brian Cao
d5437c895e Add Role to TeamUser. 2022-11-28 13:08:48 -08:00
Brian Cao
502facd426 Allow user to be added to team with role. 2022-11-22 22:17:49 -08:00
Brian Cao
d85b2be5f8 Add event type to event. 2022-11-22 15:06:52 -08:00
Francis Cao
5da7a208a8 delete website in relational query 2022-11-21 22:51:23 -08:00
Brian Cao
8fc6e99aa8 Add user role api. 2022-11-20 22:24:31 -08:00
Brian Cao
78225691df Add permission checks. 2022-11-20 00:48:13 -08:00
Brian Cao
2e01226b46 Merge branch 'feat/um-23-new-schema' into dev 2022-11-18 18:50:11 -08:00
Brian Cao
e28ee6597a Fix Website auth. 2022-11-18 18:49:58 -08:00
Francis Cao
3eb1d783de Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-18 12:08:23 -08:00
Francis Cao
eaa208652d add clickhouse route to deleteWebsite 2022-11-18 12:08:13 -08:00
Brian Cao
ce02958bc2 Fix enum issue. 2022-11-18 11:22:03 -08:00
Mike Cao
4bc3d46efb Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 03:21:55 -08:00
Brian Cao
25279271ce Add some api/team endpoints. 2022-11-18 00:27:42 -08:00
Brian Cao
5aa8187e42 Add queries for new schema. 2022-11-17 22:27:33 -08:00
Francis Cao
e3142e93f0 get distinct sessions for session metrics 2022-11-17 18:09:03 -08:00
Brian Cao
f3726e5abf Re-add realtime data 2022-11-16 10:32:02 -08:00
Brian Cao
0aaba8cbd1 Initial Typescript models. 2022-11-15 13:21:14 -08:00
Brian Cao
30743feb0e Add Reset / Delete functionality. 2022-11-09 22:46:50 -08:00
Brian Cao
6ee27a7e53 Fix typo on getMetrics. 2022-11-09 16:10:20 -08:00
Brian Cao
4fbcf68b22 fix save event/pageview for CH 2022-11-08 17:47:19 -08:00
Brian Cao
224e9b3718 fix session get 2022-11-08 15:42:46 -08:00
Brian Cao
13fd3ccd16
api and lib fixes (#1643) 2022-11-08 11:55:02 -08:00
Mike Cao
f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Mike Cao
3485b6268b Added rev_id column. Updated redis calls. 2022-11-07 16:22:49 -08:00
Mike Cao
1075325ec5 Update website fetch and update. 2022-11-02 15:45:47 -07:00
Brian Cao
17041efaae use uuid 2022-10-31 23:42:37 -07:00
Mike Cao
d05fd2bd3d Refactor redis calls. 2022-10-25 20:17:13 -07:00
Mike Cao
8b64ef1a4e Fixed issue with accessing user dashboards. Closes #1590 2022-10-25 15:48:49 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Mike Cao
994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24:20 -07:00
Brian Cao
ba31f48f1a
Feat/um 49 query builder api (#1573)
* add uuid to event. add indexes

* eventdata api

* add event data

* remove test data

* update list
2022-10-21 21:33:23 -07:00
Mike Cao
5a4fc96ebc Refactor API authentication. 2022-10-12 13:11:44 -07:00
Brian Cao
07d003e858 fix collect 2022-10-11 23:09:06 -07:00
Brian Cao
bce4476d12 fix reset/delete 2022-10-11 19:43:02 -07:00
Brian Cao
c147742d7a use uuid 2022-10-11 19:37:38 -07:00
Brian Cao
4073d57e64 roll back id adds 2022-10-10 17:01:48 -07:00
Brian Cao
ec6454aead Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-10 16:20:07 -07:00
Brian Cao
78338205a3
Feat/um 62 prisma property names (#1562)
* checkpoint

* fix pg schema

* fix mysql schema

* change property names
2022-10-10 13:42:18 -07:00
Francis Cao
96add409b6 update api to new CH columns 2022-10-08 16:12:33 -07:00
刘岗
6f6cbaa098
Update getWebsiteByUuid.js
if redis website set from getWebsiteByUuid,the value is 1 forever
2022-10-08 13:46:50 +08:00
Mike Cao
2428314f58 Updated save method for websites. 2022-10-07 17:13:03 -07:00
Mike Cao
e442617421 Add connect methods to libraries. 2022-10-06 15:00:16 -07:00
Mike Cao
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Mike Cao
f3135ee867 Get account by uuid for cloud operations. 2022-10-04 20:16:09 -07:00
Brian Cao
78c3453639
fix clickhouse calls (#1536) 2022-09-23 22:43:51 -07:00
Francis Cao
55218d1ddd
Francis/uc 37 secure kafka (#1532)
* add ssl encryption to kafka client

* fix missing columns in getPageview CH. fix Kafka SSL Pathing
2022-09-21 11:31:52 -07:00
Brian Cao
52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
Brian Cao
99914d6e98 Add retry connection to redis. Clean up up redis/session logic 2022-09-05 22:47:45 -07:00
Brian Cao
0c33bb9e2d fix schema file. 2022-09-01 14:54:25 -07:00
Brian Cao
afe6d8994b fix redis connection. fix delete account 2022-09-01 11:11:11 -07:00