upcoming: [UIE-9640] – Update useIsFirewallRulesetsPrefixlistsEnabled to include account capability check (#13156)

Author: dwiley-akamai

packages/api-v4/.changeset/pr-13156-upcoming-features-1764708047549.md

@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add 'Cloud Firewall Rule Set' to AccountCapability type ([#13156](https://github.com/linode/manager/pull/13156))

packages/api-v4/src/account/types.ts

@@ -66,6 +66,7 @@ export const accountCapabilities = [
   'Block Storage',
   'Block Storage Encryption',
   'Cloud Firewall',
+  'Cloud Firewall Rule Set',
   'CloudPulse',
   'Disk Encryption',
   'Kubernetes',

packages/manager/.changeset/pr-13156-upcoming-features-1764708766786.md

@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Update useIsFirewallRulesetsPrefixlistsEnabled() to factor in account capability ([#13156](https://github.com/linode/manager/pull/13156))

packages/manager/src/features/Firewalls/shared.test.tsx

@@ -3,6 +3,8 @@ import { renderHook, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import { accountFactory } from 'src/factories';
+import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithTheme, wrapWithTheme } from 'src/utilities/testHelpers';
 
 import {
@@ -391,7 +393,7 @@ describe('generateAddressesLabelV2', () => {
 });
 
 describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
-  it('returns true if the feature is enabled', async () => {
+  it('returns true if the feature is enabled AND the account has the capability', async () => {
     const options = {
       flags: {
         fwRulesetsPrefixLists: {
@@ -403,6 +405,16 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
       },
     };
 
+    const account = accountFactory.build({
+      capabilities: ['Cloud Firewall Rule Set'],
+    });
+
+    server.use(
+      http.get('*/v4*/account', () => {
+        return HttpResponse.json(account);
+      })
+    );
+
     const { result } = renderHook(
       () => useIsFirewallRulesetsPrefixlistsEnabled(),
       {
@@ -417,7 +429,7 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
     });
   });
 
-  it('returns false if the feature is NOT enabled', async () => {
+  it('returns false if the feature is NOT enabled but the account has the capability', async () => {
     const options = {
       flags: {
         fwRulesetsPrefixLists: {
@@ -429,6 +441,52 @@ describe('useIsFirewallRulesetsPrefixlistsEnabled', () => {
       },
     };
 
+    const account = accountFactory.build({
+      capabilities: ['Cloud Firewall Rule Set'],
+    });
+
+    server.use(
+      http.get('*/v4*/account', () => {
+        return HttpResponse.json(account);
+      })
+    );
+
+    const { result } = renderHook(
+      () => useIsFirewallRulesetsPrefixlistsEnabled(),
+      {
+        wrapper: (ui) => wrapWithTheme(ui, options),
+      }
+    );
+
+    await waitFor(() => {
+      expect(result.current.isFirewallRulesetsPrefixlistsFeatureEnabled).toBe(
+        false
+      );
+    });
+  });
+
+  it('returns false if the feature is enabled but the account DOES NOT have the capability', async () => {
+    const options = {
+      flags: {
+        fwRulesetsPrefixLists: {
+          enabled: true,
+          beta: false,
+          la: false,
+          ga: false,
+        },
+      },
+    };
+
+    const account = accountFactory.build({
+      capabilities: [],
+    });
+
+    server.use(
+      http.get('*/v4*/account', () => {
+        return HttpResponse.json(account);
+      })
+    );
+
     const { result } = renderHook(
       () => useIsFirewallRulesetsPrefixlistsEnabled(),
       {

packages/manager/src/features/Firewalls/shared.tsx

@@ -1,5 +1,10 @@
+import { useAccount } from '@linode/queries';
 import { BetaChip, Box, Chip, NewFeatureChip, Tooltip } from '@linode/ui';
-import { capitalize, truncateAndJoinList } from '@linode/utilities';
+import {
+  capitalize,
+  isFeatureEnabledV2,
+  truncateAndJoinList,
+} from '@linode/utilities';
 import React from 'react';
 
 import { Link } from 'src/components/Link';
@@ -107,6 +112,8 @@ export const allIPs = {
   ipv6: [allIPv6],
 };
 
+export const FW_RULESET_CAPABILITY = 'Cloud Firewall Rule Set';
+
 export interface PredefinedFirewall {
   inbound: FirewallRuleType[];
   label: string;
@@ -566,18 +573,40 @@ export const getFirewallDescription = (firewall: Firewall) => {
  * but will eventually also look at account capabilities if available.
  */
 export const useIsFirewallRulesetsPrefixlistsEnabled = () => {
+  const { data: account } = useAccount();
   const flags = useFlags();
 
+  if (!flags) {
+    return {
+      isFirewallRulesetsPrefixlistsFeatureEnabled: false,
+      isFirewallRulesetsPrefixListsBetaEnabled: false,
+      isFirewallRulesetsPrefixListsLAEnabled: false,
+      isFirewallRulesetsPrefixListsGAEnabled: false,
+    };
+  }
+
   // @TODO: Firewall Rulesets & Prefix Lists - check for customer tag/account capability when it exists
   return {
-    isFirewallRulesetsPrefixlistsFeatureEnabled:
-      flags.fwRulesetsPrefixLists?.enabled ?? false,
-    isFirewallRulesetsPrefixListsBetaEnabled:
-      flags.fwRulesetsPrefixLists?.beta ?? false,
-    isFirewallRulesetsPrefixListsLAEnabled:
-      flags.fwRulesetsPrefixLists?.la ?? false,
-    isFirewallRulesetsPrefixListsGAEnabled:
-      flags.fwRulesetsPrefixLists?.ga ?? false,
+    isFirewallRulesetsPrefixlistsFeatureEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.enabled),
+      account?.capabilities ?? []
+    ),
+    isFirewallRulesetsPrefixListsBetaEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.beta),
+      account?.capabilities ?? []
+    ),
+    isFirewallRulesetsPrefixListsLAEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.la),
+      account?.capabilities ?? []
+    ),
+    isFirewallRulesetsPrefixListsGAEnabled: isFeatureEnabledV2(
+      FW_RULESET_CAPABILITY,
+      Boolean(flags.fwRulesetsPrefixLists?.ga),
+      account?.capabilities ?? []
+    ),
   };
 };