@jmruthers/pace-core 0.5.120 → 0.5.121

package/src/components/DataTable/utils/flexibleImport.ts

@@ -316,22 +316,43 @@ export function flexibleImport<T extends Record<string, unknown>>(
     description: ['description', 'Description', 'desc', 'Desc', 'details', 'Details'],
     email: ['email', 'Email', 'e-mail', 'E-mail', 'email_address'],
     phone: ['phone', 'Phone', 'telephone', 'Telephone', 'mobile', 'Mobile'],
-    address: ['address', 'Address', 'location', 'Location', 'addr', 'Addr']
+    address: ['address', 'Address', 'location', 'Location', 'addr', 'Addr'],
+    // Recipe/Dish field mappings (handle spaces and case variations)
+    dish_code: ['dish_code', 'dish code', 'Dish Code', 'Dish code', 'DISH CODE', 'dishcode', 'DishCode'],
+    dish_name: ['dish_name', 'dish name', 'Dish Name', 'Dish name', 'DISH NAME', 'dishname', 'DishName'],
+    mealtype_name: ['mealtype_name', 'mealtype name', 'Mealtype Name', 'Meal Type', 'meal type', 'Meal type', 'MEAL TYPE', 'mealtype', 'MealType'],
+    diettype_name: ['diettype_name', 'diettype name', 'Diettype Name', 'Diet Type', 'diet type', 'Diet type', 'DIET TYPE', 'diettype', 'DietType'],
+    item_name: ['item_name', 'item name', 'Item Name', 'Item name', 'ITEM NAME', 'itemname', 'ItemName'],
+    item_brand: ['item_brand', 'item brand', 'Item Brand', 'Item brand', 'ITEM BRAND', 'itembrand', 'ItemBrand', 'Brand', 'brand'],
+    recipe_qtypp: ['recipe_qtypp', 'recipe qtypp', 'Recipe Qtypp', 'Qty per Person', 'qty per person', 'Qty Per Person', 'qtypp', 'Qtypp', 'QTYPP'],
+    recipe_uptake: ['recipe_uptake', 'recipe uptake', 'Recipe Uptake', 'Uptake %', 'uptake %', 'Uptake', 'uptake', 'UPTAKE']
   };
   
   const columnMappings = { ...defaultMappings, ...options.columnMappings };
   
+  // Function to normalize column names for comparison (handles spaces, underscores, case)
+  const normalizeColumnName = (name: string): string => {
+    return name.toLowerCase()
+      .replace(/\s+/g, '_')  // Replace spaces with underscores
+      .replace(/[_-]+/g, '_')  // Normalize multiple underscores/hyphens to single underscore
+      .trim();
+  };
+
   // Function to find the best matching column name
   const findColumn = (targetField: string): string | null => {
     const possibleNames = columnMappings[targetField] || [targetField];
     const csvColumns = Object.keys(csvData[0] || {});
+    const normalizedTarget = normalizeColumnName(targetField);
     
     for (const possibleName of possibleNames) {
-      const found = csvColumns.find(col => 
-        col.toLowerCase() === possibleName.toLowerCase() ||
-        col.toLowerCase().includes(possibleName.toLowerCase()) ||
-        possibleName.toLowerCase().includes(col.toLowerCase())
-      );
+      const normalizedPossible = normalizeColumnName(possibleName);
+      const found = csvColumns.find(col => {
+        const normalizedCol = normalizeColumnName(col);
+        return normalizedCol === normalizedPossible ||
+               normalizedCol === normalizedTarget ||
+               normalizedCol.includes(normalizedPossible) ||
+               normalizedPossible.includes(normalizedCol);
+      });
       if (found) {
         logger.debug(`Mapped ${targetField} -> ${found}`);
         return found;