myio-js-library 0.1.208 → 0.1.210

package/dist/index.cjs

@@ -12143,6 +12143,10 @@ function renderCardComponentV5({
   const isTemperatureDevice = (deviceType2) => isTemperatureDeviceType(deviceType2);
   const formatCardValue = (value, deviceType2) => {
     const numValue = Number(value) || 0;
+    const category = getDeviceCategory(deviceType2);
+    if (category !== "energy" && category !== "temperature") {
+      console.log(`[template-card-v5] formatCardValue: deviceType=${deviceType2}, category=${category}, isEnergy=${isEnergyDevice(deviceType2)}`);
+    }
     if (isEnergyDevice(deviceType2)) {
       return formatEnergy(numValue);
     } else if (isTemperatureDevice(deviceType2)) {
@@ -22127,12 +22131,13 @@ var WaterTankModal = class {
    * Build context object for callbacks
    */
   buildContext(options) {
+    const displayLevel = options.currentLevelClamped ?? options.currentLevel ?? 0;
     return {
       device: {
         id: options.deviceId,
         label: options.label || options.deviceId,
         type: options.deviceType,
-        currentLevel: options.currentLevel
+        currentLevel: displayLevel
       },
       metadata: {
         slaveId: options.slaveId,
@@ -22222,16 +22227,25 @@ var WaterTankModal = class {
   }
   /**
    * Transform raw ThingsBoard response to our data points
+   * RFC-0107: Support displayKey option to choose between water_level or water_percentage
    */
   transformTelemetryData(rawData, keys) {
     const allPoints = [];
-    for (const key of keys) {
+    const displayKey = this.options.displayKey || "water_percentage";
+    const prioritizedKeys = displayKey && rawData[displayKey] ? [displayKey, ...keys.filter((k) => k !== displayKey)] : keys;
+    for (const key of prioritizedKeys) {
       if (rawData[key] && Array.isArray(rawData[key])) {
-        const keyPoints = rawData[key].map((point) => ({
-          ts: point.ts,
-          value: typeof point.value === "string" ? parseFloat(point.value) : point.value,
-          key
-        }));
+        const keyPoints = rawData[key].map((point) => {
+          let value = typeof point.value === "string" ? parseFloat(point.value) : point.value;
+          if (key === "water_percentage" && value <= 1.5) {
+            value = value * 100;
+          }
+          return {
+            ts: point.ts,
+            value,
+            key
+          };
+        });
         allPoints.push(...keyPoints);
       }
     }
@@ -22244,15 +22258,18 @@ var WaterTankModal = class {
         uniquePoints.push(point);
       }
     }
+    console.log(`[WaterTankModal] Transformed ${uniquePoints.length} points, displayKey: ${displayKey}`);
     return uniquePoints;
   }
   /**
    * Calculate summary statistics from telemetry data
+   * RFC-0107: Use clamped level for display
    */
   calculateSummary(telemetry) {
+    const displayLevel = this.options.currentLevelClamped ?? this.options.currentLevel ?? 0;
     if (telemetry.length === 0) {
       return {
-        currentLevel: this.options.currentLevel,
+        currentLevel: displayLevel,
         avgLevel: 0,
         minLevel: 0,
         maxLevel: 0,

package/dist/index.d.cts

@@ -1729,10 +1729,14 @@ interface OpenDashboardPopupWaterTankOptions {
     deviceType?: string;
     label?: string;
     currentLevel?: number;
+    currentLevelClamped?: number;
+    waterLevel?: number | null;
+    waterPercentage?: number | null;
     slaveId?: string | number;
     centralId?: string;
     ingestionId?: string;
     telemetryKeys?: string[];
+    displayKey?: 'water_level' | 'water_percentage';
     aggregation?: 'NONE' | 'MIN' | 'MAX' | 'AVG' | 'SUM' | 'COUNT';
     limit?: number;
     tbApiHost?: string;

package/dist/index.js

@@ -11971,6 +11971,10 @@ function renderCardComponentV5({
   const isTemperatureDevice = (deviceType2) => isTemperatureDeviceType(deviceType2);
   const formatCardValue = (value, deviceType2) => {
     const numValue = Number(value) || 0;
+    const category = getDeviceCategory(deviceType2);
+    if (category !== "energy" && category !== "temperature") {
+      console.log(`[template-card-v5] formatCardValue: deviceType=${deviceType2}, category=${category}, isEnergy=${isEnergyDevice(deviceType2)}`);
+    }
     if (isEnergyDevice(deviceType2)) {
       return formatEnergy(numValue);
     } else if (isTemperatureDevice(deviceType2)) {
@@ -21955,12 +21959,13 @@ var WaterTankModal = class {
    * Build context object for callbacks
    */
   buildContext(options) {
+    const displayLevel = options.currentLevelClamped ?? options.currentLevel ?? 0;
     return {
       device: {
         id: options.deviceId,
         label: options.label || options.deviceId,
         type: options.deviceType,
-        currentLevel: options.currentLevel
+        currentLevel: displayLevel
       },
       metadata: {
         slaveId: options.slaveId,
@@ -22050,16 +22055,25 @@ var WaterTankModal = class {
   }
   /**
    * Transform raw ThingsBoard response to our data points
+   * RFC-0107: Support displayKey option to choose between water_level or water_percentage
    */
   transformTelemetryData(rawData, keys) {
     const allPoints = [];
-    for (const key of keys) {
+    const displayKey = this.options.displayKey || "water_percentage";
+    const prioritizedKeys = displayKey && rawData[displayKey] ? [displayKey, ...keys.filter((k) => k !== displayKey)] : keys;
+    for (const key of prioritizedKeys) {
       if (rawData[key] && Array.isArray(rawData[key])) {
-        const keyPoints = rawData[key].map((point) => ({
-          ts: point.ts,
-          value: typeof point.value === "string" ? parseFloat(point.value) : point.value,
-          key
-        }));
+        const keyPoints = rawData[key].map((point) => {
+          let value = typeof point.value === "string" ? parseFloat(point.value) : point.value;
+          if (key === "water_percentage" && value <= 1.5) {
+            value = value * 100;
+          }
+          return {
+            ts: point.ts,
+            value,
+            key
+          };
+        });
         allPoints.push(...keyPoints);
       }
     }
@@ -22072,15 +22086,18 @@ var WaterTankModal = class {
         uniquePoints.push(point);
       }
     }
+    console.log(`[WaterTankModal] Transformed ${uniquePoints.length} points, displayKey: ${displayKey}`);
     return uniquePoints;
   }
   /**
    * Calculate summary statistics from telemetry data
+   * RFC-0107: Use clamped level for display
    */
   calculateSummary(telemetry) {
+    const displayLevel = this.options.currentLevelClamped ?? this.options.currentLevel ?? 0;
     if (telemetry.length === 0) {
       return {
-        currentLevel: this.options.currentLevel,
+        currentLevel: displayLevel,
         avgLevel: 0,
         minLevel: 0,
         maxLevel: 0,

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

@@ -11959,6 +11959,10 @@
     const isTemperatureDevice = (deviceType2) => isTemperatureDeviceType(deviceType2);
     const formatCardValue = (value, deviceType2) => {
       const numValue = Number(value) || 0;
+      const category = getDeviceCategory(deviceType2);
+      if (category !== "energy" && category !== "temperature") {
+        console.log(`[template-card-v5] formatCardValue: deviceType=${deviceType2}, category=${category}, isEnergy=${isEnergyDevice(deviceType2)}`);
+      }
       if (isEnergyDevice(deviceType2)) {
         return formatEnergy(numValue);
       } else if (isTemperatureDevice(deviceType2)) {
@@ -21769,12 +21773,13 @@
      * Build context object for callbacks
      */
     buildContext(options) {
+      const displayLevel = options.currentLevelClamped ?? options.currentLevel ?? 0;
       return {
         device: {
           id: options.deviceId,
           label: options.label || options.deviceId,
           type: options.deviceType,
-          currentLevel: options.currentLevel
+          currentLevel: displayLevel
         },
         metadata: {
           slaveId: options.slaveId,
@@ -21864,16 +21869,25 @@
     }
     /**
      * Transform raw ThingsBoard response to our data points
+     * RFC-0107: Support displayKey option to choose between water_level or water_percentage
      */
     transformTelemetryData(rawData, keys) {
       const allPoints = [];
-      for (const key of keys) {
+      const displayKey = this.options.displayKey || "water_percentage";
+      const prioritizedKeys = rawData[displayKey] ? [displayKey, ...keys.filter((k) => k !== displayKey)] : keys;
+      for (const key of prioritizedKeys) {
         if (rawData[key] && Array.isArray(rawData[key])) {
-          const keyPoints = rawData[key].map((point) => ({
-            ts: point.ts,
-            value: typeof point.value === "string" ? parseFloat(point.value) : point.value,
-            key
-          }));
+          const keyPoints = rawData[key].map((point) => {
+            let value = typeof point.value === "string" ? parseFloat(point.value) : point.value;
+            if (key === "water_percentage" && value <= 1.5) {
+              value = value * 100;
+            }
+            return {
+              ts: point.ts,
+              value,
+              key
+            };
+          });
           allPoints.push(...keyPoints);
         }
       }
@@ -21886,15 +21900,18 @@
           uniquePoints.push(point);
         }
       }
+      console.log(`[WaterTankModal] Transformed ${uniquePoints.length} points, displayKey: ${displayKey}`);
       return uniquePoints;
     }
     /**
      * Calculate summary statistics from telemetry data
+     * RFC-0107: Use clamped level for display
      */
     calculateSummary(telemetry) {
+      const displayLevel = this.options.currentLevelClamped ?? this.options.currentLevel ?? 0;
       if (telemetry.length === 0) {
         return {
-          currentLevel: this.options.currentLevel,
+          currentLevel: displayLevel,
           avgLevel: 0,
           minLevel: 0,
           maxLevel: 0,