upcoming: [DI-28270] - Remove firewall filtering and region filter dependency

packages/manager/.changeset/pr-13111-upcoming-features-1763615562636.md

@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+CloudPulse-Metrics: Remove filtering of firewalls and region filter dependency on firewall-select in Firewalls ([#13111](https://github.com/linode/manager/pull/13111))

packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts

@@ -147,26 +147,20 @@ it('test getResourceSelectionProperties method for linode-firewall', () => {
   expect(resourceSelectionConfig).toBeDefined();
 
   if (resourceSelectionConfig) {
-    const {
-      disabled,
-      handleResourcesSelection,
-      label,
-      savePreferences,
-      filterFn,
-    } = getResourcesProperties(
-      {
-        config: resourceSelectionConfig,
-        dashboard: { ...mockDashboard, id: 4 },
-        isServiceAnalyticsIntegration: true,
-      },
-      vi.fn()
-    );
+    const { disabled, handleResourcesSelection, label, savePreferences } =
+      getResourcesProperties(
+        {
+          config: resourceSelectionConfig,
+          dashboard: { ...mockDashboard, id: 4 },
+          isServiceAnalyticsIntegration: true,
+        },
+        vi.fn()
+      );
     const { name } = resourceSelectionConfig.configuration;
     expect(handleResourcesSelection).toBeDefined();
     expect(savePreferences).toEqual(false);
     expect(disabled).toEqual(false);
     expect(label).toEqual(name);
-    expect(filterFn).toBeDefined();
   }
 });
 

packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts

@@ -143,7 +143,6 @@ export const getRegionProperties = (
         dashboard
       ),
     xFilter: filterBasedOnConfig(config, dependentFilters ?? {}),
-    selectedEntities: (dependentFilters?.[RESOURCE_ID] ?? []) as string[],
   };
 };
 

packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts

@@ -11,10 +11,10 @@ import {
   RESOURCE_ID,
 } from './constants';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
-import { filterFirewallResources, filterKubernetesClusters } from './utils';
+import { filterKubernetesClusters } from './utils';
 
 import type { CloudPulseServiceTypeFilterMap } from './models';
-import type { Firewall, KubernetesCluster } from '@linode/api-v4';
+import type { KubernetesCluster } from '@linode/api-v4';
 
 const TIME_DURATION = 'Time Range';
 
