fix(devbox):fix multi-region

labring · Jan 6, 2025 · aeb6360 · aeb6360
1 parent 226ddef
commit aeb6360
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 76 deletions.
diff --git a/...rm)/devbox/create/components/form/BasicConfiguration/TemplateRepositorySelector/index.tsx b/...rm)/devbox/create/components/form/BasicConfiguration/TemplateRepositorySelector/index.tsx
@@ -1,4 +1,5 @@
 import { getTemplateRepository, listOfficialTemplateRepository } from '@/api/template'
+import useDriver from '@/hooks/useDriver'
 import { TemplateRepositoryKind } from '@/prisma/generated/client'
 import { useDevboxStore } from '@/stores/devbox'
 import { DevboxEditTypeV2 } from '@/types/devbox'
@@ -11,7 +12,6 @@ import { useFormContext } from 'react-hook-form'
 import Label from '../../Label'
 import TemplateRepositoryListNav from '../TemplateRepositoryListNav'
 import TemplateRepositoryItem from './TemplateReposistoryItem'
-import useDriver from '@/hooks/useDriver'
 
 interface TemplateRepositorySelectorProps {
   isEdit: boolean
@@ -139,8 +139,8 @@ export default function TemplateRepositorySelector({ isEdit }: TemplateRepositor
   ])
   return (
     <VStack alignItems={'center'} mb={7} gap={'24px'}>
-      <Box className="guide-runtimes">
-        <Flex w="full" justify={'space-between'} mb={'24px'}>
+      <Flex className="guide-runtimes" gap={'24px'} flexDir={'column'} w={'full'}>
+        <Flex w="full" justify={'space-between'} >
           <Label w={100} alignSelf={'flex-start'}>
             {t('runtime_environment')}
           </Label>
@@ -171,7 +171,7 @@ export default function TemplateRepositorySelector({ isEdit }: TemplateRepositor
             ))}
           </Flex>
         </Flex>
-      </Box>
+      </Flex>
       <Flex gap={'10px'} px={'14px'} width={'full'}>
         {/* Framework */}
         {categorizedData['FRAMEWORK'].length !== 0 && <Box width={'85px'}>{t('framework')}</Box>}

diff --git a/frontend/providers/devbox/app/api/auth/init/route.ts b/frontend/providers/devbox/app/api/auth/init/route.ts
@@ -1,6 +1,7 @@
 import { authSessionWithDesktopJWT, generateDevboxToken } from "@/services/backend/auth"
 import { jsonRes } from "@/services/backend/response"
 import { devboxDB } from "@/services/db/init"
+import { getRegionUid } from "@/utils/env"
 import { makeOrganizationName } from "@/utils/user"
 
 import { NextRequest } from "next/server"
