cloud-ide-element 1.1.85 → 1.1.86

package/fesm2022/cloud-ide-element.mjs

@@ -9897,7 +9897,8 @@ class CideEleDataGridComponent {
             itemsToProcess.forEach(item => {
                 const itemId = String(this.getNestedValue(item, primaryKey) || '');
                 const parentIdValue = this.getNestedValue(item, foreignKey);
-                const parentId = parentIdValue !== null && parentIdValue !== undefined ? String(parentIdValue) : '';
+                // Extract parent ID generically - handle both string IDs and nested objects
+                const parentId = this.extractIdFromForeignKey(parentIdValue, primaryKey);
                 const treeItem = itemMap.get(itemId);
                 // Skip if already processed
                 if (processedItems.has(itemId)) {
@@ -9906,7 +9907,8 @@ class CideEleDataGridComponent {
                 if (treeItem && parentId && itemMap.has(parentId)) {
                     // This is a child item - check if parent is processed or is a root
                     const parent = itemMap.get(parentId);
-                    const parentParentId = this.getNestedValue(parent, foreignKey);
+                    const parentParentIdValue = this.getNestedValue(parent, foreignKey);
+                    const parentParentId = this.extractIdFromForeignKey(parentParentIdValue, primaryKey);
                     const isParentRoot = !parentParentId || parentParentId === null || parentParentId === undefined;
                     if (isParentRoot || processedItems.has(parentId)) {
                         // Parent is processed or is root, we can process this child
@@ -10013,7 +10015,8 @@ class CideEleDataGridComponent {
         // Get parent information
         const itemId = String(this.getNestedValue(item, primaryKey) || '');
         const parentIdValue = this.getNestedValue(item, foreignKey);
-        const parentId = parentIdValue !== null && parentIdValue !== undefined ? String(parentIdValue) : '';
+        // Extract parent ID generically - handle both string IDs and nested objects
+        const parentId = this.extractIdFromForeignKey(parentIdValue, primaryKey);
         // If no parent, this is a root item (level 0)
         if (!parentId || !itemMap.has(parentId)) {
             return 0;
@@ -10122,7 +10125,8 @@ class CideEleDataGridComponent {
                 return;
             }
             const parentIdValue = this.getNestedValue(item, foreignKey);
-            const parentId = parentIdValue !== null && parentIdValue !== undefined ? String(parentIdValue) : '';
+            // Extract parent ID generically - handle both string IDs and nested objects
+            const parentId = this.extractIdFromForeignKey(parentIdValue, primaryKey);
             if (parentId) {
                 // Item has a parent - try to find parent
                 const parent = findParentInResult(parentId);
@@ -11448,6 +11452,30 @@ class CideEleDataGridComponent {
             return current && typeof current === 'object' ? current[key] : undefined;
         }, obj);
     }
+    /**
+     * Extract ID from foreign key value generically
+     * Handles both string IDs and nested objects (e.g., { _id: "...", name: "..." })
+     * @param foreignKeyValue - The foreign key value (can be string, object, or null/undefined)
+     * @param primaryKey - The primary key field name (defaults to '_id')
+     * @returns The extracted ID as a string, or empty string if not found
+     */
+    extractIdFromForeignKey(foreignKeyValue, primaryKey = '_id') {
+        if (foreignKeyValue === null || foreignKeyValue === undefined) {
+            return '';
+        }
+        // If it's already a string, return it
+        if (typeof foreignKeyValue === 'string') {
+            return foreignKeyValue.trim();
+        }
+        // If it's an object, extract the ID using the primary key
+        if (typeof foreignKeyValue === 'object' && foreignKeyValue !== null) {
+            const id = foreignKeyValue[primaryKey];
+            if (id !== null && id !== undefined) {
+                return String(id);
+            }
+        }
+        return '';
+    }
     /**
      * Set a nested value in an object using dot notation
      * @param obj The object to modify
@@ -11745,9 +11773,36 @@ class CideEleDataGridComponent {
             if (column.formatter) {
                 displayValue = this.formatValue(displayValue, column);
             }
-            // If display value is still an object, convert to string
+            // If display value is still an object, try to extract a meaningful value
             if (typeof displayValue === 'object' && displayValue !== null && !Array.isArray(displayValue) && !(displayValue instanceof Date)) {
-                displayValue = String(displayValue);
+                // Try to get a name/title property from the object
+                const obj = displayValue;
+                if (obj['name']) {
+                    displayValue = obj['name'];
+                }
+                else if (obj['title']) {
+                    displayValue = obj['title'];
+                }
+                else if (obj['acabrn_name']) {
+                    displayValue = obj['acabrn_name'];
+                }
+                else if (obj['acacpm_alise_title']) {
+                    displayValue = obj['acacpm_alise_title'];
+                }
+                else if (obj['acacpm_name']) {
+                    displayValue = obj['acacpm_name'];
+                }
+                else {
+                    displayValue = String(displayValue);
+                }
+            }
+            // Handle null/undefined/empty values for optional fields (e.g., optional specialization)
+            // Use a consistent label for null/undefined values to group them together
+            if (displayValue === null || displayValue === undefined || displayValue === '') {
+                displayValue = 'No Specialization';
+            }
+            if (rawValue === null || rawValue === undefined || rawValue === '') {
+                rawValue = 'No Specialization';
             }
             const groupKey = `${groupColumnKey}:${this.getFilterValueKey(rawValue)}`;
             const existing = groups.get(groupKey);