[frontend] fix: handle payload arguments correctly in updates (#4824)

Author: savacano28

openaev-front/src/admin/components/threat_arsenal/ThreatArsenalActionForm.tsx

@@ -2,7 +2,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Box, Button } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
 import { type SyntheticEvent, useEffect } from 'react';
-import { type FieldValues, FormProvider, type SubmitHandler, useForm, useWatch } from 'react-hook-form';
+import { type FieldValues, FormProvider, type Resolver, type SubmitHandler, useForm, useWatch } from 'react-hook-form';
 import { z, type ZodTypeAny } from 'zod';
 
 import Tabs, { type TabsEntry } from '../../../components/common/tabs/Tabs';
@@ -101,8 +101,8 @@ const ThreatArsenalActionForm = ({
     key: z.string().nonempty(t('Should not be empty')),
     type: z.enum(['text', 'number', 'port', 'portscan', 'ipv4', 'ipv6', 'credentials', 'cve', 'document', 'targeted-asset', 'kerberoastable_account', 'asreproastable_account', 'account_with_password_not_required', 'vulnerability', 'sid', 'delegation', 'password_policy', 'computer', 'group', 'admin_username', 'share', 'username'], { error: t('Should not be empty') }),
     subtype: z.enum(['host', 'port', 'service', 'username', 'password', 'severity', 'domain']).optional(),
-    description: z.string().optional().nullable(),
-    separator: z.string().optional().nullable(),
+    description: z.string().optional(),
+    separator: z.string().optional(),
   }).refine(
     data => data.type !== 'targeted-asset' || !!data.separator,
     {
@@ -159,7 +159,7 @@ const ThreatArsenalActionForm = ({
 
   const methods = useForm<ThreatArsenalActionCreateCustomInput>({
     mode: 'onTouched',
-    resolver: zodResolver(schema),
+    resolver: zodResolver(schema) as Resolver<ThreatArsenalActionCreateCustomInput>,
     defaultValues: initialValues,
   });
   const {
@@ -227,7 +227,7 @@ const ThreatArsenalActionForm = ({
       focusFirstErrorTab();
       return;
     }
-    await handleSubmit(onSubmit)(e);
+    await handleSubmit(onSubmit as SubmitHandler<FieldValues>)(e);
   };
 
   const trackedUseWatch = useWatch({

openaev-front/src/admin/components/threat_arsenal/ThreatArsenalActionPopover.tsx

@@ -65,7 +65,12 @@ const buildInitialValues = (action: ThreatArsenalActionFullOutput, actionName: s
     command_executor: action.command_executor as string | undefined,
     command_content: action.command_content as string | undefined,
     dns_resolution_hostname: action.dns_resolution_hostname as string | undefined,
-    action_arguments: action.action_arguments,
+    action_arguments: action.action_arguments?.map(arg => ({
+      ...arg,
+      subtype: arg.subtype ?? undefined,
+      description: arg.description ?? undefined,
+      separator: arg.separator ?? undefined,
+    })),
     action_prerequisites: action.action_prerequisites,
     file_drop_file: action.file_drop_file as string | undefined,
     action_attack_patterns: action.action_attack_patterns,
@@ -129,7 +134,7 @@ const ThreatArsenalActionPopover = ({
     setFetchedAction(null);
   };
 
-  const onSubmitEdit = (data: ThreatArsenalActionCreateCustomInput) => {
+  const onSubmitEdit = async (data: ThreatArsenalActionCreateCustomInput) => {
     const inputValues: ThreatArsenalActionCreateInput = {
       ...data,
       action_cleanup_executor: handleCleanupExecutorValue(
@@ -150,12 +155,11 @@ const ThreatArsenalActionPopover = ({
         }),
     } as ThreatArsenalActionCreateInput;
 
-    return dispatch(updateThreatArsenalAction(actionId, inputValues).then(({ data }: { data: ThreatArsenalAction }) => {
-      if (data && onUpdate) {
-        onUpdate(data);
-      }
-      handleCloseEdit();
-    }));
+    const response = await updateThreatArsenalAction(actionId, inputValues);
+    if (response.data && onUpdate) {
+      onUpdate(response.data as ThreatArsenalAction);
+    }
+    handleCloseEdit();
   };
 
   // -- Delete --
@@ -176,13 +180,12 @@ const ThreatArsenalActionPopover = ({
   };
   const handleCloseDuplicate = () => setOpenDuplicate(false);
 
-  const submitDuplicate = () => {
-    return dispatch(duplicateThreatArsenalAction(actionId).then(({ data }: { data: ThreatArsenalAction }) => {
-      if (data && onDuplicate) {
-        onDuplicate(data);
-      }
-      handleCloseDuplicate();
-    }));
+  const submitDuplicate = async () => {
+    const response = await duplicateThreatArsenalAction(actionId);
+    if (response.data && onDuplicate) {
+      onDuplicate(response.data as ThreatArsenalAction);
+    }
+    handleCloseDuplicate();
   };
 
   const hasUpdateCapability = ability.can(ACTIONS.MANAGE, SUBJECTS.PAYLOADS) || ability.can(ACTIONS.MANAGE, SUBJECTS.RESOURCE, payloadId);