protection entity tied to header display

Author: warmfire540

src/common/map-entities.ts

@@ -17,6 +17,7 @@ export const mapEntitiesByTranslationKey = (
     dns_queries_blocked_ratio: 'dns_queries_blocked_ratio',
     average_processing_speed: 'average_processing_speed',
     safe_searches_enforced: 'safe_searches_enforced',
+    protection: 'protection',
 
     // not vetted yet
     // action_refresh_data: 'action_refresh_data',

src/delegates/utils/get-setup.ts

@@ -36,7 +36,7 @@ export const getAdGuardSetup = (
         return {
           device_id: hole.device_id,
           // required for the setup state to work
-          status: hole.status,
+          protection: hole.protection,
           controls: [],
           sensors: [],
           switches: [],

src/html/components/pi-icon.ts

@@ -24,7 +24,7 @@ export const icon = (
     // If user has custom badge config, apply it to all AdGuard instances
     if (config.badge) {
       return {
-        entity: h.status?.entity_id ?? h.device_id,
+        entity: h.protection?.entity_id ?? h.device_id,
         ...config.badge,
       };
     }
@@ -44,7 +44,7 @@ export const icon = (
 
     // For AdGuard instances, use the base config
     return {
-      entity: h.status?.entity_id ?? h.device_id,
+      entity: h.protection?.entity_id ?? h.device_id,
       ...baseConfig,
     };
   });

src/html/pi-crust.ts

@@ -26,7 +26,7 @@ export const createCardHeader = (
 
   const primary = setup.holes[0]!;
   const activeCount = setup.holes
-    .map((h) => h.status)
+    .map((h) => h.protection)
     .filter(
       (status) => status !== undefined && stateActive(status, status?.state),
     ).length;
@@ -59,7 +59,7 @@ export const createCardHeader = (
         ></ha-icon>
         ${mixedStatus
           ? html`${localize(hass, 'card.ui.partial')}`
-          : stateDisplay(hass, primary.status!)}
+          : stateDisplay(hass, primary.protection!)}
       </div>
     </div>
   `;

src/types/types.ts

@@ -29,7 +29,7 @@ export interface AdGuardDevice {
   latest_data_refresh?: EntityInformation;
 
   /** Status of AdGuard */
-  status?: EntityInformation;
+  protection?: EntityInformation;
 
   /** Sensors for the AdGuard */
   sensors: EntityInformation[];

test/delegates/utils/get-setup.spec.ts

@@ -217,12 +217,12 @@ describe('get-setup.ts', () => {
       entity_id: 'binary_sensor.pi_hole_status_2',
       state: 'on',
       attributes: { friendly_name: 'AdGuard Status 2' },
-      translation_key: undefined,
+      translation_key: 'protection',
     };
 
     const device2 = {
       device_id: 'adguard_device_2',
-      status: device2Status,
+      protection: device2Status,
       switches: [device2Switch1, device2Switch2],
       sensors: [
         {
@@ -281,7 +281,9 @@ describe('get-setup.ts', () => {
 
     // Check second device only has device_id and status, with empty arrays for other properties
     expect(result?.holes[1]?.device_id).to.equal('adguard_device_2');
-    expect(result?.holes[1]?.status).to.deep.equal(device2Status);
+    console.log(result?.holes[1]?.protection);
+    console.log(device2Status);
+    expect(result?.holes[1]?.protection).to.deep.equal(device2Status);
     expect(result?.holes[1]?.switches).to.be.an('array').with.lengthOf(0);
     expect(result?.holes[1]?.sensors).to.be.an('array').with.lengthOf(0);
     expect(result?.holes[1]?.controls).to.be.an('array').with.lengthOf(0);

test/html/components/pi-icon.spec.ts

@@ -90,7 +90,7 @@ describe('icon.ts', () => {
 
   describe('action handler integration', () => {
     it('should call action handlers with correct configurations', async () => {
-      mockSetup.holes[0]!.status = {
+      mockSetup.holes[0]!.protection = {
         entity_id: 'sensor.pi_hole_status',
         state: 'enabled',
         attributes: {},
@@ -116,7 +116,7 @@ describe('icon.ts', () => {
     });
 
     it('should create default action configurations when no custom badge config', async () => {
-      mockSetup.holes[0]!.status = {
+      mockSetup.holes[0]!.protection = {
         entity_id: 'sensor.pi_hole_status',
         state: 'enabled',
         attributes: {},
@@ -143,7 +143,7 @@ describe('icon.ts', () => {
           action: 'toggle',
         },
       };
-      mockSetup.holes[0]!.status = {
+      mockSetup.holes[0]!.protection = {
         entity_id: 'sensor.pi_hole_status',
         state: 'enabled',
         attributes: {},
@@ -171,7 +171,7 @@ describe('icon.ts', () => {
 
     it('should handle multiple AdGuard instances with different configurations', async () => {
       // First AdGuard with status
-      mockSetup.holes[0]!.status = {
+      mockSetup.holes[0]!.protection = {
         entity_id: 'sensor.adguard_1_status',
         state: 'enabled',
         attributes: {},

test/html/pi-crust.spec.ts

@@ -58,7 +58,7 @@ describe('pi-crust.ts', () => {
     // Mock device
     mockDevice = {
       device_id: 'adguard_device',
-      status: {
+      protection: {
         entity_id: 'binary_sensor.pi_hole_status',
         state: 'on',
         attributes: { friendly_name: 'Pi-hole Status' },
@@ -161,7 +161,7 @@ describe('pi-crust.ts', () => {
 
   it('should display green status when Pi-hole is active', async () => {
     // Ensure status is 'on'
-    mockSetup.holes[0]!.status!.state = 'on';
+    mockSetup.holes[0]!.protection!.state = 'on';
 
     // Render the card header
     const result = createCardHeader(
@@ -186,7 +186,7 @@ describe('pi-crust.ts', () => {
 
   it('should display red status when Pi-hole is inactive', async () => {
     // Set status to 'off'
-    mockSetup.holes[0]!.status!.state = 'off';
+    mockSetup.holes[0]!.protection!.state = 'off';
 
     // Render the card header
     const result = createCardHeader(
@@ -214,11 +214,11 @@ describe('pi-crust.ts', () => {
     createCardHeader(mockElement, mockSetup, mockHass, mockConfig);
 
     // Verify stateDisplay was called with the correct parameters
-    expect(stateDisplayStub.calledWith(mockHass, mockSetup.holes[0]!.status)).to
-      .be.true;
+    expect(
+      stateDisplayStub.calledWith(mockHass, mockSetup.holes[0]!.protection),
+    ).to.be.true;
   });
 
-
   // New tests for multiple Pi-hole setup
 
   it('should not display hole count when only one Pi-hole is configured', async () => {
@@ -241,8 +241,8 @@ describe('pi-crust.ts', () => {
     const secondDevice = {
       ...mockDevice,
       device_id: 'adguard_device_2',
-      status: {
-        ...mockDevice.status,
+      protection: {
+        ...mockDevice.protection,
         entity_id: 'binary_sensor.pi_hole_2_status',
         state: 'on',
       },
@@ -269,8 +269,8 @@ describe('pi-crust.ts', () => {
     const secondDevice = {
       ...mockDevice,
       device_id: 'adguard_device_2',
-      status: {
-        ...mockDevice.status,
+      protection: {
+        ...mockDevice.protection,
         entity_id: 'binary_sensor.pi_hole_2_status',
         state: 'off',
       },
@@ -301,8 +301,8 @@ describe('pi-crust.ts', () => {
     const secondDevice = {
       ...mockDevice,
       device_id: 'adguard_device_2',
-      status: {
-        ...mockDevice.status,
+      protection: {
+        ...mockDevice.protection,
         entity_id: 'binary_sensor.pi_hole_2_status',
         state: 'off',
       },
@@ -311,8 +311,8 @@ describe('pi-crust.ts', () => {
     const thirdDevice = {
       ...mockDevice,
       device_id: 'adguard_device_3',
-      status: {
-        ...mockDevice.status,
+      protection: {
+        ...mockDevice.protection,
         entity_id: 'binary_sensor.pi_hole_3_status',
         state: 'on',
       },
@@ -339,7 +339,7 @@ describe('pi-crust.ts', () => {
     const deviceWithoutStatus = {
       ...mockDevice,
       device_id: 'adguard_device_2',
-      status: undefined,
+      protection: undefined,
     };
 
     mockSetup.holes.push(deviceWithoutStatus);