Merge branch 'develop' into UIE-9910

abailly-akamai · web-flow · commit 4bfc77efe1b5 · 2026-01-02T12:03:57.000+01:00
diff --git a/packages/api-v4/.changeset/pr-13227-changed-1767012120929.md b/packages/api-v4/.changeset/pr-13227-changed-1767012120929.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+ACLP-Alerting: Notification Channel types to support API changes and backward compatibility  ([#13227](https://github.com/linode/manager/pull/13227))
diff --git a/packages/api-v4/src/cloudpulse/types.ts b/packages/api-v4/src/cloudpulse/types.ts
@@ -46,6 +46,11 @@ type AlertNotificationEmail = 'email';
 type AlertNotificationSlack = 'slack';
 type AlertNotificationPagerDuty = 'pagerduty';
 type AlertNotificationWebHook = 'webhook';
+type EmailRecipientType =
+  | 'admin_users'
+  | 'read_users'
+  | 'read_write_users'
+  | 'user';
 export interface Dashboard {
   created: string;
   group_by?: string[];
@@ -298,29 +303,48 @@ interface NotificationChannelBase {
 
 interface NotificationChannelEmail extends NotificationChannelBase {
   channel_type: AlertNotificationEmail;
-  content: {
+  content?: {
     email: {
       email_addresses: string[];
       message: string;
       subject: string;
     };
   };
+  details?: {
+    email: {
+      recipient_type: EmailRecipientType;
+      usernames: string[];
+    };
+  };
 }
 
 interface NotificationChannelSlack extends NotificationChannelBase {
   channel_type: AlertNotificationSlack;
-  content: {
+  content?: {
     slack: {
       message: string;
       slack_channel: string;
       slack_webhook_url: string;
     };
   };
+  details?: {
+    slack: {
+      slack_channel: string;
+      slack_webhook_url: string;
+    };
+  };
 }
 
 interface NotificationChannelPagerDuty extends NotificationChannelBase {
   channel_type: AlertNotificationPagerDuty;
-  content: {
+  content?: {
+    pagerduty: {
+      attributes: string[];
+      description: string;
+      service_api_key: string;
+    };
+  };
+  details?: {
     pagerduty: {
       attributes: string[];
       description: string;
@@ -330,12 +354,27 @@ interface NotificationChannelPagerDuty extends NotificationChannelBase {
 }
 interface NotificationChannelWebHook extends NotificationChannelBase {
   channel_type: AlertNotificationWebHook;
-  content: {
+  content?: {
+    webhook: {
+      http_headers: {
+        header_key: string;
+        header_value: string;
+      }[];
+      webhook_url: string;
+    };
+  };
+  details?: {
     webhook: {
+      alert_body: {
+        body: string;
+        subject: string;
+      };
       http_headers: {
         header_key: string;
         header_value: string;
       }[];
+      method: 'GET' | 'POST' | 'PUT';
+      request_body: string;
       webhook_url: string;
     };
   };
diff --git a/packages/manager/.changeset/pr-13226-fixed-1767004688291.md b/packages/manager/.changeset/pr-13226-fixed-1767004688291.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Exclude newly added unsaved Rule Sets from dropdown for the given Firewall ([#13226](https://github.com/linode/manager/pull/13226))
diff --git a/packages/manager/.changeset/pr-13227-fixed-1767012195840.md b/packages/manager/.changeset/pr-13227-fixed-1767012195840.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Null and Undefined checks in components and tests to support ACLP-Alerting: Notification Channel Type changes ([#13227](https://github.com/linode/manager/pull/13227))
diff --git a/packages/manager/.changeset/pr-13230-added-1767073910229.md b/packages/manager/.changeset/pr-13230-added-1767073910229.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Added
+---
+
+New feature marker in navigation menu and primary breadcrumbs of `CloudPulse metrics` ([#13230](https://github.com/linode/manager/pull/13230))
diff --git a/packages/manager/cypress/e2e/core/cloudpulse/alert-notification-channel-list.spec.ts b/packages/manager/cypress/e2e/core/cloudpulse/alert-notification-channel-list.spec.ts
@@ -101,7 +101,7 @@ const isEmailContent = (
     message: string;
     subject: string;
   };
-} => 'email' in content;
+} => content !== undefined && 'email' in content;
 const mockProfile = profileFactory.build({
   timezone: 'gmt',
 });
diff --git a/packages/manager/cypress/e2e/core/cloudpulse/cloudpulse-navigation.spec.ts b/packages/manager/cypress/e2e/core/cloudpulse/cloudpulse-navigation.spec.ts
@@ -22,14 +22,17 @@ describe('Moniter navigation', () => {
   it('can navigate to metrics landing page', () => {
     mockAppendFeatureFlags({
       aclp: {
-        beta: true,
+        beta: false,
         enabled: true,
+        new: true,
       },
     }).as('getFeatureFlags');
 
     cy.visitWithLogin('/linodes');
     cy.wait('@getFeatureFlags');
-
+    cy.get('[data-testid="menu-item-Metrics"]').within(() => {
+      cy.get('[data-testid="newFeatureChip"]').should('be.visible'); // check for new feature chip
+    });
     cy.get('[data-testid="menu-item-Metrics"]').should('be.visible').click();
     cy.url().should('endWith', '/metrics');
   });
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx
@@ -228,6 +228,7 @@ describe('PrimaryNav', () => {
       aclp: {
         beta: true,
         enabled: true,
+        new: true,
       },
       aclpAlerting: {
         accountAlertLimit: 10,
@@ -239,7 +240,7 @@ describe('PrimaryNav', () => {
       },
     };
 
-    const { findAllByTestId, findByText } = renderWithTheme(
+    const { findAllByTestId, findByText, queryByTestId } = renderWithTheme(
       <PrimaryNav {...props} />,
       {
         flags,
@@ -249,12 +250,57 @@ describe('PrimaryNav', () => {
     const monitorMetricsDisplayItem = await findByText('Metrics');
     const monitorAlertsDisplayItem = await findByText('Alerts');
     const betaChip = await findAllByTestId('betaChip');
+    const newFeatureChip = queryByTestId('newFeatureChip');
+    expect(newFeatureChip).toBeNull(); // when beta is true, only beta chip is shown not new chip
 
     expect(monitorMetricsDisplayItem).toBeVisible();
     expect(monitorAlertsDisplayItem).toBeVisible();
     expect(betaChip).toHaveLength(2);
   });
 
+  it('shoud show beta chip next to Metrics menu item if the user has the account capability and aclp feature flag has new true', async () => {
+    const account = accountFactory.build({
+      capabilities: ['Akamai Cloud Pulse'],
+    });
+
+    queryMocks.useAccount.mockReturnValue({
+      data: account,
+      isLoading: false,
+      error: null,
+    });
+
+    const flags = {
+      aclp: {
+        beta: false,
+        enabled: true,
+        new: true,
+      },
+      aclpAlerting: {
+        accountAlertLimit: 10,
+        accountMetricLimit: 10,
+        alertDefinitions: true,
+        beta: true,
+        notificationChannels: false,
+        recentActivity: false,
+      },
+    };
+
+    const { findByText, findByTestId } = renderWithTheme(
+      <PrimaryNav {...props} />,
+      {
+        flags,
+      }
+    );
+
+    const monitorMetricsDisplayItem = await findByText('Metrics');
+    const monitorAlertsDisplayItem = await findByText('Alerts');
+    const newFeatureChip = await findByTestId('newFeatureChip');
+
+    expect(monitorMetricsDisplayItem).toBeVisible();
+    expect(monitorAlertsDisplayItem).toBeVisible();
+    expect(newFeatureChip).toBeVisible();
+  });
+
   it('should not show Metrics and Alerts menu items if the user has the account capability but the aclp feature flag is not enabled', async () => {
     const account = accountFactory.build({
       capabilities: ['Akamai Cloud Pulse'],
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -243,6 +243,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 hide: !isACLPEnabled,
                 to: '/metrics',
                 isBeta: flags.aclp?.beta,
+                isNew: !flags.aclp?.beta && flags.aclp?.new,
               },
               {
                 display: 'Alerts',
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
@@ -104,6 +104,11 @@ interface AclpFlag {
    */
   humanizableUnits?: string[];
 
+  /**
+   * This property indicates whether the feature is new or not
+   */
+  new?: boolean;
+
   /**
    * This property indicates whether to show widget dimension filters or not
    */
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/AddChannelListing.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/AddChannelListing.test.tsx
@@ -40,7 +40,7 @@ describe('Channel Listing component', () => {
   it('should render the notification channels ', () => {
     const emailAddresses =
       mockNotificationData[0].channel_type === 'email' &&
-      mockNotificationData[0].content.email
+      mockNotificationData[0].content?.email
         ? mockNotificationData[0].content.email.email_addresses
         : [];
 
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/RenderChannelDetails.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/RenderChannelDetails.test.tsx
@@ -12,7 +12,7 @@ const mockData: NotificationChannel = notificationChannelFactory.build();
 describe('RenderChannelDetails component', () => {
   it('should render the email channel type notification details', () => {
     const emailAddresses =
-      mockData.channel_type === 'email' && mockData.content.email
+      mockData.channel_type === 'email' && mockData.content?.email
         ? mockData.content.email.email_addresses
         : [];
     const container = renderWithTheme(
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/RenderChannelDetails.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/RenderChannelDetails.tsx
@@ -12,7 +12,7 @@ interface RenderChannelDetailProps {
 export const RenderChannelDetails = (props: RenderChannelDetailProps) => {
   const { template } = props;
   if (template.channel_type === 'email') {
-    return template.content.email.email_addresses.map((value, index) => (
+    return template.content?.email.email_addresses.map((value, index) => (
       <Chip key={index} label={value} />
     ));
   }
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
@@ -241,22 +241,22 @@ export const getChipLabels = (
   if (value.channel_type === 'email') {
     return {
       label: 'To',
-      values: value.content.email.email_addresses,
+      values: value.content?.email.email_addresses ?? [],
     };
   } else if (value.channel_type === 'slack') {
     return {
       label: 'Slack Webhook URL',
-      values: [value.content.slack.slack_webhook_url],
+      values: [value.content?.slack.slack_webhook_url ?? ''],
     };
   } else if (value.channel_type === 'pagerduty') {
     return {
       label: 'Service API Key',
-      values: [value.content.pagerduty.service_api_key],
+      values: [value.content?.pagerduty.service_api_key ?? ''],
     };
   } else {
     return {
       label: 'Webhook URL',
-      values: [value.content.webhook.webhook_url],
+      values: [value.content?.webhook.webhook_url ?? ''],
     };
   }
 };
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.test.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.test.tsx
@@ -50,7 +50,15 @@ vi.spyOn(utils, 'getAllDashboards').mockReturnValue({
 });
 describe('CloudPulseDashboardFilterBuilder component tests', () => {
   it('should render error placeholder if dashboard not selected', () => {
-    renderWithTheme(<CloudPulseDashboardLanding />);
+    renderWithTheme(<CloudPulseDashboardLanding />, {
+      flags: {
+        aclp: {
+          new: true,
+          beta: false,
+          enabled: true,
+        },
+      },
+    });
     const text = screen.getByText('metrics');
     expect(text).toBeInTheDocument();
 
@@ -61,6 +69,9 @@ describe('CloudPulseDashboardFilterBuilder component tests', () => {
 
     const messageComponent = screen.getByText(message);
     expect(messageComponent).toBeDefined();
+
+    const newFeatureChip = screen.getByTestId('newFeatureChip');
+    expect(newFeatureChip).toBeVisible();
   });
 
   it('should render error placeholder if some dashboard is selected and filter config is not present', async () => {
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.tsx
@@ -1,12 +1,13 @@
 import { useProfile } from '@linode/queries';
-import { Box, Paper } from '@linode/ui';
+import { Box, NewFeatureChip, Paper } from '@linode/ui';
 import { GridLegacy } from '@mui/material';
 import { DateTime } from 'luxon';
 import * as React from 'react';
 
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { LandingHeader } from 'src/components/LandingHeader';
 import { SuspenseLoader } from 'src/components/SuspenseLoader';
+import { useFlags } from 'src/hooks/useFlags';
 
 import { GlobalFilters } from '../Overview/GlobalFilters';
 import { CloudPulseAppliedFilterRenderer } from '../shared/CloudPulseAppliedFilterRenderer';
@@ -33,6 +34,7 @@ export interface DashboardProp {
 
 export const CloudPulseDashboardLanding = () => {
   const { data: profile } = useProfile();
+  const flags = useFlags();
   const [filterData, setFilterData] = React.useState<FilterData>({
     id: {},
     label: {},
@@ -101,7 +103,12 @@ export const CloudPulseDashboardLanding = () => {
     <React.Suspense fallback={<SuspenseLoader />}>
       <DocumentTitleSegment segment="Dashboards" />
       <LandingHeader
-        breadcrumbProps={{ pathname: '/metrics' }}
+        breadcrumbProps={{
+          pathname: '/metrics',
+          labelOptions: {
+            suffixComponent: flags.aclp?.new ? <NewFeatureChip /> : undefined,
+          },
+        }}
         docsLabel="Docs"
         docsLink="https://techdocs.akamai.com/cloud-computing/docs/akamai-cloud-pulse"
       />
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRulesLanding.tsx
@@ -547,10 +547,7 @@ export const FirewallRulesLanding = React.memo((props: Props) => {
             modeViewedFrom: ruleDrawer.mode,
           });
         }}
-        inboundAndOutboundRules={[
-          ...(rules.inbound ?? []),
-          ...(rules.outbound ?? []),
-        ]}
+        inboundAndOutboundRules={[...inboundRules, ...outboundRules]}
         isOpen={
           location.pathname.endsWith('add/inbound') ||
           location.pathname.endsWith('add/outbound') ||

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@linode/api-v4": Changed
 +---
++
 +ACLP-Alerting: Notification Channel types to support API changes and backward compatibility  ([#13227](https://github.com/linode/manager/pull/13227))
Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {`
`243`	`243`	`hide: !isACLPEnabled,`
`244`	`244`	`to: '/metrics',`
`245`	`245`	`isBeta: flags.aclp?.beta,`
	`246`	`+ isNew: !flags.aclp?.beta && flags.aclp?.new,`
`246`	`247`	`},`
`247`	`248`	`{`
`248`	`249`	`display: 'Alerts',`