Merge branch 'develop' of ssh.gitlab.aws.dev:genaiic-reusable-assets/engagement-artifacts/genaiic-idp-accelerator into develop

Author: Bob Strahan

CHANGELOG.md

@@ -7,6 +7,8 @@ SPDX-License-Identifier: MIT-0
 
 ### Added
 
+### Fixed
+
 ## [0.4.3]
 
 ### Fixed
@@ -20,6 +22,11 @@ SPDX-License-Identifier: MIT-0
 - Evaluation Configuration Robustness
   - Improved JSON Schema error messages with actionable diagnostics when configuration issues occur
   - Added automatic type coercion for numeric constraints (e.g., `maxItems: "7"` → `maxItems: 7`) to handle common YAML parsing quirks gracefully
+- UI: Document Schema Editor Input Field Fixes
+  - Fixed Examples, Default Value, Const, and Enum Values fields not allowing first character deletion or comma input
+  - Fixed Enum field remaining disabled after clearing Const value
+  - Fixed "Clear all enum values" button not working
+  - Fixed empty Evaluation Method picklist for Array[String] and other simple array types
 
 ### Templates
    - us-west-2: `https://s3.us-west-2.amazonaws.com/aws-ml-blog-us-west-2/artifacts/genai-idp/idp-main_0.4.3.yaml`

src/ui/src/components/json-schema-builder/SchemaInspector.jsx

