Fix: Resolve bug introduced by launchpad JSON patching

frontend/providers/applaunchpad/src/pages/app/edit/index.tsx

@@ -154,20 +154,21 @@ const EditApp = ({ appName, tabType }: { appName?: string; tabType: string }) =>
     async (yamlList: YamlItemType[]) => {
       setIsLoading(true);
       try {
-        const yamls = yamlList.map((item) => item.value);
+        const parsedNewYamlList = yamlList.map((item) => item.value);
+
         if (appName) {
           const patch = patchYamlList({
-            formOldYamlList: formOldYamls.current.map((item) => item.value),
-            newYamlList: yamls,
-            crYamlList: crOldYamls.current
+            parsedOldYamlList: formOldYamls.current.map((item) => item.value),
+            parsedNewYamlList: parsedNewYamlList,
+            originalYamlList: crOldYamls.current
           });
           await putApp({
             patch,
             appName,
             stateFulSetYaml: yamlList.find((item) => item.filename === 'statefulSet.yaml')?.value
           });
         } else {
-          await postDeployApp(yamls);
+          await postDeployApp(parsedNewYamlList);
         }
 
         router.replace(`/app/detail?name=${formHook.getValues('appName')}`);

frontend/providers/applaunchpad/src/types/app.d.ts

@@ -58,6 +58,8 @@ export interface AppListItemType {
   labels: { [key: string]: string };
 }
 
+export type ProtocolType = 'HTTP' | 'GRPC' | 'WS';
+
 export interface AppEditType {
   appName: string;
   imageName: string;
@@ -71,7 +73,7 @@ export interface AppEditType {
     networkName: string;
     portName: string;
     port: number;
-    protocol: 'HTTP' | 'GRPC' | 'WS';
+    protocol: ProtocolType;
     openPublicDomain: boolean;
     publicDomain: string; // default domain
     customDomain: string; // custom domain

frontend/providers/applaunchpad/src/utils/adapt.ts

@@ -18,7 +18,8 @@ import type {
   AppDetailType,
   PodMetrics,
   PodEvent,
-  HpaTarget
+  HpaTarget,
+  ProtocolType
 } from '@/types/app';
 import {
   appStatusMap,
@@ -266,16 +267,18 @@ export const adaptAppDetail = (configs: DeployKindsType[]): AppDetailType => {
         ) as V1Ingress;
         const domain = ingress?.spec?.rules?.[0].host || '';
 
+        const backendProtocol = ingress?.metadata?.annotations?.[
+          'nginx.ingress.kubernetes.io/backend-protocol'
+        ] as ProtocolType;
+
+        const protocol =
+          backendProtocol ?? (item.protocol === 'TCP' ? 'HTTP' : (item.protocol as ProtocolType));
+
         return {
           networkName: ingress?.metadata?.name || '',
           portName: item.name || '',
           port: item.port,
-          protocol:
-            (ingress?.metadata?.annotations?.[
-              'nginx.ingress.kubernetes.io/backend-protocol'
-            ] as AppEditType['networks'][0]['protocol']) || item.protocol === 'TCP'
-              ? 'HTTP'
-              : (item.protocol as AppEditType['networks'][number]['protocol']),
+          protocol: protocol,
           openPublicDomain: !!ingress,
           ...(domain.endsWith(SEALOS_DOMAIN)
             ? {

frontend/providers/applaunchpad/src/utils/tools.ts

@@ -239,22 +239,21 @@ export function downLoadBold(content: BlobPart, type: string, fileName: string)
  * patch yamlList and get action
  */
 export const patchYamlList = ({
-  formOldYamlList,
-  newYamlList,
-  crYamlList
+  parsedOldYamlList,
+  parsedNewYamlList,
+  originalYamlList
 }: {
-  formOldYamlList: string[];
-  newYamlList: string[];
-  crYamlList: DeployKindsType[];
+  parsedOldYamlList: string[];
+  parsedNewYamlList: string[];
+  originalYamlList: DeployKindsType[];
 }) => {
-  console.log(formOldYamlList, newYamlList, crYamlList, '=======');
-
-  const oldFormJsonList = formOldYamlList
+  const oldFormJsonList = parsedOldYamlList
     .map((item) => yaml.loadAll(item))
     .flat() as DeployKindsType[];
-  const newFormJsonList = newYamlList.map((item) => yaml.loadAll(item)).flat() as DeployKindsType[];
 
-  console.log(oldFormJsonList, newFormJsonList, crYamlList, '===patchYamlList===');
+  const newFormJsonList = parsedNewYamlList
+    .map((item) => yaml.loadAll(item))
+    .flat() as DeployKindsType[];
 
   const actions: AppPatchPropsType = [];
 
@@ -271,6 +270,7 @@ export const patchYamlList = ({
       });
     }
   });
+
   // find create and patch
   newFormJsonList.forEach((newYamlJson) => {
     const oldFormJson = oldFormJsonList.find(
@@ -287,7 +287,7 @@ export const patchYamlList = ({
       const actionsJson = (() => {
         try {
           /* find cr json */
-          let crOldYamlJson = crYamlList.find(
+          let crOldYamlJson = originalYamlList.find(
             (item) =>
               item.kind === oldFormJson?.kind &&
               item?.metadata?.name === oldFormJson?.metadata?.name
@@ -314,20 +314,26 @@ export const patchYamlList = ({
           }
 
           /* generate new json */
-          const _patchRes: jsonpatch.Operation[] = patchRes.map((item) => {
-            let jsonPatchError = jsonpatch.validate([item], crOldYamlJson);
-            if (
-              jsonPatchError?.operation &&
-              jsonPatchError?.name === 'OPERATION_PATH_UNRESOLVABLE'
-            ) {
-              return {
-                ...jsonPatchError.operation,
-                op: 'add'
-              };
-            } else {
+          const _patchRes: jsonpatch.Operation[] = patchRes
+            .map((item) => {
+              let jsonPatchError = jsonpatch.validate([item], crOldYamlJson);
+              if (jsonPatchError?.name === 'OPERATION_PATH_UNRESOLVABLE') {
+                switch (item.op) {
+                  case 'add':
+                  case 'replace':
+                    return {
+                      ...item,
+                      op: 'add' as const,
+                      value: item.value ?? ''
+                    };
+                  default:
+                    return null;
+                }
+              }
               return item;
-            }
-          });
+            })
+            .filter((op): op is jsonpatch.Operation => op !== null);
+
           const patchResYamlJson = jsonpatch.applyPatch(crOldYamlJson, _patchRes, true).newDocument;
 
           // delete invalid field
@@ -344,7 +350,7 @@ export const patchYamlList = ({
 
           return patchResYamlJson;
         } catch (error) {
-          console.log('ACTIONS JSON ERROR\n', error);
+          console.error('ACTIONS JSON ERROR:\n', error);
           return newYamlJson;
         }
       })();
@@ -373,13 +379,7 @@ export const patchYamlList = ({
         }
       }
 
-      console.log(
-        'patch result===',
-        oldFormJson.metadata?.name,
-        oldFormJson.kind,
-        patchRes,
-        actionsJson
-      );
+      console.log('patch result:', oldFormJson.metadata?.name, oldFormJson.kind, actionsJson);
 
       actions.push({
         type: 'patch',
@@ -394,7 +394,7 @@ export const patchYamlList = ({
       });
     }
   });
-  console.log(actions, 'actions');
+
   return actions;
 };