@gravitee/ui-particles-angular 17.4.0 → 17.5.0

package/fesm2022/gravitee-ui-particles-angular.mjs

@@ -2976,7 +2976,8 @@ class GioFormlyJsonSchemaService {
         this.formlyJsonschema = formlyJsonschema;
     }
     toFormlyFieldConfig(jsonSchema, context) {
-        return this.formlyJsonschema.toFieldConfig(jsonSchema, {
+        const preprocessed = this.preserveGioConfigOnRefs(jsonSchema);
+        return this.formlyJsonschema.toFieldConfig(preprocessed, {
             map: (mappedField, mapSource) => {
                 mappedField = this.uiTypeMap(mappedField, mapSource); // Keep first in order to correctly construct tree
                 mappedField = this.displayIfMap(mappedField, mapSource, context);
@@ -3182,6 +3183,61 @@ class GioFormlyJsonSchemaService {
         }
         return mappedField;
     }
+    /**
+     * Formly's $ref resolution only preserves title, description, default and widget from sibling properties.
+     * This method walks the schema and inlines $ref definitions when gioConfig is present alongside a $ref,
+     * so that gioConfig is not lost during resolution.
+     */
+    preserveGioConfigOnRefs(schema) {
+        return this.walkSchema(schema, schema);
+    }
+    walkSchema(node, root) {
+        if (!isObject(node) || isArray(node)) {
+            return node;
+        }
+        let result = { ...node };
+        // If this node has a $ref alongside gioConfig, inline the resolved definition
+        if (result.$ref && result.gioConfig) {
+            const resolved = this.resolveRef(result.$ref, root);
+            if (resolved) {
+                const { $ref, ...rest } = result;
+                result = { ...resolved, ...rest };
+            }
+        }
+        // Recurse into properties
+        if (result.properties) {
+            const newProps = {};
+            for (const [key, value] of Object.entries(result.properties)) {
+                newProps[key] = this.walkSchema(value, root);
+            }
+            result = { ...result, properties: newProps };
+        }
+        // Recurse into items
+        if (result.items) {
+            if (isArray(result.items)) {
+                result = { ...result, items: result.items.map(item => this.walkSchema(item, root)) };
+            }
+            else if (isObject(result.items)) {
+                result = { ...result, items: this.walkSchema(result.items, root) };
+            }
+        }
+        // Recurse into allOf / oneOf / anyOf
+        for (const keyword of ['allOf', 'oneOf', 'anyOf']) {
+            if (isArray(result[keyword])) {
+                result = { ...result, [keyword]: result[keyword].map(s => this.walkSchema(s, root)) };
+            }
+        }
+        return result;
+    }
+    resolveRef(ref, root) {
+        const [, pointer] = ref.split('#/');
+        if (!pointer) {
+            return null;
+        }
+        return pointer
+            .split('/')
+            .reduce((acc, path) => (acc && acc[path]) ?? null, root);
+    }
     uniqueValueMap(mappedField, mapSource) {
         let fieldNameWithErrors = undefined;
         if (mapSource.gioConfig?.uniqueItemProperties) {