Commit Graph

169 Commits (39cafafd76a39fbe399867b9303640a04b05c4ce)

Author SHA1 Message Date
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
Brian Cao 7c05a54ffe allow event data CH 2022-08-30 17:29:30 -07:00
Brian Cao f3312732dc fix redis.client call 2022-08-30 15:54:33 -07:00
Brian Cao 92acd8c1a7 fix CH query 2022-08-29 13:32:30 -07:00
Brian Cao b6cd9f305b add db call as fallback 2022-08-29 13:04:58 -07:00
Brian Cao 48fe6ebcc5 configure redis 2022-08-29 10:47:01 -07:00
Mike Cao 5f07cecc95 Rename method to transaction. 2022-08-29 00:02:38 -07:00
Mike Cao 467c7f289f Database refactoring. 2022-08-27 21:38:35 -07:00
Brian Cao 54ade11a98 fix send message. look at redis on session create 2022-08-26 21:10:46 -07:00
Brian Cao 818f8721e9 redis checkpoint 2022-08-26 20:21:53 -07:00
Brian Cao f499af5491 fix refs 2022-08-25 22:43:22 -07:00
Brian Cao 7e9ed704cc fix ref 2022-08-25 22:23:19 -07:00
Brian Cao c811577460 fix folders 2022-08-25 22:20:30 -07:00
Brian Cao bb50753704 split db files 2022-08-25 22:04:32 -07:00
Brian Cao 46b4b98d40 update kafka messaging 2022-08-25 11:07:47 -07:00
Mike Cao f75603025c
Merge pull request #1453 from umami-software/francis/uc-24-kafka-test
Francis/uc 24 kafka test
2022-08-23 02:08:36 -05:00
Brian Cao 18b7fc8626 fix dupes 2022-08-22 23:18:48 -07:00
Brian Cao 3003371752 remove cascading delete 2022-08-17 17:35:52 -07:00
Francis Cao e12d25677d update kafka saves 2022-08-12 10:34:34 -07:00
Francis Cao 085b6b4071 fix event metrics 2022-08-09 00:43:47 -07:00
Francis Cao 55ba7d95ab fix clickhouse date timezone issues 2022-08-08 22:09:18 -07:00
Francis Cao fc3c39be3c Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-08 08:36:21 -07:00
Mike Cao 89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Francis Cao 1a84608e2b add Clickhouse migration files. update saveEvent to include event_uuid 2022-08-04 20:15:21 -07:00
Francis Cao 1ffd5775f8 Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-04 17:48:00 -07:00
Francis Cao 1ab1e58cb1 create kafka save queries 2022-08-04 17:43:47 -07:00
Mike Cao df1c203c38
Merge pull request #1376 from umami-software/brian/um-24-event-data
Brian/um 24 event data
2022-08-01 23:50:08 -05:00
Brian Cao daf3978970 address PR comments. line up PSQL / MYSQL 2022-08-01 20:50:14 -07:00
Mike Cao b04e03b4d3
Merge pull request #1356 from biqette/master
Fix UTM request
2022-08-01 20:42:56 -05:00
Francis Cao d952214536 check in producer test logic 2022-08-01 00:28:38 -07:00
Brian Cao 8f934c7e6c checkpoint 2022-07-29 22:30:09 -07:00