fix(devbox): fix invaild devbox cr (#5339)

labring · Jan 10, 2025 · 1389cd0 · 1389cd0
1 parent 60a8ff6
commit 1389cd0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 62 deletions.
diff --git a/frontend/providers/devbox/app/[lang]/(platform)/devbox/detail/[name]/components/Version.tsx b/frontend/providers/devbox/app/[lang]/(platform)/devbox/detail/[name]/components/Version.tsx
@@ -25,11 +25,11 @@ import CreateTemplateModal from '@/app/[lang]/(platform)/template/updateTemplate
 import SelectTemplateModal from '@/app/[lang]/(platform)/template/updateTemplate/SelectActionModal'
 import UpdateTemplateRepositoryModal from '@/app/[lang]/(platform)/template/updateTemplate/UpdateTemplateRepositoryModal'
 import AppSelectModal from '@/components/modals/AppSelectModal'
+import useReleaseDriver from '@/hooks/useReleaseDriver'
 import { useDevboxStore } from '@/stores/devbox'
 import { useEnvStore } from '@/stores/env'
 import { AppListItemType } from '@/types/app'
 import { parseTemplateConfig } from '@/utils/tools'
-import useReleaseDriver from '@/hooks/useReleaseDriver'
 
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz', 6)
 
@@ -260,7 +260,7 @@ const Version = () => {
           <SealosMenu
             width={100}
             Button={
-              <MenuButton as={Button} variant={'square'} boxSize={'32px'} data-group>
+              <MenuButton as={Button} variant={'square'} boxSize={'32px'} data-group isDisabled={item?.status?.value !== 'Success'}>
                 <MyIcon
                   name={'more'}
                   color={'grayModern.600'}

diff --git a/frontend/providers/devbox/app/api/v1/getDevboxDetail/route.ts b/frontend/providers/devbox/app/api/v1/getDevboxDetail/route.ts
@@ -52,7 +52,7 @@ export async function GET(req: NextRequest) {
 
     const devbox = {
       status:
-        body.status.phase && devboxStatusMap[body.status.phase]
+        body.status?.phase && devboxStatusMap[body.status.phase]
           ? devboxStatusMap[body.status.phase]
           : devboxStatusMap.Error,
     }

diff --git a/frontend/providers/devbox/types/k8s.d.ts b/frontend/providers/devbox/types/k8s.d.ts
@@ -59,7 +59,7 @@ export type KBDevboxTypeV2 = {
     creationTimestamp: string
   }
   spec: KBDevboxSpecV2
-  status: {
+  status?: {
     lastState: {
       terminated?: {
         containerID: string

diff --git a/frontend/providers/devbox/utils/adapt.ts b/frontend/providers/devbox/utils/adapt.ts
@@ -9,7 +9,6 @@ import {
 import { GetDevboxByNameReturn } from '@/types/adapt'
 import { DBListItemType, KbPgClusterType } from '@/types/cluster'
 import {
-  DevboxDetailType,
   DevboxDetailTypeV2,
   DevboxListItemType,
   DevboxListItemTypeV2,
@@ -70,10 +69,10 @@ export const adaptDevboxListItemV2 = ([devbox, template]: [KBDevboxTypeV2, {
     name: devbox.metadata.name || 'devbox',
     template,
     status:
-      devbox.status.phase && devboxStatusMap[devbox.status.phase]
+      devbox.status?.phase && devboxStatusMap[devbox.status.phase]
         ? devboxStatusMap[devbox.status.phase]
         : devboxStatusMap.Error,
-    sshPort: devbox.status.network.nodePort,
+    sshPort: devbox.status?.network.nodePort || 65535,
     createTime: dayjs(devbox.metadata.creationTimestamp).format('YYYY/MM/DD HH:mm'),
     cpu: cpuFormatToM(devbox.spec.resource.cpu),
     memory: memoryFormatToMi(devbox.spec.resource.memory),
@@ -88,60 +87,25 @@ export const adaptDevboxListItemV2 = ([devbox, template]: [KBDevboxTypeV2, {
       yData: new Array(30).fill('0')
     },
     lastTerminatedReason:
-      devbox.status.lastState?.terminated && devbox.status.lastState.terminated.reason === 'Error'
-        ? devbox.status.state.waiting
-          ? devbox.status.state.waiting.reason
-          : devbox.status.state.terminated
-            ? devbox.status.state.terminated.reason
-            : ''
-        : ''
-  }
-}
-export const adaptDevboxDetail = (
-  devbox: KBDevboxType & { portInfos: any[] }
-): DevboxDetailType => {
-  return {
-    id: devbox.metadata?.uid || ``,
-    name: devbox.metadata.name || 'devbox',
-    runtimeType: devbox.spec.runtimeType || '',
-    runtimeVersion: devbox.spec.runtimeRef.name || '',
-    status:
-      devbox.status.phase && devboxStatusMap[devbox.status.phase]
-        ? devboxStatusMap[devbox.status.phase]
-        : devboxStatusMap.Error,
-    sshPort: devbox.status.network.nodePort,
-    isPause: devbox.status.phase === 'Stopped',
-    createTime: dayjs(devbox.metadata.creationTimestamp).format('YYYY-MM-DD HH:mm'),
-    cpu: cpuFormatToM(devbox.spec.resource.cpu),
-    memory: memoryFormatToMi(devbox.spec.resource.memory),
-    usedCpu: {
-      name: '',
-      xData: new Array(30).fill(0),
-      yData: new Array(30).fill('0')
-    },
-    usedMemory: {
-      name: '',
-      xData: new Array(30).fill(0),
-      yData: new Array(30).fill('0')
-    },
-    networks: devbox.portInfos,
-    lastTerminatedReason:
-      devbox.status.lastState?.terminated && devbox.status.lastState.terminated.reason === 'Error'
-        ? devbox.status.state.waiting
-          ? devbox.status.state.waiting.reason
-          : devbox.status.state.terminated
-            ? devbox.status.state.terminated.reason
-            : ''
+      devbox.status ?
+        devbox.status.lastState?.terminated && devbox.status.lastState.terminated.reason === 'Error'
+          ? devbox.status.state.waiting
+            ? devbox.status.state.waiting.reason
+            : devbox.status.state.terminated
+              ? devbox.status.state.terminated.reason
+              : ''
+          : ''
         : ''
   }
 }
+
 export const adaptDevboxDetailV2 = (
   [devbox, portInfos, template]: GetDevboxByNameReturn
 ): DevboxDetailTypeV2 => {
   console.log('adaptDevboxDetailV2')
-  const status =       devbox.status.phase && devboxStatusMap[devbox.status.phase]
-  ? devboxStatusMap[devbox.status.phase]
-  : devboxStatusMap.Error
+  const status = devbox.status?.phase && devboxStatusMap[devbox.status.phase]
+    ? devboxStatusMap[devbox.status.phase]
+    : devboxStatusMap.Error
   return {
     id: devbox.metadata?.uid || ``,
     name: devbox.metadata.name || 'devbox',
@@ -153,8 +117,8 @@ export const adaptDevboxDetailV2 = (
     image: template.image,
     iconId: template.templateRepository.iconId || '',
     status,
-    sshPort: devbox.status.network.nodePort,
-    isPause: devbox.status.phase === 'Stopped',
+    sshPort: devbox.status?.network.nodePort || 65535,
+    isPause: devbox.status?.phase === 'Stopped',
     createTime: dayjs(devbox.metadata.creationTimestamp).format('YYYY-MM-DD HH:mm'),
     cpu: cpuFormatToM(devbox.spec.resource.cpu),
     memory: memoryFormatToMi(devbox.spec.resource.memory),
@@ -170,12 +134,14 @@ export const adaptDevboxDetailV2 = (
     },
     networks: portInfos || [],
     lastTerminatedReason:
-      devbox.status.lastState?.terminated && devbox.status.lastState.terminated.reason === 'Error'
-        ? devbox.status.state.waiting
-          ? devbox.status.state.waiting.reason
-          : devbox.status.state.terminated
-            ? devbox.status.state.terminated.reason
-            : ''
+      devbox.status ?
+        devbox.status.lastState?.terminated && devbox.status.lastState.terminated.reason === 'Error'
+          ? devbox.status.state.waiting
+            ? devbox.status.state.waiting.reason
+            : devbox.status.state.terminated
+              ? devbox.status.state.terminated.reason
+              : ''
+          : ''
         : ''
   }
 }