chore: deal form json object name

Author: mlhiter

frontend/providers/devbox/api/devbox.ts

@@ -1,7 +1,6 @@
 import { V1Deployment, V1Pod, V1StatefulSet } from '@kubernetes/client-node';
 
 import { DELETE, GET, POST } from '@/services/request';
-import { GetDevboxByNameReturn } from '@/types/adapt';
 import {
   DevboxDetailTypeV2,
   DevboxEditTypeV2,
@@ -13,7 +12,6 @@ import {
 import { KBDevboxReleaseType, KBDevboxTypeV2 } from '@/types/k8s';
 import {
   adaptAppListItem,
-  adaptDevboxDetailV2,
   adaptDevboxListItemV2,
   adaptDevboxVersionListItem,
   adaptPod
@@ -43,8 +41,7 @@ export const getDevboxByName = (devboxName: string, mock = false) =>
 export const applyYamlList = (yamlList: string[], type: 'create' | 'replace' | 'update') =>
   POST('/api/applyYamlList', { yamlList, type });
 
-export const createDevbox = (payload: { devboxForm: DevboxEditTypeV2 }) =>
-  POST(`/api/createDevbox`, payload);
+export const createDevbox = (payload: DevboxEditTypeV2) => POST(`/api/createDevbox`, payload);
 
 export const updateDevbox = (payload: { patch: DevboxPatchPropsType; devboxName: string }) =>
   POST(`/api/updateDevbox`, payload);

frontend/providers/devbox/app/api/createDevbox/route.ts

@@ -23,7 +23,7 @@ export async function POST(req: NextRequest) {
       });
     }
 
-    const { devboxForm } = validationResult.data;
+    const devboxForm = validationResult.data;
     const headerList = req.headers;
 
     const { applyYamlList, k8sCustomObjects, namespace } = await getK8s({

frontend/providers/devbox/app/api/createDevbox/schema.ts

@@ -47,7 +47,7 @@ const NetworkSchema = (devboxName: string) =>
     })
   });
 
-export const DevboxFormSchema = z
+export const RequestSchema = z
   .object({
     name: z.string().min(1).openapi({
       description: 'Devbox name'
@@ -83,10 +83,6 @@ export const DevboxFormSchema = z
     };
   });
 
-export const RequestSchema = z.object({
-  devboxForm: DevboxFormSchema
-});
-
 export const SuccessResponseSchema = z.object({
   data: z.string().default('success')
 });

frontend/providers/devbox/app/api/releaseDevbox/route.ts

@@ -22,7 +22,7 @@ export async function POST(req: NextRequest) {
       });
     }
 
-    const devboxForm = validationResult.data;
+    const releaseForm = validationResult.data;
     const headerList = req.headers;
 
     const { applyYamlList, namespace, k8sCustomObjects } = await getK8s({
@@ -40,9 +40,9 @@ export async function POST(req: NextRequest) {
       releaseBody.items.some((item: any) => {
         return (
           item.spec &&
-          item.spec.devboxName === devboxForm.devboxName &&
-          item.metadata.ownerReferences[0].uid === devboxForm.devboxUid &&
-          item.spec.newTag === devboxForm.tag
+          item.spec.devboxName === releaseForm.devboxName &&
+          item.metadata.ownerReferences[0].uid === releaseForm.devboxUid &&
+          item.spec.newTag === releaseForm.tag
         );
       })
     ) {
@@ -52,7 +52,7 @@ export async function POST(req: NextRequest) {
       });
     }
 
-    const devbox = json2DevboxRelease(devboxForm);
+    const devbox = json2DevboxRelease(releaseForm);
     await applyYamlList([devbox], 'create');
 
     return jsonRes({

frontend/providers/devbox/app/api/v1/DevBox/create/route.ts

@@ -57,7 +57,7 @@ export async function POST(req: NextRequest) {
       });
     }
 
-    const { devboxForm } = validationResult.data;
+    const devboxForm = validationResult.data;
     const headerList = req.headers;
 
     const { applyYamlList, k8sCustomObjects, namespace, k8sCore } = await getK8s({

frontend/providers/devbox/app/api/v1/DevBox/create/schema.ts

@@ -16,7 +16,7 @@ const RuntimeName = z.enum([
   'PHP'
 ]);
 
-export const DevboxFormSchema = z.object({
+export const RequestSchema = z.object({
   name: z.string().min(1).openapi({
     description: 'Devbox name'
   }),
@@ -33,10 +33,6 @@ export const DevboxFormSchema = z.object({
   })
 });
 
-export const RequestSchema = z.object({
-  devboxForm: DevboxFormSchema
-});
-
 export const SuccessResponseSchema = z.object({
   data: z.object({
     name: z.string().openapi({

frontend/providers/devbox/app/api/v1/DevBox/release/route.ts

@@ -22,7 +22,7 @@ export async function POST(req: NextRequest) {
       });
     }
 
-    const { devboxForm } = validationResult.data;
+    const releaseForm = validationResult.data;
     const headerList = req.headers;
 
     const { applyYamlList, namespace, k8sCustomObjects } = await getK8s({
@@ -44,15 +44,15 @@ export async function POST(req: NextRequest) {
     )) as { body: { items: KBDevboxReleaseType[] } };
 
     const devbox = devboxBody.items.find(
-      (item: any) => item.metadata.name === devboxForm.devboxName
+      (item: any) => item.metadata.name === releaseForm.devboxName
     );
 
     if (
       releaseBody.items.some((item: any) => {
         return (
           item.spec &&
-          item.spec.devboxName === devboxForm.devboxName &&
-          item.spec.newTag === devboxForm.tag
+          item.spec.devboxName === releaseForm.devboxName &&
+          item.spec.newTag === releaseForm.tag
         );
       })
     ) {
@@ -63,21 +63,21 @@ export async function POST(req: NextRequest) {
     }
 
     const devboxYaml = json2DevboxRelease({
-      ...devboxForm,
+      ...releaseForm,
       devboxUid: devbox?.metadata.uid || ''
     });
     await applyYamlList([devboxYaml], 'create');
 
     const { REGISTRY_ADDR } = process.env;
 
-    const imageName = `${REGISTRY_ADDR}/${namespace}/${devboxForm.devboxName}:${devboxForm.tag}`;
+    const imageName = `${REGISTRY_ADDR}/${namespace}/${releaseForm.devboxName}:${releaseForm.tag}`;
 
     return jsonRes({
       data: {
-        devboxName: devboxForm.devboxName,
-        tag: devboxForm.tag,
+        devboxName: releaseForm.devboxName,
+        tag: releaseForm.tag,
         image: imageName,
-        releaseDes: devboxForm.releaseDes || '',
+        releaseDes: releaseForm.releaseDes || '',
         createdAt: new Date().toISOString()
       }
     });

frontend/providers/devbox/app/api/v1/DevBox/release/schema.ts

@@ -2,7 +2,7 @@ import 'zod-openapi/extend';
 
 import { z } from 'zod';
 
-export const ReleaseFormSchema = z.object({
+export const RequestSchema = z.object({
   devboxName: z.string().min(1).openapi({
     description: 'Devbox name'
   }),
@@ -14,10 +14,6 @@ export const ReleaseFormSchema = z.object({
   })
 });
 
-export const RequestSchema = z.object({
-  devboxForm: ReleaseFormSchema
-});
-
 export const SuccessResponseSchema = z.object({
   data: z.object({
     devboxName: z.string().openapi({