-
Notifications
You must be signed in to change notification settings - Fork 7.1k
feat: session deletion #4154
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
Open
cabaucom376
wants to merge
5
commits into
umami-software:dev
Choose a base branch
from
cabaucom376:feat/delete-sessions
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat: session deletion #4154
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 13 additions & 8 deletions
21
src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,21 @@ | ||
| import type { Metadata } from 'next'; | ||
| 'use client'; | ||
| import { SessionProfile } from '@/app/(main)/websites/[websiteId]/sessions/SessionProfile'; | ||
| import { useRouter } from 'next/navigation'; | ||
| import { use } from 'react'; | ||
|
|
||
| export default async function ({ | ||
| export default function ({ | ||
| params, | ||
| }: { | ||
| params: Promise<{ websiteId: string; sessionId: string }>; | ||
| }) { | ||
| const { websiteId, sessionId } = await params; | ||
| const { websiteId, sessionId } = use(params); | ||
| const router = useRouter(); | ||
|
|
||
| return <SessionProfile websiteId={websiteId} sessionId={sessionId} />; | ||
| return ( | ||
| <SessionProfile | ||
| websiteId={websiteId} | ||
| sessionId={sessionId} | ||
| onDelete={() => router.push(`/websites/${websiteId}/sessions`)} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| export const metadata: Metadata = { | ||
| title: 'Session', | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import prisma from '@/lib/prisma'; | ||
|
|
||
| export async function findSession(websiteId: string, sessionId: string) { | ||
| return prisma.client.session.findFirst({ | ||
| where: { id: sessionId, websiteId }, | ||
| }); | ||
| } | ||
|
|
||
| export async function deleteSession(websiteId: string, sessionId: string) { | ||
| const { transaction } = prisma; | ||
|
|
||
| return transaction( | ||
| async tx => { | ||
| const replays = await tx.sessionReplay.findMany({ | ||
| where: { websiteId, sessionId }, | ||
| select: { visitId: true }, | ||
| }); | ||
| const visitIds = [...new Set(replays.map(r => r.visitId))]; | ||
|
|
||
| if (visitIds.length > 0) { | ||
| await tx.sessionReplaySaved.deleteMany({ | ||
| where: { websiteId, visitId: { in: visitIds } }, | ||
| }); | ||
| } | ||
|
|
||
| await tx.sessionReplay.deleteMany({ | ||
| where: { websiteId, sessionId }, | ||
| }); | ||
|
|
||
| await tx.revenue.deleteMany({ | ||
| where: { websiteId, sessionId }, | ||
| }); | ||
|
|
||
| const events = await tx.websiteEvent.findMany({ | ||
| where: { websiteId, sessionId }, | ||
| select: { id: true }, | ||
| }); | ||
| const eventIds = events.map(e => e.id); | ||
|
|
||
| if (eventIds.length > 0) { | ||
| await tx.eventData.deleteMany({ | ||
| where: { websiteId, websiteEventId: { in: eventIds } }, | ||
| }); | ||
| } | ||
|
|
||
| await tx.websiteEvent.deleteMany({ | ||
| where: { websiteId, sessionId }, | ||
| }); | ||
|
|
||
| await tx.sessionData.deleteMany({ | ||
| where: { websiteId, sessionId }, | ||
| }); | ||
|
|
||
| return tx.session.deleteMany({ | ||
| where: { id: sessionId, websiteId }, | ||
| }); | ||
| }, | ||
| { timeout: 30000 }, | ||
| ); | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.