Merge pull request #315 from MindFreeze/fix-314

fix(#314): handle grid export in new energy format without flow_to

Author: MindFreeze

__tests__/autoconfig.test.ts

@@ -38,6 +38,72 @@ describe('SankeyChart autoconfig', () => {
     sankeyChart.setConfig({ ...DEFAULT_CONFIG, autoconfig: {} }, true);
   });
 
+  it('creates grid export entity for new format with stat_energy_to', async () => {
+    hass.states['sensor.grid_out'] = { entity_id: 'sensor.grid_out', state: '3' } as any;
+    (getEnergyPreferences as jest.Mock).mockResolvedValue({
+      energy_sources: [
+        { type: 'grid', stat_energy_from: 'sensor.grid_in', stat_energy_to: 'sensor.grid_out' },
+        { type: 'solar', stat_energy_from: 'sensor.solar' },
+      ],
+      device_consumption: [
+        { stat_consumption: 'sensor.device1', name: 'Device 1' },
+      ],
+    });
+    (getEntitiesByArea as jest.Mock).mockResolvedValue({
+      area1: { area: { area_id: 'area1', name: 'Area 1' }, entities: ['sensor.device1'] },
+    });
+    (fetchFloorRegistry as jest.Mock).mockResolvedValue([]);
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await (sankeyChart as any)['autoconfig']();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const config = (sankeyChart as any).config;
+    const allEntities = config.sections.flatMap((s: { entities: { entity_id: string }[] }) => s.entities);
+    const gridExport = allEntities.find((e: { entity_id: string }) => e.entity_id === 'sensor.grid_out');
+    expect(gridExport).toBeDefined();
+    expect(gridExport.subtract_entities).toEqual(['sensor.grid_in']);
+    // all source entities should have grid export as a child
+    const sourceEntities = config.sections[0].entities;
+    sourceEntities.forEach((e: { children: string[] }) => {
+      expect(e.children).toContain('sensor.grid_out');
+    });
+  });
+
+  it('creates grid export entity for old format with flow_to', async () => {
+    hass.states['sensor.grid_out'] = { entity_id: 'sensor.grid_out', state: '3' } as any;
+    (getEnergyPreferences as jest.Mock).mockResolvedValue({
+      energy_sources: [
+        {
+          type: 'grid',
+          flow_from: [{ stat_energy_from: 'sensor.grid_in' }],
+          flow_to: [{ stat_energy_to: 'sensor.grid_out' }],
+        },
+        { type: 'solar', stat_energy_from: 'sensor.solar' },
+      ],
+      device_consumption: [
+        { stat_consumption: 'sensor.device1', name: 'Device 1' },
+      ],
+    });
+    (getEntitiesByArea as jest.Mock).mockResolvedValue({
+      area1: { area: { area_id: 'area1', name: 'Area 1' }, entities: ['sensor.device1'] },
+    });
+    (fetchFloorRegistry as jest.Mock).mockResolvedValue([]);
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await (sankeyChart as any)['autoconfig']();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const config = (sankeyChart as any).config;
+    const allEntities = config.sections.flatMap((s: { entities: { entity_id: string }[] }) => s.entities);
+    const gridExport = allEntities.find((e: { entity_id: string }) => e.entity_id === 'sensor.grid_out');
+    expect(gridExport).toBeDefined();
+    expect(gridExport.subtract_entities).toEqual(['sensor.grid_in']);
+    // all source entities should have grid export as a child
+    const sourceEntities = config.sections[0].entities;
+    sourceEntities.forEach((e: { children: string[] }) => {
+      expect(e.children).toContain('sensor.grid_out');
+    });
+  });
+
   it('creates sections from energy preferences', async () => {
     (getEnergyPreferences as jest.Mock).mockResolvedValue({
       energy_sources: [

src/ha-sankey-chart.ts

@@ -290,14 +290,18 @@ class SankeyChart extends SubscribeMixin(LitElement) {
     const gridSources = sources.filter(s => s.type === 'grid');
     const seenFlowTo = new Set<string>();
     gridSources.forEach(grid => {
-      if (grid?.flow_to?.length) {
+      const exportEntities = grid.flow_to?.map(e => e.stat_energy_to) ??
+        (grid.stat_energy_to ? [grid.stat_energy_to] : []);
+      const importEntities = grid.flow_from?.map(e => e.stat_energy_from) ??
+        (grid.stat_energy_from ? [grid.stat_energy_from] : []);
+      if (exportEntities.length) {
         // grid export
-        grid.flow_to.forEach(({ stat_energy_to }) => {
+        exportEntities.forEach(stat_energy_to => {
           if (seenFlowTo.has(stat_energy_to)) return;
           seenFlowTo.add(stat_energy_to);
           sections[1].entities.unshift({
             entity_id: stat_energy_to,
-            subtract_entities: (grid.flow_from || []).map(e => e.stat_energy_from),
+            subtract_entities: importEntities,
             type: 'entity',
             color: getEnergySourceColor(grid.type),
             children: [],