Revert "upcoming: [DI-29113] - Support for User Channel Details in Alert flow…" (#13252)

santoshp210-akamai · web-flow · commit b026e5f69370 · 2026-01-08T11:02:12.000+05:30
This reverts commit e77c677.
diff --git a/packages/api-v4/.changeset/pr-13246-changed-1767779941145.md b/packages/api-v4/.changeset/pr-13246-changed-1767779941145.md
diff --git a/packages/api-v4/src/cloudpulse/types.ts b/packages/api-v4/src/cloudpulse/types.ts
@@ -282,13 +282,14 @@ export interface Alert {
   updated_by: string;
 }
 
-interface NotificationChannelAlertInfo {
-  alert_count: number;
+interface NotificationChannelAlerts {
+  id: number;
+  label: string;
   type: 'alerts-definitions';
   url: string;
 }
 interface NotificationChannelBase {
-  alerts: NotificationChannelAlertInfo;
+  alerts: NotificationChannelAlerts[];
   channel_type: ChannelType;
   created: string;
   created_by: string;
diff --git a/packages/manager/.changeset/pr-13246-added-1767776466714.md b/packages/manager/.changeset/pr-13246-added-1767776466714.md
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
@@ -41,11 +41,12 @@ const notificationChannels = notificationChannelFactory
   .buildList(26)
   .map((ch, i) => {
     const isEmail = i % 2 === 0;
-    const alerts = {
-      alert_count: isEmail ? 5 : 3,
-      url: `monitor/alert-channels/${i + 1}/alerts`,
+    const alerts = Array.from({ length: isEmail ? 5 : 3 }).map((_, idx) => ({
+      id: idx + 1,
+      label: `Alert-${idx + 1}`,
       type: 'alerts-definitions',
-    };
+      url: 'Sample',
+    }));
 
     if (isEmail) {
       return {
@@ -146,7 +147,7 @@ const VerifyChannelSortingParams = (
   );
 
   const order = sortOrderMap[sortOrder];
-  const orderBy = encodeURIComponent(LabelLookup[columnLabel]);
+  const orderBy = LabelLookup[columnLabel];
 
   cy.url().should(
     'endWith',
@@ -214,7 +215,16 @@ describe('Notification Channel Listing Page', () => {
         }
 
         // Alerts list
-        expect(item.alerts.alert_count).to.eq(expected.alerts.alert_count);
+        expect(item.alerts.length).to.eq(expected.alerts.length);
+
+        item.alerts.forEach((alert, aIndex) => {
+          const expAlert = expected.alerts[aIndex];
+
+          expect(alert.id).to.eq(expAlert.id);
+          expect(alert.label).to.eq(expAlert.label);
+          expect(alert.type).to.eq(expAlert.type);
+          expect(alert.url).to.eq(expAlert.url);
+        });
       });
     });
   });
@@ -244,9 +254,7 @@ describe('Notification Channel Listing Page', () => {
 
           cy.wrap($row).within(() => {
             cy.findByText(expected.label).should('be.visible');
-            cy.findByText(String(expected.alerts.alert_count)).should(
-              'be.visible'
-            );
+            cy.findByText(String(expected.alerts.length)).should('be.visible');
             cy.findByText('Email').should('be.visible');
             cy.get('td').eq(3).should('have.text', expected.created_by);
             cy.findByText(
@@ -276,20 +284,11 @@ describe('Notification Channel Listing Page', () => {
       {
         column: 'Alerts',
         ascending: [...notificationChannels]
-          .sort(
-            // Primary sort by `alert_count`. When two items have the same
-            // alert count, fall back to `a.id - b.id` as a deterministic
-            // tie-breaker so test expectations remain stable.
-            (a, b) => a.alerts.alert_count - b.alerts.alert_count
-          )
+          .sort((a, b) => a.alerts.length - b.alerts.length)
           .map((ch) => ch.id),
 
         descending: [...notificationChannels]
-          .sort(
-            // Primary sort by `alert_count` (desc). Tie-break with `a.id - b.id`
-            // to keep ordering deterministic for assertions.
-            (a, b) => b.alerts.alert_count - a.alerts.alert_count
-          )
+          .sort((a, b) => b.alerts.length - a.alerts.length)
           .map((ch) => ch.id),
       },
 
diff --git a/packages/manager/src/factories/cloudpulse/channels.ts b/packages/manager/src/factories/cloudpulse/channels.ts
@@ -4,11 +4,14 @@ import type { NotificationChannel } from '@linode/api-v4';
 
 export const notificationChannelFactory =
   Factory.Sync.makeFactory<NotificationChannel>({
-    alerts: {
-      type: 'alerts-definitions',
-      alert_count: 1,
-      url: 'monitor/alert-channels/{id}/alerts',
-    },
+    alerts: [
+      {
+        id: Number(Factory.each((i) => i)),
+        label: String(Factory.each((id) => `Alert-${id}`)),
+        type: 'alerts-definitions',
+        url: 'Sample',
+      },
+    ],
     channel_type: 'email',
     content: {
       email: {
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
@@ -1,4 +1,3 @@
-import { screen } from '@testing-library/react';
 import * as React from 'react';
 
 import { notificationChannelFactory } from 'src/factories/cloudpulse/channels';
@@ -22,21 +21,4 @@ describe('RenderChannelDetails component', () => {
     expect(container.getByText(emailAddresses[0])).toBeVisible();
     expect(container.getByText(emailAddresses[1])).toBeVisible();
   });
-  it('should render the email channel with usernames if details is present', () => {
-    const usernames = ['user1', 'user2'];
-    const mockDataWithDetails: NotificationChannel =
-      notificationChannelFactory.build({
-        channel_type: 'email',
-        content: {},
-        details: {
-          email: {
-            usernames,
-            recipient_type: 'user',
-          },
-        },
-      });
-    renderWithTheme(<RenderChannelDetails template={mockDataWithDetails} />);
-    expect(screen.getByText(usernames[0])).toBeVisible();
-    expect(screen.getByText(usernames[1])).toBeVisible();
-  });
 });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/RenderChannelDetails.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/NotificationChannels/RenderChannelDetails.tsx
@@ -1,8 +1,6 @@
 import { Chip } from '@mui/material';
 import * as React from 'react';
 
-import { shouldUseContentsForEmail } from '../../Utils/utils';
-
 import type { NotificationChannel } from '@linode/api-v4';
 
 interface RenderChannelDetailProps {
@@ -14,21 +12,9 @@ interface RenderChannelDetailProps {
 export const RenderChannelDetails = (props: RenderChannelDetailProps) => {
   const { template } = props;
   if (template.channel_type === 'email') {
-    const contentEmail = template.content?.email;
-    const detailEmail = template.details?.email;
-    const useContents = shouldUseContentsForEmail(template);
-
-    const recipients = useContents
-      ? (contentEmail?.email_addresses ?? [])
-      : (detailEmail?.usernames ?? []);
-
-    return (
-      <>
-        {recipients.map((value) => (
-          <Chip key={value} label={value} />
-        ))}
-      </>
-    );
+    return template.content?.email.email_addresses.map((value, index) => (
+      <Chip key={index} label={value} />
+    ));
   }
   return null;
 };
diff --git a/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/NotificationChannelListTable.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/NotificationChannelListTable.test.tsx
@@ -10,6 +10,8 @@ import { NotificationChannelListTable } from './NotificationChannelListTable';
 
 const mockScrollToElement = vi.fn();
 
+const ALERT_TYPE = 'alerts-definitions';
+
 describe('NotificationChannelListTable', () => {
   it('should render the notification channel table headers', () => {
     renderWithTheme(
@@ -125,7 +127,11 @@ describe('NotificationChannelListTable', () => {
 
   it('should display correct alerts count', () => {
     const channel = notificationChannelFactory.build({
-      alerts: { alert_count: 3 },
+      alerts: [
+        { id: 1, label: 'Alert 1', type: ALERT_TYPE, url: 'url1' },
+        { id: 2, label: 'Alert 2', type: ALERT_TYPE, url: 'url2' },
+        { id: 3, label: 'Alert 3', type: ALERT_TYPE, url: 'url3' },
+      ],
     });
 
     renderWithTheme(
diff --git a/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/NotificationChannelTableRow.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/NotificationChannelTableRow.test.tsx
@@ -18,11 +18,10 @@ describe('NotificationChannelTableRow', () => {
   it('should render a notification channel row with all fields', () => {
     const updated = new Date().toISOString();
     const channel = notificationChannelFactory.build({
-      alerts: {
-        type: 'alerts-definitions',
-        alert_count: 2,
-        url: 'monitor/alert-channels/{id}/alerts',
-      },
+      alerts: [
+        { id: 1, label: 'Alert 1', type: 'alerts-definitions', url: 'url1' },
+        { id: 2, label: 'Alert 2', type: 'alerts-definitions', url: 'url2' },
+      ],
       channel_type: 'email',
       created_by: 'user1',
       label: 'Test Channel',
@@ -143,7 +142,7 @@ describe('NotificationChannelTableRow', () => {
 
   it('should render zero alerts count when no alerts are associated', () => {
     const channel = notificationChannelFactory.build({
-      alerts: { alert_count: 0 },
+      alerts: [],
     });
 
     renderWithTheme(
diff --git a/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/NotificationChannelTableRow.tsx b/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/NotificationChannelTableRow.tsx
@@ -52,7 +52,7 @@ export const NotificationChannelTableRow = (
           {label}
         </Link>
       </TableCell>
-      <TableCell>{alerts.alert_count}</TableCell>
+      <TableCell>{alerts.length}</TableCell>
       <TableCell>{channelTypeMap[channel_type]}</TableCell>
       <TableCell>{created_by}</TableCell>
       <TableCell>
diff --git a/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/NotificationChannels/NotificationsChannelsListing/constants.ts
@@ -2,7 +2,7 @@ import type { NotificationChannel } from '@linode/api-v4';
 
 type ChannelListingTableLabel = {
   colName: string;
-  label: `${keyof NotificationChannel}:${string}` | keyof NotificationChannel;
+  label: keyof NotificationChannel;
 };
 
 export const ChannelListingTableLabelMap: ChannelListingTableLabel[] = [
@@ -12,7 +12,7 @@ export const ChannelListingTableLabelMap: ChannelListingTableLabel[] = [
   },
   {
     colName: 'Alerts',
-    label: 'alerts:alert_count',
+    label: 'alerts',
   },
   {
     colName: 'Channel Type',
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts
@@ -1,7 +1,7 @@
 import { regionFactory } from '@linode/utilities';
 import { act, renderHook } from '@testing-library/react';
 
-import { alertFactory, notificationChannelFactory, serviceTypesFactory } from 'src/factories';
+import { alertFactory, serviceTypesFactory } from 'src/factories';
 
 import { useContextualAlertsState } from '../../Utils/utils';
 import { transformDimensionValue } from '../CreateAlert/Criteria/DimensionFilterValue/utils';
@@ -17,7 +17,6 @@ import {
   getSchemaWithEntityIdValidation,
   getServiceTypeLabel,
   handleMultipleError,
-  shouldUseContentsForEmail,
 } from './utils';
 
 import type { AlertValidationSchemaProps } from './utils';
@@ -498,60 +497,3 @@ describe('transformDimensionValue', () => {
     ).toBe('Test_value');
   });
 });
-
-describe('shouldUseContentsForEmail', () => {
-  it('should return false for email channel with valid usernames in details', () => {
-    const notificationChannel = notificationChannelFactory.build({
-      channel_type: 'email',
-      details: {
-        email: {
-          usernames: ['user1', 'user2'],
-        },
-      },
-    });
-    expect(shouldUseContentsForEmail(notificationChannel)).toBe(false);
-  });
-
-  it('should return true for email channel with undefined details', () => {
-    const notificationChannel = notificationChannelFactory.build({
-      channel_type: 'email',
-      details: undefined,
-    });
-    expect(shouldUseContentsForEmail(notificationChannel)).toBe(true);
-  });
-
-  it('should return true for email channel with undefined details.email', () => {
-    const notificationChannel = notificationChannelFactory.build({
-      channel_type: 'email',
-      details: {
-        email: undefined,
-      },
-    });
-    expect(shouldUseContentsForEmail(notificationChannel)).toBe(true);
-  });
-
-  it('should return true for email channel with undefined usernames', () => {
-    const notificationChannel = notificationChannelFactory.build({
-      channel_type: 'email',
-      details: {
-        email: {
-          usernames: undefined,
-        },
-      },
-    });
-    expect(shouldUseContentsForEmail(notificationChannel)).toBe(true);
-  });
-
-  it('should return true for email channel with empty usernames array', () => {
-    const notificationChannel = notificationChannelFactory.build({
-      channel_type: 'email',
-      details: {
-        email: {
-          usernames: [],
-          recipient_type: 'admin_users',
-        },
-      },
-    });
-    expect(shouldUseContentsForEmail(notificationChannel)).toBe(true);
-  });
-});
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
@@ -231,23 +231,6 @@ export const getAlertChipBorderRadius = (
   return '0';
 };
 
-/**
- * Determines whether to use details.email.usernames (newer API) or content.email.email_addresses (older API)
- * for displaying email recipients in notification channels.
- *
- * @param channel The notification channel to check
- * @returns true if we should use content.email.email_addresses, false if we should use details.email.usernames
- */
-export const shouldUseContentsForEmail = (
-  channel: NotificationChannel
-): boolean => {
-  // Use content if: details is missing, details is empty, details.email is empty or details.email.usernames is empty
-  return !(
-    channel.channel_type === 'email' && // ensuring it's an email channel to avoid the type error with email property
-    channel.details?.email?.usernames?.length
-  );
-};
-
 /**
  * @param value The notification channel object for which we need to display the chips
  * @returns The label and the values that needs to be displayed based on channel type
@@ -256,16 +239,9 @@ export const getChipLabels = (
   value: NotificationChannel
 ): AlertDimensionsProp => {
   if (value.channel_type === 'email') {
-    const contentEmail = value.content?.email;
-    const useContent = shouldUseContentsForEmail(value);
-
-    const recipients = useContent
-      ? (contentEmail?.email_addresses ?? [])
-      : (value.details?.email?.usernames ?? []);
-
     return {
       label: 'To',
-      values: recipients,
+      values: value.content?.email.email_addresses ?? [],
     };
   } else if (value.channel_type === 'slack') {
     return {
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
@@ -3626,12 +3626,6 @@ export const handlers = [
         updated: '2023-11-05T04:00:00',
         updated_by: 'user3',
         created_by: 'admin',
-        details: {
-          email: {
-            usernames: ['user1', 'user2'],
-            recipient_type: 'user',
-          },
-        },
       })
     );
     notificationChannels.push(
