Compare commits

..

No commits in common. "b0f38b266bc6fbc079b65d75bd27b5b925bec827" and "f5896f071bf3e69c245fa5de8dac9f470e3bdc85" have entirely different histories.

3 changed files with 32 additions and 51 deletions

View file

@ -7,7 +7,7 @@ import { checkPassword } from '@/lib/password';
import redis from '@/lib/redis'; import redis from '@/lib/redis';
import { parseRequest } from '@/lib/request'; import { parseRequest } from '@/lib/request';
import { json, unauthorized } from '@/lib/response'; import { json, unauthorized } from '@/lib/response';
import { getAllUserTeams, getUserByUsername } from '@/queries/prisma'; import { getUserByUsername } from '@/queries/prisma';
export async function POST(request: Request) { export async function POST(request: Request) {
const schema = z.object({ const schema = z.object({
@ -39,10 +39,8 @@ export async function POST(request: Request) {
token = createSecureToken({ userId: user.id, role }, secret()); token = createSecureToken({ userId: user.id, role }, secret());
} }
const teams = await getAllUserTeams(id);
return json({ return json({
token, token,
user: { id, username, role, createdAt, isAdmin: role === ROLES.admin, teams }, user: { id, username, role, createdAt, isAdmin: role === ROLES.admin },
}); });
} }

View file

@ -22,12 +22,7 @@ export function Legend({
return ( return (
<Row key={text} onClick={() => onClick(item)}> <Row key={text} onClick={() => onClick(item)}>
<StatusLight color={color.alpha(color.alpha() + 0.2).toHex()}> <StatusLight color={color.alpha(color.alpha() + 0.2).toHex()}>
<Text <Text size="2" color={hidden ? 'disabled' : undefined} wrap="nowrap">
size="2"
color={hidden ? 'disabled' : undefined}
truncate={true}
style={{ maxWidth: '300px' }}
>
{text} {text}
</Text> </Text>
</StatusLight> </StatusLight>

View file

@ -137,9 +137,6 @@ export async function resetWebsite(websiteId: string) {
return transaction( return transaction(
[ [
client.revenue.deleteMany({
where: { websiteId },
}),
client.eventData.deleteMany({ client.eventData.deleteMany({
where: { websiteId }, where: { websiteId },
}), }),
@ -178,44 +175,35 @@ export async function deleteWebsite(websiteId: string) {
const { client, transaction } = prisma; const { client, transaction } = prisma;
const cloudMode = !!process.env.CLOUD_MODE; const cloudMode = !!process.env.CLOUD_MODE;
return transaction( return transaction([
[ client.eventData.deleteMany({
client.revenue.deleteMany({ where: { websiteId },
where: { websiteId }, }),
}), client.sessionData.deleteMany({
client.eventData.deleteMany({ where: { websiteId },
where: { websiteId }, }),
}), client.websiteEvent.deleteMany({
client.sessionData.deleteMany({ where: { websiteId },
where: { websiteId }, }),
}), client.session.deleteMany({
client.websiteEvent.deleteMany({ where: { websiteId },
where: { websiteId }, }),
}), client.report.deleteMany({
client.session.deleteMany({ where: {
where: { websiteId }, websiteId,
}), },
client.report.deleteMany({ }),
where: { websiteId }, cloudMode
}), ? client.website.update({
client.segment.deleteMany({ data: {
where: { websiteId }, deletedAt: new Date(),
}), },
cloudMode where: { id: websiteId },
? client.website.update({ })
data: { : client.website.delete({
deletedAt: new Date(), where: { id: websiteId },
}, }),
where: { id: websiteId }, ]).then(async data => {
})
: client.website.delete({
where: { id: websiteId },
}),
],
{
timeout: 30000,
},
).then(async data => {
if (cloudMode) { if (cloudMode) {
await redis.client.del(`website:${websiteId}`); await redis.client.del(`website:${websiteId}`);
} }