@@ -109,9 +110,9 @@ const findOrCreateUser = async (regionUid: string, namespaceId: string) => {
   })
 }
 export async function POST(req: NextRequest) {
-  const regionUid = process.env.REGION_UID
+  const regionUid = getRegionUid()
   if (!regionUid) {
-    console.log("REGIONUID is not set")
+    console.log("REGION_UID is not set")
     return jsonRes({
       code: 500,
     })

diff --git a/frontend/providers/devbox/app/api/templateRepository/delete/route.ts b/frontend/providers/devbox/app/api/templateRepository/delete/route.ts
@@ -1,6 +1,7 @@
 import { authSessionWithJWT } from '@/services/backend/auth'
 import { jsonRes } from '@/services/backend/response'
 import { devboxDB } from '@/services/db/init'
+import { getRegionUid } from '@/utils/env'
 import { NextRequest } from 'next/server'
 import { z } from 'zod'
 
@@ -23,11 +24,13 @@ export async function DELETE(req: NextRequest) {
     const {payload} = await authSessionWithJWT(headerList)
 
     const deletedAt = new Date()
+    const regionUid = getRegionUid()
     await devboxDB.templateRepository.update({
       where: {
         uid,
         organizationUid: payload.organizationUid,
         isDeleted: false,
+        regionUid
       },
       data: {
         deletedAt,

diff --git a/frontend/providers/devbox/app/api/templateRepository/get/route.ts b/frontend/providers/devbox/app/api/templateRepository/get/route.ts
@@ -1,6 +1,7 @@
 import { authSessionWithJWT } from '@/services/backend/auth'
 import { jsonRes } from '@/services/backend/response'
 import { devboxDB } from '@/services/db/init'
+import { getRegionUid } from '@/utils/env'
 import { NextRequest } from 'next/server'
 import { z } from 'zod'
 
@@ -19,10 +20,12 @@ export async function GET(req: NextRequest) {
       })
     }
     const uid = uidResult.data
+    const regionUid = getRegionUid()
     const templateRepository = await devboxDB.templateRepository.findUnique({
       where: {
         uid,
-        isDeleted: false
+        isDeleted: false,
+        regionUid
       },
       select: {
         templates: {

diff --git a/frontend/providers/devbox/app/api/templateRepository/list/route.ts b/frontend/providers/devbox/app/api/templateRepository/list/route.ts
@@ -1,6 +1,7 @@
 import { Prisma } from '@/prisma/generated/client'
 import { jsonRes } from '@/services/backend/response'
 import { devboxDB } from '@/services/db/init'
+import { getRegionUid } from '@/utils/env'
 import { NextRequest } from 'next/server'
 import { z } from 'zod'
 export const dynamic = 'force-dynamic'
@@ -11,45 +12,36 @@ export async function GET(req: NextRequest) {
     const search = searchParams.get('search') || ''
     const page = z.number().int().positive().safeParse(Number(searchParams.get('page'))).data || 1
     const pageSize = z.number().int().min(1).safeParse(Number(searchParams.get('pageSize'))).data || 30
-    const dbquery: Prisma.TemplateRepositoryWhereInput = {
-
-      ...(tags && tags.length > 0
-        ? {
-          AND: tags.map((tag) => ({
-            templateRepositoryTags: {
-              some: {
-                tagUid: tag
-              }
-            }
-          }))
-        }
-        : {}),
-      ...(search && search.length > 0
-        ? {
-          name: {
-            contains: search
-          }
-        }
-        : {})
-    }
     const [templateRepositoryList, totalItems] = await devboxDB.$transaction(async tx => {
-      const validRepoIds = await tx.template.findMany({
-        where: {
-          isDeleted: false,
-        },
-        select: {
-          templateRepositoryUid: true
-        },
-        distinct: ['templateRepositoryUid']
-      })
 
+      const regionUid = getRegionUid()
       const where: Prisma.TemplateRepositoryWhereInput = {
-        uid: {
-          in: validRepoIds.map(r => r.templateRepositoryUid)
+        templates: {
+          some: {
+            isDeleted: false
+          }
         },
         isPublic: true,
         isDeleted: false,
-        ...dbquery
+        regionUid,
+        ...(tags && tags.length > 0
+          ? {
+            AND: tags.map((tag) => ({
+              templateRepositoryTags: {
+                some: {
+                  tagUid: tag
+                }
+              }
+            }))
+          }
+          : {}),
+        ...(search && search.length > 0
+          ? {
+            name: {
+              contains: search
+            }
+          }
+          : {})
       }
       const [templateRepositoryList, totalItems] = await Promise.all([
         tx.templateRepository.findMany({
@@ -88,7 +80,7 @@ export async function GET(req: NextRequest) {
           ]
         }),
         tx.templateRepository.count({
-          where: dbquery,
+          where,
         })
       ])
       return [templateRepositoryList, totalItems]

diff --git a/frontend/providers/devbox/app/api/templateRepository/listOfficial/route.ts b/frontend/providers/devbox/app/api/templateRepository/listOfficial/route.ts
@@ -1,5 +1,6 @@
 import { jsonRes } from '@/services/backend/response'
 import { devboxDB } from '@/services/db/init'
+import { getRegionUid } from '@/utils/env'
 import { NextRequest } from 'next/server'
 export const dynamic = 'force-dynamic'
 
@@ -10,12 +11,14 @@ export const GET = async function GET(req: NextRequest) {
         id: 'labring'
       }
     })
-    if(!organization) throw Error('organization not found')
+    if (!organization) throw Error('organization not found')
+    const regionUid = getRegionUid()
     const templateRepositoryList = await devboxDB.templateRepository.findMany({
       where: {
         isPublic: true,
         isDeleted: false,
-        organizationUid: organization.uid
+        organizationUid: organization.uid,
+        regionUid,
       },
       select: {
         kind: true,

diff --git a/frontend/providers/devbox/app/api/templateRepository/template/getConfig/route.ts b/frontend/providers/devbox/app/api/templateRepository/template/getConfig/route.ts
@@ -1,6 +1,7 @@
 import { authSessionWithJWT } from '@/services/backend/auth'
 import { jsonRes } from '@/services/backend/response'
 import { devboxDB } from '@/services/db/init'
+import { getRegionUid } from '@/utils/env'
 import { NextRequest } from 'next/server'
 
 export const dynamic = 'force-dynamic'
@@ -32,16 +33,19 @@ export async function GET(req: NextRequest) {
                 isDeleted: true
               }
             },
+            regionUid: true,
             isDeleted: true,
             isPublic: true,
           }
         }
       }
     })
+    const regionUid = getRegionUid()
     if (!template ||
       !(template.templateRepository.organization.uid === payload.organizationUid
         || template.templateRepository.isPublic === true
-      )
+      ) ||
+      template.templateRepository.regionUid !== regionUid
     ) {
       return jsonRes({
         code: 404,

diff --git a/frontend/providers/devbox/app/api/templateRepository/template/list/route.ts b/frontend/providers/devbox/app/api/templateRepository/template/list/route.ts
@@ -1,6 +1,7 @@
 import { authSessionWithJWT } from '@/services/backend/auth'
 import { jsonRes } from '@/services/backend/response'
 import { devboxDB } from '@/services/db/init'
+import { getRegionUid } from '@/utils/env'
 import { NextRequest } from 'next/server'
 
 export const dynamic = 'force-dynamic'
@@ -18,12 +19,13 @@ export async function GET(req: NextRequest) {
     const templateRepository = await devboxDB.templateRepository.findUnique({
       where: {
         uid,
-        isDeleted: false
+        isDeleted: false,
+        regionUid: getRegionUid()
       },
       select: {
         name: true,
         uid: true,
-        organization:{
+        organization: {
           select: {
             uid: true,
             isDeleted: true
@@ -45,18 +47,26 @@ export async function GET(req: NextRequest) {
         }
       }
     })
-    if (templateRepository &&
-      !(
-         (templateRepository.organization.isDeleted === false 
-         && templateRepository.organization.uid === payload.organizationUid)
-        || templateRepository.isPublic === true
-      )) {
+
+    if (!templateRepository) {
+      return jsonRes({
+        data: {
+          templateList: []
+        }
+      })
+    }
+    const templateList = templateRepository.templates
+    if (!(
+      (templateRepository.organization.isDeleted === false
+        && templateRepository.organization.uid === payload.organizationUid)
+      || templateRepository.isPublic === true
+    )) {
       return jsonRes({
-        code: 404,
-        error: 'Template is not found'
+        data: {
+          templateList
+        }
       })
     }
-    const templateList = templateRepository?.templates || []
     return jsonRes({
       data: {
         templateList

diff --git a/frontend/providers/devbox/app/api/templateRepository/update/route.ts b/frontend/providers/devbox/app/api/templateRepository/update/route.ts
@@ -2,6 +2,7 @@ import { TagType } from "@/prisma/generated/client"
 import { authSessionWithJWT } from "@/services/backend/auth"
 import { jsonRes } from "@/services/backend/response"
 import { devboxDB } from "@/services/db/init"
+import { getRegionUid } from "@/utils/env"
 import { updateTemplateRepositorySchema } from "@/utils/vaildate"
 import { NextRequest } from "next/server"
 import { z } from "zod"
@@ -66,7 +67,8 @@ export async function POST(req: NextRequest) {
       )
     const isExist = await devboxDB.templateRepository.findUnique({
       where: {
-        isDeleted_name: {
+        isDeleted_regionUid_name: {
+          regionUid: getRegionUid(),
           name: query.templateRepositoryName,
           isDeleted: false,
         }

diff --git a/frontend/providers/devbox/app/api/templateRepository/withTemplate/create/route.ts b/frontend/providers/devbox/app/api/templateRepository/withTemplate/create/route.ts
@@ -6,6 +6,7 @@ import { devboxDB } from "@/services/db/init"
 import { ERROR_ENUM } from "@/services/error"
 import { retagSvcClient } from "@/services/retag"
 import { KBDevboxReleaseType, KBDevboxTypeV2 } from "@/types/k8s"
+import { getRegionUid } from "@/utils/env"
 import { createTemplateRepositorySchema } from "@/utils/vaildate"
 import { NextRequest } from "next/server"
 import { z } from "zod"
@@ -58,7 +59,8 @@ export async function POST(req: NextRequest) {
     }
     const isExist = await devboxDB.templateRepository.findUnique({
       where: {
-        isDeleted_name: {
+        isDeleted_regionUid_name: {
+          regionUid: getRegionUid(),
           name: query.templateRepositoryName,
           isDeleted: false
         },
@@ -139,6 +141,7 @@ export async function POST(req: NextRequest) {
             parentUid: devboxBody.spec.templateID,
           }
         },
+        regionUid: getRegionUid(),
         organizationUid: payload.organizationUid,
         iconId: origionalTemplate?.templateRepository.iconId,
         kind: TemplateRepositoryKind.CUSTOM,

diff --git a/frontend/providers/devbox/app/api/templateRepository/withTemplate/update/route.ts b/frontend/providers/devbox/app/api/templateRepository/withTemplate/update/route.ts
@@ -6,6 +6,7 @@ import { devboxDB } from '@/services/db/init'
 import { ERROR_ENUM } from '@/services/error'
 import { retagSvcClient } from '@/services/retag'
 import { KBDevboxReleaseType, KBDevboxTypeV2 } from '@/types/k8s'
+import { getRegionUid } from '@/utils/env'
 import { updateTemplateSchema } from '@/utils/vaildate'
 import { NextRequest } from 'next/server'
 import { z } from 'zod'
@@ -75,6 +76,7 @@ export async function POST(req: NextRequest) {
       where: {
         uid: query.templateRepositoryUid,
         organizationUid: payload.organizationUid,
+        regionUid: getRegionUid()
       },
       select: {
         uid: true,
@@ -83,6 +85,7 @@ export async function POST(req: NextRequest) {
           select: {
             tagUid: true
           }
+
         },
         templates: true
       }
@@ -130,6 +133,7 @@ export async function POST(req: NextRequest) {
       await tx.templateRepository.update({
         where: {
           organizationUid: organization.uid,
+          regionUid: getRegionUid(),
           uid: templateRepository.uid,
         },
         data: {