@@ -436,8 +436,14 @@ const SchemaInspector = ({
             }
             // Methods with validFor restrictions
             if (opt.validFor) {
-              // For arrays, check if method is valid for arrays
-              if (selectedAttribute.type === 'array') {
+              // For arrays with SIMPLE items (Array[String], Array[Number], etc.)
+              // check if method is valid for the ITEM type
+              if (selectedAttribute.type === 'array' && !isStructuredArray) {
+                const itemType = selectedAttribute.items?.type || 'string';
+                return opt.validFor.includes(itemType);
+              }
+              // For structured arrays (Array[Object]), check if method is valid for arrays
+              if (selectedAttribute.type === 'array' && isStructuredArray) {
                 return opt.validFor.includes('array');
               }
               // For other types, check directly

src/ui/src/components/json-schema-builder/constraints/MetadataFields.jsx

@@ -1,9 +1,58 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { FormField, Textarea, Input } from '@cloudscape-design/components';
 import { formatValueForInput, parseInputValue } from '../utils/schemaHelpers';
 
 const MetadataFields = ({ attribute, onUpdate }) => {
+  // Local state for buffering user input without immediate parsing
+  const [examplesInput, setExamplesInput] = useState('');
+  const [defaultValueInput, setDefaultValueInput] = useState('');
+
+  // Initialize local state from attribute values
+  useEffect(() => {
+    if (!attribute.examples) {
+      setExamplesInput('');
+    } else if (Array.isArray(attribute.examples)) {
+      setExamplesInput(attribute.examples.map((ex) => (typeof ex === 'object' ? JSON.stringify(ex) : ex)).join(', '));
+    }
+  }, [attribute.examples]);
+
+  useEffect(() => {
+    setDefaultValueInput(formatValueForInput(attribute.default));
+  }, [attribute.default]);
+
+  // Handle Examples field blur - parse and update parent state
+  const handleExamplesBlur = () => {
+    if (!examplesInput.trim()) {
+      const updates = { ...attribute };
+      delete updates.examples;
+      onUpdate(updates);
+      return;
+    }
+    try {
+      const parsed = JSON.parse(`[${examplesInput}]`);
+      onUpdate({ examples: parsed });
+    } catch {
+      const examples = examplesInput
+        .split(',')
+        .map((v) => v.trim())
+        .filter((v) => v);
+      onUpdate({ examples: examples.length > 0 ? examples : undefined });
+    }
+  };
+
+  // Handle Default Value field blur - parse and update parent state
+  const handleDefaultValueBlur = () => {
+    if (!defaultValueInput) {
+      const updates = { ...attribute };
+      delete updates.default;
+      onUpdate(updates);
+      return;
+    }
+    const parsed = parseInputValue(defaultValueInput, attribute.type);
+    onUpdate({ default: parsed });
+  };
+
   return (
     <>
       <FormField
@@ -23,29 +72,9 @@ const MetadataFields = ({ attribute, onUpdate }) => {
         description="Provide example values to guide extraction. This helps the LLM understand the expected format and content. Enter comma-separated values or a JSON array."
       >
         <Textarea
-          value={(() => {
-            if (!attribute.examples) return '';
-            if (!Array.isArray(attribute.examples)) return '';
-            return attribute.examples.map((ex) => (typeof ex === 'object' ? JSON.stringify(ex) : ex)).join(', ');
-          })()}
-          onChange={({ detail }) => {
-            if (!detail.value.trim()) {
-              const updates = { ...attribute };
-              delete updates.examples;
-              onUpdate(updates);
-              return;
-            }
-            try {
-              const parsed = JSON.parse(`[${detail.value}]`);
-              onUpdate({ examples: parsed });
-            } catch {
-              const examples = detail.value
-                .split(',')
-                .map((v) => v.trim())
-                .filter((v) => v);
-              onUpdate({ examples: examples.length > 0 ? examples : undefined });
-            }
-          }}
+          value={examplesInput}
+          onChange={({ detail }) => setExamplesInput(detail.value)}
+          onBlur={handleExamplesBlur}
           rows={2}
           placeholder='e.g., "INV-2024-001", "PO-12345" or ["John Doe", "Jane Smith"]'
         />
@@ -56,17 +85,9 @@ const MetadataFields = ({ attribute, onUpdate }) => {
         description="Fallback value to use if this field is not found or cannot be extracted from the document."
       >
         <Input
-          value={formatValueForInput(attribute.default)}
-          onChange={({ detail }) => {
-            if (!detail.value) {
-              const updates = { ...attribute };
-              delete updates.default;
-              onUpdate(updates);
-              return;
-            }
-            const parsed = parseInputValue(detail.value, attribute.type);
-            onUpdate({ default: parsed });
-          }}
+          value={defaultValueInput}
+          onChange={({ detail }) => setDefaultValueInput(detail.value)}
+          onBlur={handleDefaultValueBlur}
           placeholder="e.g., 0, N/A, or a JSON value"
         />
       </FormField>

src/ui/src/components/json-schema-builder/constraints/ValueConstraints.jsx

@@ -1,26 +1,63 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Header, FormField, Input, TokenGroup, Button, SpaceBetween } from '@cloudscape-design/components';
 import { formatValueForInput, parseInputValue } from '../utils/schemaHelpers';
 
 const ValueConstraints = ({ attribute, onUpdate }) => {
+  // Local state for buffering user input without immediate parsing
+  const [constInput, setConstInput] = useState('');
+  const [enumInput, setEnumInput] = useState('');
+
+  // Initialize local state from attribute values
+  useEffect(() => {
+    setConstInput(formatValueForInput(attribute.const));
+  }, [attribute.const]);
+
+  // Initialize enum input as empty (it's only shown when no enum exists yet)
+  useEffect(() => {
+    if (!attribute.enum || attribute.enum.length === 0) {
+      setEnumInput('');
+    }
+  }, [attribute.enum]);
+
+  // Handle Const field blur - parse and update parent state
+  const handleConstBlur = () => {
+    if (!constInput) {
+      onUpdate({ const: undefined });
+      return;
+    }
+    const parsed = parseInputValue(constInput, attribute.type);
+    onUpdate({ const: parsed });
+  };
+
+  // Handle Enum field blur - parse and update parent state
+  const handleEnumBlur = () => {
+    const value = enumInput.trim();
+    if (value) {
+      try {
+        const parsed = JSON.parse(`[${value}]`);
+        onUpdate({ enum: parsed });
+      } catch {
+        const enumValues = value
+          .split(',')
+          .map((v) => v.trim())
+          .filter((v) => v);
+        onUpdate({ enum: enumValues.length > 0 ? enumValues : undefined });
+      }
+      // Clear the input after successful processing
+      setEnumInput('');
+    }
+  };
+
   return (
     <>
       <Header variant="h4">Value Constraints</Header>
 
       <FormField label="Const (Single Constant Value)" description="Field must be exactly this value">
         <Input
-          value={formatValueForInput(attribute.const)}
-          onChange={({ detail }) => {
-            if (!detail.value) {
-              const updates = { ...attribute };
-              delete updates.const;
-              onUpdate(updates);
-              return;
-            }
-            const parsed = parseInputValue(detail.value, attribute.type);
-            onUpdate({ const: parsed });
-          }}
+          value={constInput}
+          onChange={({ detail }) => setConstInput(detail.value)}
+          onBlur={handleConstBlur}
           placeholder='e.g., "active", 42, or JSON value'
           disabled={attribute.enum && attribute.enum.length > 0}
         />
@@ -46,9 +83,7 @@ const ValueConstraints = ({ attribute, onUpdate }) => {
             <Button
               variant="link"
               onClick={() => {
-                const updates = { ...attribute };
-                delete updates.enum;
-                onUpdate(updates);
+                onUpdate({ enum: undefined });
               }}
             >
               Clear all enum values
@@ -57,22 +92,9 @@ const ValueConstraints = ({ attribute, onUpdate }) => {
         ) : (
           <Input
             placeholder="value1, value2, value3"
-            defaultValue=""
-            onBlur={(e) => {
-              const value = e.target.value.trim();
-              if (value) {
-                try {
-                  const parsed = JSON.parse(`[${value}]`);
-                  onUpdate({ enum: parsed });
-                } catch {
-                  const enumValues = value
-                    .split(',')
-                    .map((v) => v.trim())
-                    .filter((v) => v);
-                  onUpdate({ enum: enumValues.length > 0 ? enumValues : undefined });
-                }
-              }
-            }}
+            value={enumInput}
+            onChange={({ detail }) => setEnumInput(detail.value)}
+            onBlur={handleEnumBlur}
             disabled={attribute.const !== undefined}
           />
         )}