Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.37.0 #1387

Merged
merged 67 commits into from
Aug 9, 2022
Merged

v1.37.0 #1387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift click to select a range
70c6211
Add draggable rows to table component
cywio Jul 24, 2022
3926d3f
Add website ordering to state and settings page
cywio Jul 24, 2022
5bd83b8
Change dashboard websites to use ordered list
cywio Jul 24, 2022
ef4bf82
Fix bug where toggle charts would reset ordering
cywio Jul 24, 2022
76bdb6b
Add reset order button to website settings
cywio Jul 24, 2022
8471db6
fix collection bug
briancao Jul 24, 2022
5cfee79
update CH session logic
briancao Jul 24, 2022
765add7
Restore table component and website settings page
cywio Jul 25, 2022
af7c6f7
Merge branch 'dev' into brian/session-fix
briancao Jul 25, 2022
137ff97
Move reordering of websites onto dashboard
cywio Jul 25, 2022
f189035
fix CH return.
briancao Jul 25, 2022
c03d5bf
Update zh-TW.json
Jul 25, 2022
82d8551
Merge pull request #1351 from wangyang0210/patch-1
mikecao Jul 25, 2022
d755a7f
Merge pull request #1343 from umami-software/brian/session-fix
mikecao Jul 25, 2022
79ae5b0
add migration prisma 4
briancao Jul 26, 2022
6890912
update migration
briancao Jul 26, 2022
c830239
Fix utm request
biqette Jul 26, 2022
c7476aa
add deploy if missing migrations. add logic to hand 01_init
briancao Jul 26, 2022
5c8c205
update translation id-ID.json
umarhadi Jul 27, 2022
f261933
Merge pull request #1359 from umarhadi/master
mikecao Jul 27, 2022
232c97c
Update lang-ignore.json
nfn Jul 27, 2022
b77d344
Update pt-PT.json
nfn Jul 27, 2022
b415892
restart migration. refresh schema
briancao Jul 27, 2022
7d94243
Merge pull request #1364 from nfn/master
mikecao Jul 27, 2022
6fbd566
add prisma migration
briancao Jul 28, 2022
3e2c098
create mysql migration
briancao Jul 28, 2022
934d569
Rename "change order" to "edit dashboard"
cywio Jul 28, 2022
88d1c19
Fix graphical bugs when dragging
cywio Jul 29, 2022
9a91a23
Create bn-BD.json
mahmudz Jul 30, 2022
2b7da33
Merge pull request #1371 from mahmudz/master
mikecao Jul 30, 2022
8f934c7
checkpoint
briancao Jul 30, 2022
32458b5
Add Thai language
max180643 Jul 30, 2022
adb069b
Added content security policy.
mikecao Aug 1, 2022
7b0d6af
refactor table drop
briancao Aug 1, 2022
01b517f
remove event_old from schema
briancao Aug 1, 2022
e4e3e74
Merge pull request #1372 from max180643/master
mikecao Aug 1, 2022
ab1e49e
Added Bengali and Thai languages.
mikecao Aug 2, 2022
68d35c0
Moved DISABLE_LOGIN check to getServerSideProps.
mikecao Aug 2, 2022
b04e03b
Merge pull request #1356 from biqette/master
mikecao Aug 2, 2022
daf3978
address PR comments. line up PSQL / MYSQL
briancao Aug 2, 2022
df1c203
Merge pull request #1376 from umami-software/brian/um-24-event-data
mikecao Aug 2, 2022
50e491a
Added endpoint for fetching server-side variables.
mikecao Aug 2, 2022
3d7e939
Merge remote-tracking branch 'origin/dev' into dev
mikecao Aug 2, 2022
a4a6888
Moved telemetry code to script.
mikecao Aug 2, 2022
9969c9b
Forgot the actual check.
mikecao Aug 2, 2022
1662b66
Cleaned up script.
mikecao Aug 2, 2022
f89960c
Removing the Procfile and adding cacheDirectories
H0rn0chse Aug 2, 2022
0bcada7
Merge pull request #1380 from H0rn0chse/master
mikecao Aug 2, 2022
59a949c
Updated de-DE
winterrific Aug 3, 2022
11fd958
Merge pull request #1381 from winterrific/master
mikecao Aug 3, 2022
4de1858
Merge pull request #1338 from cywio/reorder-websites
mikecao Aug 3, 2022
48dc02c
Update message bundle.
mikecao Aug 4, 2022
c375542
Moved geo database location.
mikecao Aug 4, 2022
62dce0a
Merge remote-tracking branch 'origin/dev' into dev
mikecao Aug 4, 2022
1d4aa7c
Refactored website ordering feature.
mikecao Aug 4, 2022
42e87a4
Fixed cancel of dashboard edit.
mikecao Aug 4, 2022
62b032a
Refactored dashboard sort logic.
mikecao Aug 5, 2022
7ae4576
Fix event table.
mikecao Aug 5, 2022
69962eb
Bump version 1.37.0.
mikecao Aug 5, 2022
89781d4
Refactored query parameters.
mikecao Aug 8, 2022
fb14514
Updated Next 12.2.4 and Prisma 4.1.1.
mikecao Aug 8, 2022
9b7e472
Added CURRENT_VERSION constant.
mikecao Aug 8, 2022
8aa9941
Show custom tracker script name.
mikecao Aug 8, 2022
bc75b62
Updated test console. Refactored fetch for tracker.
mikecao Aug 9, 2022
6cfe910
Added update-tracker script. Updated docker build.
mikecao Aug 9, 2022
d556806
Updated docker tracker update.
mikecao Aug 9, 2022
5873a56
Updated check updates logic.
mikecao Aug 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add prisma migration
  • Loading branch information