@@ -234,7 +234,6 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
     {
       configuration: {
         filterKey: 'resource_id',
-        children: [PARENT_ENTITY_REGION],
         filterType: 'string',
         isFilterable: true,
         isMetricsFilter: true,
@@ -244,14 +243,11 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
         placeholder: 'Select Firewalls',
         priority: 1,
         associatedEntityType: 'linode',
-        filterFn: (resources: Firewall[]) =>
-          filterFirewallResources(resources, 'linode'),
       },
       name: 'Firewalls',
     },
     {
       configuration: {
-        dependency: ['resource_id'],
         filterKey: PARENT_ENTITY_REGION,
         filterType: 'string',
         isFilterable: true,
@@ -339,7 +335,7 @@ export const FIREWALL_NODEBALANCER_CONFIG: Readonly<CloudPulseServiceTypeFilterM
       {
         configuration: {
           filterKey: RESOURCE_ID,
-          children: [PARENT_ENTITY_REGION, NODEBALANCER_ID],
+          children: [NODEBALANCER_ID],
           filterType: 'string',
           isFilterable: true,
           isMetricsFilter: true,
@@ -349,14 +345,11 @@ export const FIREWALL_NODEBALANCER_CONFIG: Readonly<CloudPulseServiceTypeFilterM
           placeholder: 'Select a Firewall',
           priority: 1,
           apiV4QueryKey: queryFactory.resources('firewall'),
-          filterFn: (resources: Firewall[]) =>
-            filterFirewallResources(resources, 'nodebalancer'),
         },
         name: 'Firewall',
       },
       {
         configuration: {
-          dependency: [RESOURCE_ID],
           children: [NODEBALANCER_ID],
           filterKey: PARENT_ENTITY_REGION,
           filterType: 'string',

packages/manager/src/features/CloudPulse/Utils/utils.test.ts

@@ -361,14 +361,12 @@ describe('getEnabledServiceTypes', () => {
       const resourcesFilterConfig = getResourcesFilterConfig(4);
       expect(resourcesFilterConfig).toBeDefined();
       expect(resourcesFilterConfig?.associatedEntityType).toBe('linode');
-      expect(resourcesFilterConfig?.filterFn).toBeDefined();
     });
 
     it('should return the resources filter configuration for the nodebalancer-firewall dashboard', () => {
       const resourcesFilterConfig = getResourcesFilterConfig(8);
       expect(resourcesFilterConfig).toBeDefined();
       expect(resourcesFilterConfig?.associatedEntityType).toBe('nodebalancer');
-      expect(resourcesFilterConfig?.filterFn).toBeDefined();
     });
   });
 

packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.test.tsx

@@ -8,11 +8,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
-import {
-  dashboardFactory,
-  databaseInstanceFactory,
-  firewallFactory,
-} from 'src/factories';
+import { dashboardFactory, databaseInstanceFactory } from 'src/factories';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { NO_REGION_MESSAGE } from '../Utils/constants';
@@ -24,7 +20,6 @@ import type { useRegionsQuery } from '@linode/queries';
 
 const props: CloudPulseRegionSelectProps = {
   filterKey: 'region',
-  selectedEntities: [],
   handleRegionChange: vi.fn(),
   label: 'Region',
   selectedDashboard: undefined,
@@ -327,26 +322,10 @@ describe('CloudPulseRegionSelect', () => {
           id: 'ap-west',
           label: 'IN, Mumbai',
           capabilities: [capabilityServiceTypeMapping['firewall']],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: [
-        firewallFactory.build({
-          id: 1,
-          entities: [{ id: 1, type: 'linode' }],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useAllLinodesQuery.mockReturnValue({
-      data: [
-        linodeFactory.build({
-          id: 1,
-          region: 'ap-west',
+          monitors: {
+            metrics: [capabilityServiceTypeMapping['firewall']],
+            alerts: [],
+          },
         }),
       ],
       isError: false,
@@ -362,7 +341,6 @@ describe('CloudPulseRegionSelect', () => {
           service_type: 'firewall',
           id: 4,
         })}
-        selectedEntities={['1']}
       />
     );
     await user.click(screen.getByRole('button', { name: 'Open' }));
@@ -378,31 +356,16 @@ describe('CloudPulseRegionSelect', () => {
           id: 'ap-west',
           label: 'IN, Mumbai',
           capabilities: [capabilityServiceTypeMapping['firewall']],
+          monitors: {
+            metrics: [capabilityServiceTypeMapping['firewall']],
+            alerts: [],
+          },
         }),
       ],
       isError: false,
       isLoading: false,
     });
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: [
-        firewallFactory.build({
-          id: 1,
-          entities: [{ id: 1, type: 'linode' }],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useAllLinodesQuery.mockReturnValue({
-      data: [
-        linodeFactory.build({
-          id: 1,
-          region: 'ap-west',
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
+
     renderWithTheme(
       <CloudPulseRegionSelect
         {...props}
@@ -412,7 +375,6 @@ describe('CloudPulseRegionSelect', () => {
           service_type: 'firewall',
           id: 4,
         })}
-        selectedEntities={['1']}
       />
     );
     expect(screen.getByDisplayValue('IN, Mumbai (ap-west)')).toBeVisible();
@@ -424,31 +386,16 @@ describe('CloudPulseRegionSelect', () => {
           id: 'ap-west',
           label: 'IN, Mumbai',
           capabilities: [capabilityServiceTypeMapping['firewall']],
+          monitors: {
+            metrics: [capabilityServiceTypeMapping['firewall']],
+            alerts: [],
+          },
         }),
       ],
       isError: false,
       isLoading: false,
     });
-    queryMocks.useResourcesQuery.mockReturnValue({
-      data: [
-        firewallFactory.build({
-          id: 1,
-          entities: [{ id: 1, type: 'nodebalancer' }],
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
-    queryMocks.useAllNodeBalancersQuery.mockReturnValue({
-      data: [
-        nodeBalancerFactory.build({
-          id: 1,
-          region: 'ap-west',
-        }),
-      ],
-      isError: false,
-      isLoading: false,
-    });
+
     renderWithTheme(
       <CloudPulseRegionSelect
         {...props}
@@ -458,7 +405,6 @@ describe('CloudPulseRegionSelect', () => {
           service_type: 'firewall',
           id: 8,
         })}
-        selectedEntities={['1']}
       />
     );
     expect(screen.getByDisplayValue('IN, Mumbai (ap-west)')).toBeVisible();