refactor: simplify control JSON null filtering

Author: lan17

ui/src/core/page-components/agent-detail/modals/edit-control/edit-control-content.tsx

@@ -42,11 +42,7 @@ import type {
   EditControlMode,
 } from './types';
 import { useEvaluatorConfigState } from './use-evaluator-config-state';
-import {
-  applyApiErrorsToForms,
-  omitNullProperties,
-  stringifyJsonWithoutNulls,
-} from './utils';
+import { applyApiErrorsToForms, stringifyJsonWithoutNulls } from './utils';
 
 const EVALUATOR_CONFIG_HEIGHT = 450;
 const JSON_EDITOR_HEIGHT = 520;
@@ -77,13 +73,9 @@ export const EditControlContent = ({
 }: EditControlContentProps) => {
   const { data: agentResponse } = useAgent(agentId);
   const steps = agentResponse?.steps ?? [];
-  const sanitizedControlDefinition = useMemo(
-    () => omitNullProperties(control.control) as ControlDefinition,
-    [control.control]
-  );
 
   const [workingDefinition, setWorkingDefinition] = useState<ControlDefinition>(
-    sanitizedControlDefinition
+    control.control
   );
   const [editorMode, setEditorMode] =
     useState<ControlEditorMode>(initialEditorMode);
@@ -398,17 +390,17 @@ export const EditControlContent = ({
   }, [definitionForm.values.action_decision]);
 
   useEffect(() => {
-    setWorkingDefinition(sanitizedControlDefinition);
+    setWorkingDefinition(control.control);
     setEditorMode(initialEditorMode);
     setDefinitionJsonText(
       initialEditorMode === 'json'
-        ? stringifyJsonWithoutNulls(sanitizedControlDefinition)
+        ? stringifyJsonWithoutNulls(control.control)
         : ''
     );
     setDefinitionJsonError(null);
     setDefinitionValidationError(null);
     setDefinitionValidationStatus('idle');
-  }, [initialEditorMode, sanitizedControlDefinition]);
+  }, [control.control, initialEditorMode]);
 
   useEffect(() => {
     reset();

ui/src/core/page-components/agent-detail/modals/edit-control/utils.ts

@@ -156,31 +156,17 @@ export function sanitizeControlNamePart(s: string): string {
   return sanitized || 'control';
 }
 
-/**
- * Recursively remove object properties whose values are null.
- */
-export function omitNullProperties(value: unknown): unknown {
-  if (Array.isArray(value)) {
-    return value.map((item) => omitNullProperties(item));
-  }
-
-  if (value !== null && typeof value === 'object') {
-    return Object.fromEntries(
-      Object.entries(value).flatMap(([key, currentValue]) =>
-        currentValue === null
-          ? []
-          : [[key, omitNullProperties(currentValue)]]
-      )
-    );
-  }
-
-  return value;
-}
-
 /**
  * Stringify JSON for editor display while omitting object properties whose
  * values are null. This keeps the editor aligned with persisted control data.
  */
 export function stringifyJsonWithoutNulls(value: unknown): string {
-  return JSON.stringify(omitNullProperties(value), null, 2) ?? '';
+  return (
+    JSON.stringify(
+      value,
+      (_key: string, currentValue: unknown) =>
+        currentValue === null ? undefined : currentValue,
+      2
+    ) ?? ''
+  );
 }