briancao committed Jul 28, 2022
commit 6fbd566b290e0fd4e312c22787fce392bfb6fdf2
47 changes: 47 additions & 0 deletions db/postgresql/migrations/02_add_event_data/migration.sql
Original file line number Diff line number Diff line change
@@ -0,0 1,47 @@
-- AlterTable
ALTER TABLE "event" ADD COLUMN "event_name" VARCHAR(50);

-- CreateTable
CREATE TABLE "event_data" (
"event_data_id" SERIAL NOT NULL,
"event_id" INTEGER NOT NULL,
"event_data" JSONB NOT NULL,

CONSTRAINT "event_data_pkey" PRIMARY KEY ("event_data_id")
);

-- CreateIndex
CREATE UNIQUE INDEX "event_data_event_id_key" ON "event_data"("event_id");

-- AddForeignKey
ALTER TABLE "event_data" ADD CONSTRAINT "event_data_event_id_fkey" FOREIGN KEY ("event_id") REFERENCES "event"("event_id") ON DELETE RESTRICT ON UPDATE CASCADE;

-- RenameIndex
ALTER INDEX "account.username_unique" RENAME TO "account_username_key";

-- RenameIndex
ALTER INDEX "session.session_uuid_unique" RENAME TO "session_session_uuid_key";

-- RenameIndex
ALTER INDEX "website.share_id_unique" RENAME TO "website_share_id_key";

-- RenameIndex
ALTER INDEX "website.website_uuid_unique" RENAME TO "website_website_uuid_key";

/*
Warnings:

- You are about to drop the column `event_type` on the `event` table. All the data in the column will be lost.
- You are about to drop the column `event_value` on the `event` table. All the data in the column will be lost.

*/
-- Populate event_name
update event
set "event_name" = event.event_value || '-' || event.event_type;

--Set event_name not null
ALTER TABLE "event" ALTER COLUMN "event_name" SET NOT NULL;

-- Drop old columns
ALTER TABLE "event" DROP COLUMN "event_type",
DROP COLUMN "event_value";
33 changes: 20 additions & 13 deletions db/postgresql/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 9,7 @@ datasource db {

model account {
user_id Int @id @default(autoincrement())
username String @unique(map: "account.username_unique") @db.VarChar(255)
username String @unique @db.VarChar(255)
password String @db.VarChar(60)
is_admin Boolean @default(false)
created_at DateTime? @default(now()) @db.Timestamptz(6)
Expand All @@ -18,21 18,28 @@ model account {
}

model event {
event_id Int @id @default(autoincrement())
website_id Int
session_id Int
created_at DateTime? @default(now()) @db.Timestamptz(6)
url String @db.VarChar(500)
event_type String @db.VarChar(50)
event_value String @db.VarChar(50)
session session @relation(fields: [session_id], references: [session_id], onDelete: Cascade)
website website @relation(fields: [website_id], references: [website_id], onDelete: Cascade)
event_id Int @id @default(autoincrement())
website_id Int
session_id Int
created_at DateTime? @default(now()) @db.Timestamptz(6)
url String @db.VarChar(500)
event_name String @db.VarChar(50)
session session @relation(fields: [session_id], references: [session_id], onDelete: Cascade)
website website @relation(fields: [website_id], references: [website_id], onDelete: Cascade)
eventData event_data?

@@index([created_at])
@@index([session_id])
@@index([website_id])
}

model event_data {
id Int @id @default(autoincrement()) @map("event_data_id")
eventId Int @unique @map("event_id")
eventData Json @map("event_data")
event event @relation(fields: [eventId], references: [event_id])
}

model pageview {
view_id Int @id @default(autoincrement())
website_id Int
Expand All @@ -52,7 59,7 @@ model pageview {

model session {
session_id Int @id @default(autoincrement())
session_uuid String @unique(map: "session.session_uuid_unique") @db.Uuid
session_uuid String @unique @db.Uuid
website_id Int
created_at DateTime? @default(now()) @db.Timestamptz(6)
hostname String? @db.VarChar(100)
Expand All @@ -72,11 79,11 @@ model session {

model website {
website_id Int @id @default(autoincrement())
website_uuid String @unique(map: "website.website_uuid_unique") @db.Uuid
website_uuid String @unique @db.Uuid
user_id Int
name String @db.VarChar(100)
domain String? @db.VarChar(500)
share_id String? @unique(map: "website.share_id_unique") @db.VarChar(64)
share_id String? @unique @db.VarChar(64)
created_at DateTime? @default(now()) @db.Timestamptz(6)
account account @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
event event[]
Expand Down