Fix Object tags in Document Schema

Author: kazmer97

src/ui/src/components/configuration-layout/ConfigurationLayout.jsx

@@ -776,7 +776,14 @@ const ConfigurationLayout = () => {
         const builtObject = buildObjectFromPaths(differences);
         console.log('DEBUG: Built object from paths:', builtObject);
 
-        // CRITICAL: If there are no differences, don't send update to backend
+        // CRITICAL: Always include the current document schema (classes) if it exists
+        // This prevents the schema from being lost when saving other configuration changes
+        if (formValues.classes && Array.isArray(formValues.classes) && formValues.classes.length > 0) {
+          builtObject.classes = formValues.classes;
+          console.log('DEBUG: Including document schema (classes) in save:', formValues.classes);
+        }
+
+        // CRITICAL: If there are no differences AND no schema, don't send update to backend
         // This prevents unnecessary API calls and potential data issues
         if (Object.keys(builtObject).length === 0) {
           console.log('No changes detected, skipping save');

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

@@ -186,13 +186,25 @@ const SchemaInspector = ({
 
         <FormField label="Type" description="JSON Schema type for this attribute">
           <Select
-            selectedOption={TYPE_OPTIONS.find((opt) => opt.value === selectedAttribute.type) || null}
-            onChange={({ detail }) => onUpdate({ type: detail.selectedOption.value })}
+            selectedOption={
+              TYPE_OPTIONS.find((opt) => opt.value === selectedAttribute.type) ||
+              // If no type but has $ref, assume it's an object reference
+              (selectedAttribute.$ref ? TYPE_OPTIONS.find((opt) => opt.value === 'object') : null) ||
+              null
+            }
+            onChange={({ detail }) => {
+              // When changing type, remove $ref if it exists (it's incompatible with inline type)
+              const updates = { type: detail.selectedOption.value };
+              if (selectedAttribute.$ref) {
+                updates.$ref = undefined;
+              }
+              onUpdate(updates);
+            }}
             options={TYPE_OPTIONS}
           />
         </FormField>
 
-        {selectedAttribute.type === 'object' && availableClasses && availableClasses.length > 0 && (
+        {(selectedAttribute.type === 'object' || selectedAttribute.$ref) && availableClasses && availableClasses.length > 0 && (
           <>
             <FormField
               label="Reference Existing Class (Optional)"
@@ -211,14 +223,23 @@ const SchemaInspector = ({
                   onChange={({ detail }) => {
                     if (detail.selectedOption.value) {
                       const updates = { ...selectedAttribute, $ref: detail.selectedOption.value };
+                      // Remove inline object properties as they conflict with $ref
                       delete updates.properties;
                       delete updates.required;
                       delete updates.minProperties;
                       delete updates.maxProperties;
                       delete updates.additionalProperties;
+                      // Note: Keep type as 'object' for UI purposes, but it won't be exported in the final schema
+                      if (!updates.type) {
+                        updates.type = 'object';
+                      }
                       onUpdate(updates);
                     } else {
                       const updates = { ...selectedAttribute, $ref: undefined };
+                      // Restore type to object when removing $ref
+                      if (!updates.type) {
+                        updates.type = 'object';
+                      }
                       onUpdate(updates);
                     }
                   }}

src/ui/src/components/json-schema-builder/utils/badgeHelpers.jsx

@@ -25,10 +25,11 @@ export const getTypeColor = (type) => {
 export const getTypeBadgeText = (attribute) => {
   if (!attribute) return null;
 
-  // Object with reference: show as "object[ClassName]"
-  if (attribute.type === 'object' && attribute.$ref) {
+  // Object with reference: show as "ClassName" (without object prefix)
+  // Note: When an attribute has a $ref, it typically doesn't have a type field
+  if (attribute.$ref) {
     const className = attribute.$ref.replace('#/$defs/', '');
-    return { text: `object[${className}]`, color: getTypeColor('object'), className };
+    return { text: `${className}`, color: getTypeColor('object'), className };
   }
 
   // Array with reference: show as "array[ClassName]"