Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix team redirect

Tomas Valentadc140f390b9b
diff --git a/pages/index.tsx b/pages/index.tsx
index 6390b9f3e..65e71ec85 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,4 +1,4 @@
-import type { GetServerSideProps, Redirect } from 'next'
+import type { GetServerSideProps } from 'next'
import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'
import { deployments, prisma, projects } from 'db/prisma'
@@ -10,12 +10,13 @@ import { nanoid } from 'nanoid'
export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
// Select the 'deployed' view by default.
const view = ctx.query['view'] as string
- let redirect: Redirect | undefined
+ const joinTeamID = ctx.query['team'] as string | undefined
if (!view) {
- redirect = {
- // destination: '/?view=deployed',
- destination: '/?view=logs',
- permanent: false,
+ return {
+ redirect: {
+ destination: joinTeamID ? `/?view=logs&team=${joinTeamID}` : '/?view=logs',
+ permanent: false,
+ }
}
}
@@ -68,6 +69,33 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
const defaultTeam =
user?.users_teams.flatMap(u => u.teams)?.find(t => t.is_default) ||
+ (joinTeamID && await prisma.teams.update({
+ where: {
+ id: joinTeamID,
+ },
+ data: {
+ users_teams: {
+ connectOrCreate: {
+ where: {
+ user_id_team_id: {
+ team_id: joinTeamID,
+ user_id: session.user.id,
+ },
+ },
+ create: {
+ user_id: session.user.id,
+ },
+ },
+ },
+ },
+ include: {
+ projects: {
+ include: {
+ logs: true,
+ },
+ },
+ },
+ })) ||
await prisma.teams.create({
include: {
projects: {
@@ -99,6 +127,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
const defaultProject =
user.users_teams.flatMap(u => u.teams.projects).find(p => p.is_default) ||
+ defaultTeam.projects.find(p => p.is_default) ||
await prisma.projects.create({
data: {
id: nanoid(),
@@ -137,7 +166,6 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
}
})
},
- redirect,
}
}
@@ -147,7 +175,6 @@ export interface Props {
}
function Home({ projects, defaultProjectID }: Props) {
- console.log(defaultProjectID)
return (
<DashboardHome
defaultProjectID={defaultProjectID}
diff --git a/pages/sign.tsx b/pages/sign.tsx
index 71f080884..9a010e836 100644
--- a/pages/sign.tsx
+++ b/pages/sign.tsx
@@ -16,7 +16,13 @@ function SignIn() {
useEffect(() => {
if (user) {
- router.push('/')
+ router.push({
+ pathname: '/',
+ query: {
+ view: 'logs',
+ ...router.query['team'] && { team: router.query['team'] },
+ },
+ })
}
}, [user, router])