cloud-ide-element 1.1.85 → 1.1.87

package/fesm2022/cloud-ide-element.mjs

@@ -9634,7 +9634,9 @@ class CideEleDataGridComponent {
      */
     getItemId(item) {
         if (item && typeof item === 'object') {
-            const id = item['_id'];
+            // Use trackBy from config, fallback to '_id' if not specified
+            const trackBy = this.mergedConfig().trackBy || '_id';
+            const id = this.getNestedValue(item, trackBy);
             return id ? String(id) : null;
         }
         return null;
@@ -9768,26 +9770,13 @@ class CideEleDataGridComponent {
                     valueA = '';
                 if (valueB === null || valueB === undefined)
                     valueB = '';
-                // Handle objects - extract display text for comparison
+                // Handle objects - convert to string for comparison
+                // The consuming component should normalize data before passing to grid
                 if (typeof valueA === 'object' && valueA !== null && !Array.isArray(valueA) && !(valueA instanceof Date)) {
-                    const objA = valueA;
-                    const displayProps = ['name', 'title', 'label', 'text', 'display_text', 'user_fullname', 'sygms_title'];
-                    for (const prop of displayProps) {
-                        if (objA[prop] !== undefined && objA[prop] !== null) {
-                            valueA = objA[prop];
-                            break;
-                        }
-                    }
+                    valueA = String(valueA);
                 }
                 if (typeof valueB === 'object' && valueB !== null && !Array.isArray(valueB) && !(valueB instanceof Date)) {
-                    const objB = valueB;
-                    const displayProps = ['name', 'title', 'label', 'text', 'display_text', 'user_fullname', 'sygms_title'];
-                    for (const prop of displayProps) {
-                        if (objB[prop] !== undefined && objB[prop] !== null) {
-                            valueB = objB[prop];
-                            break;
-                        }
-                    }
+                    valueB = String(valueB);
                 }
                 // Convert to strings for comparison
                 const strA = String(valueA || '').toLowerCase();
@@ -9897,7 +9886,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 +9896,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
@@ -9915,13 +9906,12 @@ class CideEleDataGridComponent {
                         const childExists = parentChildren.some(child => String(this.getNestedValue(child, primaryKey) || '') === itemId);
                         if (!childExists) {
                             // Calculate level based on parent - automatically set level key
-                            const parentLevel = this.getNestedValue(parent, 'level') || 0;
+                            const parentLevel = this.getNestedValue(parent, levelKey) || 0;
                             const childLevel = parentLevel + 1;
                             // Update child item with correct level
                             const updatedTreeItem = {
                                 ...treeItem,
-                                [levelKey]: childLevel,
-                                level: childLevel // Always add 'level' property for consistent access
+                                [levelKey]: childLevel
                             };
                             itemMap.set(itemId, updatedTreeItem);
                             // Add updated child to parent's children array
@@ -9945,8 +9935,7 @@ class CideEleDataGridComponent {
                     // This is a root item - automatically set level to 0
                     const updatedRootItem = {
                         ...treeItem,
-                        [levelKey]: 0,
-                        level: 0 // Always add 'level' property for consistent access
+                        [levelKey]: 0
                     };
                     itemMap.set(itemId, updatedRootItem);
                     if (!rootItems.some(rootItem => String(this.getNestedValue(rootItem, primaryKey) || '') === itemId)) {
@@ -10013,7 +10002,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 +10112,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);
@@ -10180,13 +10171,15 @@ class CideEleDataGridComponent {
                     return updatedItem;
                 }
                 // Check children recursively
-                const children = this.getNestedValue(treeItem, 'children') || [];
+                const { childrenKey = 'children' } = treeConfig;
+                const children = this.getNestedValue(treeItem, childrenKey) || [];
                 if (children.length > 0) {
                     const updatedChildren = updateItemInTree(children);
-                    return {
-                        ...treeItem,
-                        children: updatedChildren
+                    const updatedItem = {
+                        ...treeItem
                     };
+                    this.setNestedValue(updatedItem, childrenKey, updatedChildren);
+                    return updatedItem;
                 }
                 return treeItem;
             });
@@ -10410,20 +10403,14 @@ class CideEleDataGridComponent {
      * Get item level in tree
      */
     getItemLevel(item) {
-        // Always try to get level from standard 'level' property first (set by transformToTree)
-        let level = this.getNestedValue(item, 'level');
-        // If not found, try tree config level key
-        if (level === undefined || level === null) {
-            const treeConfig = this.getTreeConfig();
-            if (treeConfig) {
-                const { levelKey = 'level' } = treeConfig;
-                level = this.getNestedValue(item, levelKey) || 0;
-            }
-            else {
-                level = 0;
-            }
+        // Get level from tree config level key
+        const treeConfig = this.getTreeConfig();
+        if (treeConfig) {
+            const { levelKey = 'level' } = treeConfig;
+            const itemLevel = this.getNestedValue(item, levelKey);
+            return itemLevel !== undefined && itemLevel !== null ? itemLevel : 0;
         }
-        return level;
+        return 0;
     }
     /**
      * Check if item is expanded
@@ -10626,10 +10613,11 @@ class CideEleDataGridComponent {
             return actualOrder;
         }
         // Final fallback to index-based calculation
+        const trackBy = this.mergedConfig().trackBy || '_id';
         const currentIndex = this.displayedData.findIndex(currentItem => {
             if (item && currentItem && typeof item === 'object' && typeof currentItem === 'object') {
-                const itemId = item['_id'];
-                const currentItemId = currentItem['_id'];
+                const itemId = this.getNestedValue(item, trackBy);
+                const currentItemId = this.getNestedValue(currentItem, trackBy);
                 return itemId && currentItemId && itemId === currentItemId;
             }
             return item === currentItem;
@@ -11200,30 +11188,15 @@ class CideEleDataGridComponent {
      * Tries common field patterns based on column key
      */
     extractValueFromRowForTemplateColumn(row, column) {
-        // Try common patterns based on column key
         const rowData = row;
-        // If column key is 'details', try common detail/display fields
-        if (column.key === 'details' || column.key.includes('detail')) {
-            // Try display_text, name, title fields
-            if (rowData['fdlds_display_text'])
-                return rowData['fdlds_display_text'];
-            if (rowData['display_text'])
-                return rowData['display_text'];
-            if (rowData['name'])
-                return rowData['name'];
-            if (rowData['title'])
-                return rowData['title'];
-        }
         // Try to find a field that matches the column key pattern
-        // For example, if key is 'details', try 'detail', 'detail_text', etc.
+        // Try variations like: key, key_text, key_name, key_title, key_display
         const keyVariations = [
             column.key,
             `${column.key}_text`,
             `${column.key}_name`,
             `${column.key}_title`,
-            `${column.key}_display`,
-            `fdlds_${column.key}`,
-            `${column.key.replace('details', 'display_text')}`
+            `${column.key}_display`
         ];
         for (const variation of keyVariations) {
             if (rowData[variation] !== undefined && rowData[variation] !== null) {
@@ -11231,12 +11204,14 @@ class CideEleDataGridComponent {
             }
         }
         // Try to find any string field in the row that might be a display value
+        // Skip ID fields using trackBy from config
+        const trackBy = this.mergedConfig().trackBy || '_id';
         for (const key in rowData) {
             if (rowData.hasOwnProperty(key)) {
                 const value = rowData[key];
                 if (value !== null && value !== undefined && typeof value === 'string' && value.trim() !== '') {
-                    // Skip common ID fields
-                    if (!key.includes('_id') && !key.includes('id_')) {
+                    // Skip ID fields - use trackBy from config
+                    if (key !== trackBy && !key.toLowerCase().includes('id')) {
                         return value;
                     }
                 }
@@ -11246,16 +11221,19 @@ class CideEleDataGridComponent {
     }
     /**
      * Get a stable key for filter value comparison
-     * Handles objects by using _id or JSON stringification
+     * Handles objects by using trackBy/primaryKey or JSON stringification
      */
     getFilterValueKey(value) {
         if (value === null || value === undefined)
             return 'null';
         if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
             const obj = value;
-            // Use _id if available for object comparison
-            if ('_id' in obj && obj['_id'] !== undefined) {
-                return `obj_${String(obj['_id'])}`;
+            // Use trackBy or primaryKey from config for object comparison
+            const trackBy = this.mergedConfig().trackBy;
+            const treeConfig = this.mergedConfig().tree;
+            const primaryKey = treeConfig?.primaryKey || trackBy;
+            if (primaryKey && primaryKey in obj && obj[primaryKey] !== undefined) {
+                return `obj_${String(obj[primaryKey])}`;
             }
             // Otherwise use JSON string for comparison
             try {
@@ -11274,34 +11252,21 @@ class CideEleDataGridComponent {
             return value ? 'Yes' : 'No';
         if (value instanceof Date)
             return value.toLocaleDateString();
-        // Handle objects - try to extract display text
+        // Handle objects - convert to string generically
+        // The consuming component should normalize data before passing to grid
         if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+            // Try to get first string property (excluding ID fields)
             const obj = value;
-            // Try common display property names in order of preference
-            const displayProperties = [
-                'name', 'title', 'label', 'text', 'display_text',
-                'user_fullname', 'fullname', 'full_name',
-                'sygms_title', 'sygmt_title',
-                'user_name', 'username',
-                'email', 'description'
-            ];
-            for (const prop of displayProperties) {
-                if (obj[prop] !== undefined && obj[prop] !== null && typeof obj[prop] !== 'object') {
-                    return String(obj[prop]);
-                }
-            }
-            // If no display property found, try to get first string property
             for (const key in obj) {
                 if (obj.hasOwnProperty(key) && typeof obj[key] === 'string' && obj[key] !== '') {
-                    return String(obj[key]);
+                    // Skip ID fields
+                    if (!key.toLowerCase().includes('id') && !key.toLowerCase().includes('_id')) {
+                        return String(obj[key]);
+                    }
                 }
             }
-            // Last resort: use _id if available
-            if ('_id' in obj && obj['_id'] !== undefined) {
-                return String(obj['_id']);
-            }
-            // If still no value, return a generic label
-            return '(Object)';
+            // If no suitable string property found, convert to string
+            return String(value);
         }
         // Handle arrays
         if (Array.isArray(value)) {
@@ -11448,6 +11413,35 @@ 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 (from tree config or defaults to trackBy or '_id')
+     * @returns The extracted ID as a string, or empty string if not found
+     */
+    extractIdFromForeignKey(foreignKeyValue, primaryKey) {
+        // Get primary key from tree config or trackBy, fallback to '_id'
+        if (!primaryKey) {
+            const treeConfig = this.mergedConfig().tree;
+            primaryKey = treeConfig?.primaryKey || this.mergedConfig().trackBy || '_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
@@ -11746,6 +11740,7 @@ class CideEleDataGridComponent {
                 displayValue = this.formatValue(displayValue, column);
             }
             // If display value is still an object, convert to string
+            // The consuming component should normalize data before passing to grid
             if (typeof displayValue === 'object' && displayValue !== null && !Array.isArray(displayValue) && !(displayValue instanceof Date)) {
                 displayValue = String(displayValue);
             }
@@ -12033,32 +12028,18 @@ class CideEleDataGridComponent {
         // Handle objects - extract display text
         if (typeof value === 'object' && !Array.isArray(value) && !(value instanceof Date)) {
             const obj = value;
-            // Try common display properties
-            const displayProperties = [
-                'name', 'title', 'label', 'text', 'display_text',
-                'user_fullname', 'fullname', 'full_name',
-                'sygms_title', 'sygmt_title',
-                'user_name', 'username',
-                'email', 'description'
-            ];
-            for (const prop of displayProperties) {
-                if (obj[prop] !== undefined && obj[prop] !== null && typeof obj[prop] !== 'object') {
-                    return String(obj[prop]);
-                }
-            }
-            // Try first string property
+            // Try to get first string property (excluding ID fields)
+            // The consuming component should normalize data before passing to grid
             for (const key in obj) {
                 if (obj.hasOwnProperty(key) && typeof obj[key] === 'string' && obj[key] !== '') {
-                    if (!key.includes('_id') && !key.includes('id_')) {
+                    // Skip ID fields
+                    if (!key.toLowerCase().includes('id') && !key.toLowerCase().includes('_id')) {
                         return String(obj[key]);
                     }
                 }
             }
-            // Use _id as fallback
-            if ('_id' in obj && obj['_id'] !== undefined) {
-                return String(obj['_id']);
-            }
-            return '';
+            // If no suitable string property found, convert to string
+            return String(value);
         }
         // Handle arrays
         if (Array.isArray(value)) {