Revert "upcoming: [M3-10708] - Display maintenance type and config in linode_…" (#13179)

This reverts commit 814c11e.

Author: jaalah

packages/api-v4/.changeset/pr-13084-changed-1762970902694.md

@@ -1,4 +1,4 @@
-import { API_ROOT, BETA_API_ROOT } from '../constants';
+import { API_ROOT } from '../constants';
 import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
 
 import type { Filter, Params, ResourcePage } from '../types';
@@ -12,7 +12,7 @@ import type { Event, Notification } from './types';
  */
 export const getEvents = (params: Params = {}, filter: Filter = {}) =>
   Request<ResourcePage<Event>>(
-    setURL(`${BETA_API_ROOT}/account/events`),
+    setURL(`${API_ROOT}/account/events`),
     setMethod('GET'),
     setXFilter(filter),
     setParams(params),
@@ -26,7 +26,7 @@ export const getEvents = (params: Params = {}, filter: Filter = {}) =>
  */
 export const getEvent = (eventId: number) =>
   Request<Event>(
-    setURL(`${BETA_API_ROOT}/account/events/${encodeURIComponent(eventId)}`),
+    setURL(`${API_ROOT}/account/events/${encodeURIComponent(eventId)}`),
     setMethod('GET'),
   );
 

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

@@ -287,65 +287,6 @@ const eventTemplates = {
       status: 'finished',
     }),
 
-  'Linode Migration In Progress': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Linode migration in progress.',
-      percent_complete: 45,
-      status: 'started',
-    }),
-
-  'Linode Migration - Emergency': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      description: 'emergency',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Emergency linode migration in progress.',
-      percent_complete: 30,
-      status: 'started',
-    }),
-
-  'Linode Migration - Scheduled Started': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      description: 'scheduled',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Scheduled linode migration in progress.',
-      percent_complete: 10,
-      status: 'started',
-    }),
-
-  'Linode Migration - Scheduled': () =>
-    eventFactory.build({
-      action: 'linode_migrate',
-      description: 'scheduled',
-      entity: {
-        id: 1,
-        label: 'linode-1',
-        type: 'linode',
-        url: '/v4/linode/instances/1',
-      },
-      message: 'Scheduled linode migration in progress.',
-      percent_complete: 0,
-      status: 'scheduled',
-    }),
-
   'Completed Event': () =>
     eventFactory.build({
       action: 'account_update',

packages/manager/.changeset/pr-13084-upcoming-features-1762970850861.md

@@ -210,42 +210,7 @@ const maintenanceTemplates = {
   Canceled: () => accountMaintenanceFactory.build({ status: 'canceled' }),
   Completed: () => accountMaintenanceFactory.build({ status: 'completed' }),
   'In Progress': () =>
-    accountMaintenanceFactory.build({
-      status: 'in_progress',
-      entity: {
-        type: 'linode',
-        id: 1,
-        label: 'linode-1',
-        url: '/v4/linode/instances/1',
-      },
-      type: 'migrate',
-    }),
-  'In Progress - Emergency Migration': () =>
-    accountMaintenanceFactory.build({
-      status: 'in_progress',
-      entity: {
-        type: 'linode',
-        id: 1,
-        label: 'linode-1',
-        url: '/v4/linode/instances/1',
-      },
-      type: 'migrate',
-      description: 'emergency',
-      reason: 'Emergency maintenance migration',
-    }),
-  'In Progress - Scheduled Migration': () =>
-    accountMaintenanceFactory.build({
-      status: 'in_progress',
-      entity: {
-        type: 'linode',
-        id: 1,
-        label: 'linode-1',
-        url: '/v4/linode/instances/1',
-      },
-      type: 'migrate',
-      description: 'scheduled',
-      reason: 'Scheduled maintenance migration',
-    }),
+    accountMaintenanceFactory.build({ status: 'in_progress' }),
   Pending: () => accountMaintenanceFactory.build({ status: 'pending' }),
   Scheduled: () => accountMaintenanceFactory.build({ status: 'scheduled' }),
   Started: () => accountMaintenanceFactory.build({ status: 'started' }),

packages/manager/src/dev-tools/components/ExtraPresetEvents.tsx

@@ -24,23 +24,6 @@ export const JsonTextArea = ({
   const debouncedUpdate = React.useMemo(
     () =>
       debounce((text: string) => {
-        // Handle empty/whitespace text as null
-        if (!text.trim()) {
-          const event = {
-            currentTarget: {
-              name,
-              value: null,
-            },
-            target: {
-              name,
-              value: null,
-            },
-          } as unknown as React.ChangeEvent<HTMLTextAreaElement>;
-
-          onChange(event);
-          return;
-        }
-
         try {
           const parsedJson = JSON.parse(text);
           const event = {
@@ -52,7 +35,7 @@ export const JsonTextArea = ({
               name,
               value: parsedJson,
             },
-          } as unknown as React.ChangeEvent<HTMLTextAreaElement>;
+          } as React.ChangeEvent<HTMLTextAreaElement>;
 
           onChange(event);
         } catch (err) {

packages/manager/src/dev-tools/components/ExtraPresetMaintenance.tsx

@@ -47,8 +47,6 @@ const statusIconMap: Record<AccountMaintenance['status'], Status> = {
   scheduled: 'active',
 };
 
-const MAX_REASON_DISPLAY_LENGTH = 93;
-
 interface MaintenanceTableRowProps {
   maintenance: AccountMaintenance;
   tableType: MaintenanceTableType;
@@ -76,11 +74,9 @@ export const MaintenanceTableRow = (props: MaintenanceTableRowProps) => {
 
   const eventProgress = recentEvent && formatProgressEvent(recentEvent);
 
-  const truncatedReason = reason
-    ? truncate(reason, MAX_REASON_DISPLAY_LENGTH)
-    : '';
+  const truncatedReason = truncate(reason, 93);
 
-  const isTruncated = reason ? reason !== truncatedReason : false;
+  const isTruncated = reason !== truncatedReason;
 
   const dateField = getMaintenanceDateField(tableType);
   const dateValue = props.maintenance[dateField];

packages/manager/src/dev-tools/components/JsonTextArea.tsx

@@ -40,7 +40,7 @@ export const maintenanceDateColumnMap: Record<
 > = {
   completed: ['complete_time', 'End Date'],
   'in progress': ['start_time', 'Start Date'],
-  upcoming: ['when', 'Start Date'],
+  upcoming: ['start_time', 'Start Date'],
   pending: ['when', 'Date'],
 };
 

packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx

@@ -5,23 +5,6 @@ import { Link } from 'src/components/Link';
 import { EventLink } from '../EventLink';
 
 import type { PartialEventMap } from '../types';
-import type { AccountMaintenance } from '@linode/api-v4';
-
-/**
- * Normalizes the event description to a valid maintenance type.
- * Only accepts 'emergency' or 'scheduled' from AccountMaintenance.description,
- * defaults to 'maintenance' for any other value or null/undefined.
- */
-type MaintenanceDescription = 'maintenance' | AccountMaintenance['description'];
-
-const getMaintenanceDescription = (
-  description: null | string | undefined
-): MaintenanceDescription => {
-  if (description === 'emergency' || description === 'scheduled') {
-    return description;
-  }
-  return 'maintenance';
-};
 
 export const linode: PartialEventMap<'linode'> = {
   linode_addip: {
@@ -258,106 +241,30 @@ export const linode: PartialEventMap<'linode'> = {
     ),
   },
   linode_migrate: {
-    failed: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Migration <strong>failed</strong> for Linode{' '}
-          <EventLink event={e} to="entity" /> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
-    finished: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Linode <EventLink event={e} to="entity" /> has been{' '}
-          <strong>migrated</strong> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
-    scheduled: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Linode <EventLink event={e} to="entity" /> is scheduled to be{' '}
-          <strong>migrated</strong> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
-    started: (e) => {
-      const maintenanceType = getMaintenanceDescription(e.description);
-      return (
-        <>
-          Linode <EventLink event={e} to="entity" /> is being{' '}
-          <strong>migrated</strong> for{' '}
-          {maintenanceType === 'maintenance' ? (
-            <strong>maintenance</strong>
-          ) : (
-            <>
-              <strong>{maintenanceType}</strong> maintenance
-            </>
-          )}
-          {e.secondary_entity ? (
-            <>
-              {' '}
-              with config <EventLink event={e} to="secondaryEntity" />
-            </>
-          ) : (
-            ''
-          )}
-          .
-        </>
-      );
-    },
+    failed: (e) => (
+      <>
+        Migration <strong>failed</strong> for Linode{' '}
+        <EventLink event={e} to="entity" />.
+      </>
+    ),
+    finished: (e) => (
+      <>
+        Linode <EventLink event={e} to="entity" /> has been{' '}
+        <strong>migrated</strong>.
+      </>
+    ),
+    scheduled: (e) => (
+      <>
+        Linode <EventLink event={e} to="entity" /> is scheduled to be{' '}
+        <strong>migrated</strong>.
+      </>
+    ),
+    started: (e) => (
+      <>
+        Linode <EventLink event={e} to="entity" /> is being{' '}
+        <strong>migrated</strong>.
+      </>
+    ),
   },
   linode_migrate_datacenter: {
     failed: (e) => (