myio-js-library 0.1.40 → 0.1.41

package/dist/index.cjs

@@ -6947,7 +6947,7 @@ var AllReportModal = class {
     return maybe || null;
   }
   // Helper: pick a numeric consumption from an API item
-  pickNumericConsumption(item) {
+  pickConsumption(item) {
     const fields = ["total_value", "totalValue", "consumption", "value", "total", "energy", "kwh"];
     for (const f of fields) {
       if (item?.[f] !== void 0 && item?.[f] !== null) {
@@ -7431,37 +7431,54 @@ var AllReportModal = class {
     console.log("[AllReportModal] Customer totals response:", data);
     return data;
   }
-  // Replace this whole method
   mapCustomerTotalsResponse(apiResponse) {
-    const dataArray = Array.isArray(apiResponse?.data) ? apiResponse.data : Array.isArray(apiResponse) ? apiResponse : [];
-    if (!dataArray.length) {
+    const apiArray = Array.isArray(apiResponse?.data) ? apiResponse.data : Array.isArray(apiResponse) ? apiResponse : [];
+    if (!apiArray.length) {
       console.warn("[AllReportModal] Empty/invalid API response:", apiResponse);
       return [];
     }
-    const sumById = /* @__PURE__ */ new Map();
-    for (const it of dataArray) {
-      const key = String(it?.id || "");
-      if (!key) continue;
-      const val = this.parseConsumptionValue(it);
-      sumById.set(key, (sumById.get(key) || 0) + val);
-    }
-    let matched = 0;
-    const rows = this.params.itemsList.map((storeItem) => {
-      const c = sumById.get(storeItem.id) ?? 0;
-      if (c > 0) matched++;
+    const sumByApiId = /* @__PURE__ */ new Map();
+    let apiItemsWithoutId = 0;
+    for (const item of apiArray) {
+      const consumption = this.pickConsumption(item);
+      if (item?.id) {
+        const id = String(item.id);
+        sumByApiId.set(id, (sumByApiId.get(id) || 0) + consumption);
+      } else {
+        apiItemsWithoutId++;
+      }
+    }
+    let matchedById = 0, matchedBySubstring = 0;
+    const rows = this.params.itemsList.map((listItem) => {
+      let consumption = sumByApiId.get(listItem.id) ?? 0;
+      if (consumption > 0) {
+        matchedById++;
+      } else {
+        for (const apiItem of apiArray) {
+          const assetName = apiItem?.assetName || "";
+          const name = apiItem?.name || "";
+          if (assetName.includes(listItem.identifier) || name.includes(listItem.identifier)) {
+            consumption += this.pickConsumption(apiItem);
+          }
+        }
+        if (consumption > 0) {
+          matchedBySubstring++;
+        }
+      }
       return {
-        identifier: storeItem.identifier,
-        // keep original code shown in the table
-        name: storeItem.label,
-        // friendly name from itemsList
-        consumption: Math.round(c * 100) / 100
+        identifier: listItem.identifier,
+        name: listItem.label,
+        consumption: Math.round(consumption * 100) / 100
       };
     });
-    console.log("[AllReportModal] Mapping by id stats:", {
-      apiItems: dataArray.length,
-      uniqueIdsInApi: sumById.size,
+    console.log("[AllReportModal] Mapping stats:", {
+      apiItems: apiArray.length,
+      uniqueApiIds: sumByApiId.size,
       itemsInList: this.params.itemsList.length,
-      matched
+      matchedById,
+      matchedBySubstring,
+      unmatched: this.params.itemsList.length - matchedById - matchedBySubstring,
+      apiItemsWithoutId
     });
     return rows;
   }

package/dist/index.js

@@ -6880,7 +6880,7 @@ var AllReportModal = class {
     return maybe || null;
   }
   // Helper: pick a numeric consumption from an API item
-  pickNumericConsumption(item) {
+  pickConsumption(item) {
     const fields = ["total_value", "totalValue", "consumption", "value", "total", "energy", "kwh"];
     for (const f of fields) {
       if (item?.[f] !== void 0 && item?.[f] !== null) {
@@ -7364,37 +7364,54 @@ var AllReportModal = class {
     console.log("[AllReportModal] Customer totals response:", data);
     return data;
   }
-  // Replace this whole method
   mapCustomerTotalsResponse(apiResponse) {
-    const dataArray = Array.isArray(apiResponse?.data) ? apiResponse.data : Array.isArray(apiResponse) ? apiResponse : [];
-    if (!dataArray.length) {
+    const apiArray = Array.isArray(apiResponse?.data) ? apiResponse.data : Array.isArray(apiResponse) ? apiResponse : [];
+    if (!apiArray.length) {
       console.warn("[AllReportModal] Empty/invalid API response:", apiResponse);
       return [];
     }
-    const sumById = /* @__PURE__ */ new Map();
-    for (const it of dataArray) {
-      const key = String(it?.id || "");
-      if (!key) continue;
-      const val = this.parseConsumptionValue(it);
-      sumById.set(key, (sumById.get(key) || 0) + val);
-    }
-    let matched = 0;
-    const rows = this.params.itemsList.map((storeItem) => {
-      const c = sumById.get(storeItem.id) ?? 0;
-      if (c > 0) matched++;
+    const sumByApiId = /* @__PURE__ */ new Map();
+    let apiItemsWithoutId = 0;
+    for (const item of apiArray) {
+      const consumption = this.pickConsumption(item);
+      if (item?.id) {
+        const id = String(item.id);
+        sumByApiId.set(id, (sumByApiId.get(id) || 0) + consumption);
+      } else {
+        apiItemsWithoutId++;
+      }
+    }
+    let matchedById = 0, matchedBySubstring = 0;
+    const rows = this.params.itemsList.map((listItem) => {
+      let consumption = sumByApiId.get(listItem.id) ?? 0;
+      if (consumption > 0) {
+        matchedById++;
+      } else {
+        for (const apiItem of apiArray) {
+          const assetName = apiItem?.assetName || "";
+          const name = apiItem?.name || "";
+          if (assetName.includes(listItem.identifier) || name.includes(listItem.identifier)) {
+            consumption += this.pickConsumption(apiItem);
+          }
+        }
+        if (consumption > 0) {
+          matchedBySubstring++;
+        }
+      }
       return {
-        identifier: storeItem.identifier,
-        // keep original code shown in the table
-        name: storeItem.label,
-        // friendly name from itemsList
-        consumption: Math.round(c * 100) / 100
+        identifier: listItem.identifier,
+        name: listItem.label,
+        consumption: Math.round(consumption * 100) / 100
       };
     });
-    console.log("[AllReportModal] Mapping by id stats:", {
-      apiItems: dataArray.length,
-      uniqueIdsInApi: sumById.size,
+    console.log("[AllReportModal] Mapping stats:", {
+      apiItems: apiArray.length,
+      uniqueApiIds: sumByApiId.size,
       itemsInList: this.params.itemsList.length,
-      matched
+      matchedById,
+      matchedBySubstring,
+      unmatched: this.params.itemsList.length - matchedById - matchedBySubstring,
+      apiItemsWithoutId
     });
     return rows;
   }

package/dist/myio-js-library.umd.js

@@ -6869,7 +6869,7 @@
       return maybe || null;
     }
     // Helper: pick a numeric consumption from an API item
-    pickNumericConsumption(item) {
+    pickConsumption(item) {
       const fields = ["total_value", "totalValue", "consumption", "value", "total", "energy", "kwh"];
       for (const f of fields) {
         if (item?.[f] !== void 0 && item?.[f] !== null) {
@@ -7353,37 +7353,54 @@
       console.log("[AllReportModal] Customer totals response:", data);
       return data;
     }
-    // Replace this whole method
     mapCustomerTotalsResponse(apiResponse) {
-      const dataArray = Array.isArray(apiResponse?.data) ? apiResponse.data : Array.isArray(apiResponse) ? apiResponse : [];
-      if (!dataArray.length) {
+      const apiArray = Array.isArray(apiResponse?.data) ? apiResponse.data : Array.isArray(apiResponse) ? apiResponse : [];
+      if (!apiArray.length) {
         console.warn("[AllReportModal] Empty/invalid API response:", apiResponse);
         return [];
       }
-      const sumById = /* @__PURE__ */ new Map();
-      for (const it of dataArray) {
-        const key = String(it?.id || "");
-        if (!key) continue;
-        const val = this.parseConsumptionValue(it);
-        sumById.set(key, (sumById.get(key) || 0) + val);
-      }
-      let matched = 0;
-      const rows = this.params.itemsList.map((storeItem) => {
-        const c = sumById.get(storeItem.id) ?? 0;
-        if (c > 0) matched++;
+      const sumByApiId = /* @__PURE__ */ new Map();
+      let apiItemsWithoutId = 0;
+      for (const item of apiArray) {
+        const consumption = this.pickConsumption(item);
+        if (item?.id) {
+          const id = String(item.id);
+          sumByApiId.set(id, (sumByApiId.get(id) || 0) + consumption);
+        } else {
+          apiItemsWithoutId++;
+        }
+      }
+      let matchedById = 0, matchedBySubstring = 0;
+      const rows = this.params.itemsList.map((listItem) => {
+        let consumption = sumByApiId.get(listItem.id) ?? 0;
+        if (consumption > 0) {
+          matchedById++;
+        } else {
+          for (const apiItem of apiArray) {
+            const assetName = apiItem?.assetName || "";
+            const name = apiItem?.name || "";
+            if (assetName.includes(listItem.identifier) || name.includes(listItem.identifier)) {
+              consumption += this.pickConsumption(apiItem);
+            }
+          }
+          if (consumption > 0) {
+            matchedBySubstring++;
+          }
+        }
         return {
-          identifier: storeItem.identifier,
-          // keep original code shown in the table
-          name: storeItem.label,
-          // friendly name from itemsList
-          consumption: Math.round(c * 100) / 100
+          identifier: listItem.identifier,
+          name: listItem.label,
+          consumption: Math.round(consumption * 100) / 100
         };
       });
-      console.log("[AllReportModal] Mapping by id stats:", {
-        apiItems: dataArray.length,
-        uniqueIdsInApi: sumById.size,
+      console.log("[AllReportModal] Mapping stats:", {
+        apiItems: apiArray.length,
+        uniqueApiIds: sumByApiId.size,
         itemsInList: this.params.itemsList.length,
-        matched
+        matchedById,
+        matchedBySubstring,
+        unmatched: this.params.itemsList.length - matchedById - matchedBySubstring,
+        apiItemsWithoutId
       });
       return rows;
     }