change: [DPS-41857] - Logs: Add new statuses - deactivating, failed

Author: bbanucha-akamai

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

@@ -1,5 +1,7 @@
 export const streamStatus = {
   Active: 'active',
+  Deactivating: 'deactivating',
+  Failed: 'failed',
   Inactive: 'inactive',
   Provisioning: 'provisioning',
 } as const;

packages/manager/src/features/Delivery/Shared/types.ts

@@ -49,6 +49,16 @@ export const streamStatusOptions: AutocompleteOption[] = [
     label: 'Active',
     pendoId: 'Logs Delivery Streams-Status Active',
   },
+  {
+    value: streamStatus.Deactivating,
+    label: 'Deactivating',
+    pendoId: 'Logs Delivery Streams-Status Deactivating',
+  },
+  {
+    value: streamStatus.Failed,
+    label: 'Failed',
+    pendoId: 'Logs Delivery Streams-Status Failed',
+  },
   {
     value: streamStatus.Inactive,
     label: 'Inactive',

packages/manager/src/features/Delivery/Streams/StreamActionMenu.tsx

@@ -17,6 +17,7 @@ interface StreamActionMenuProps extends StreamHandlers {
 
 export const StreamActionMenu = (props: StreamActionMenuProps) => {
   const { stream, onDelete, onDisableOrEnable, onEdit } = props;
+  const { status, label } = stream;
 
   const menuActions: Action[] = [
     {
@@ -25,14 +26,19 @@ export const StreamActionMenu = (props: StreamActionMenuProps) => {
       },
       title: 'Edit',
       pendoId: 'Logs Delivery Streams-Edit',
+      disabled:
+        status === streamStatus.Deactivating || status === streamStatus.Failed,
     },
     {
       onClick: () => {
         onDisableOrEnable(stream);
       },
-      title: stream.status === streamStatus.Active ? 'Deactivate' : 'Activate',
-      pendoId: `Logs Delivery Streams-${stream.status === streamStatus.Active ? 'Deactivate' : 'Activate'}`,
-      disabled: stream.status === streamStatus.Provisioning,
+      title: status === streamStatus.Active ? 'Deactivate' : 'Activate',
+      pendoId: `Logs Delivery Streams-${status === streamStatus.Active ? 'Deactivate' : 'Activate'}`,
+      disabled:
+        status === streamStatus.Deactivating ||
+        status === streamStatus.Failed ||
+        status === streamStatus.Provisioning,
     },
     {
       onClick: () => {
@@ -46,7 +52,7 @@ export const StreamActionMenu = (props: StreamActionMenuProps) => {
   return (
     <ActionMenu
       actionsList={menuActions}
-      ariaLabel={`Action menu for Stream ${stream.label}`}
+      ariaLabel={`Action menu for Stream ${label}`}
       pendoId="Logs Delivery Streams-Action Menu"
     />
   );

packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx

@@ -1,3 +1,4 @@
+import { streamStatus } from '@linode/api-v4';
 import {
   screen,
   waitFor,
@@ -239,47 +240,60 @@ describe('StreamEdit', () => {
             });
           });
 
-          describe('and stream has status: provisioning', () => {
-            it('should have disabled Edit Stream button and show info tooltip', async () => {
-              server.use(
-                http.get('*/monitor/streams/destinations', () => {
-                  return HttpResponse.json(makeResourcePage(mockDestinations));
-                }),
-                http.get(`*/monitor/streams/${streamId}`, () => {
-                  return HttpResponse.json({
-                    ...mockStream,
-                    status: 'provisioning',
-                  });
-                })
-              );
-
-              renderWithThemeAndHookFormContext({
-                component: <StreamEdit />,
+          const blockingStatuses = [
+            streamStatus.Deactivating,
+            streamStatus.Failed,
+            streamStatus.Provisioning,
+          ];
+
+          describe.each(blockingStatuses)(
+            'and stream has status: %status',
+            (status) => {
+              it('should have disabled Edit Stream button and show info tooltip', async () => {
+                server.use(
+                  http.get('*/monitor/streams/destinations', () => {
+                    return HttpResponse.json(
+                      makeResourcePage(mockDestinations)
+                    );
+                  }),
+                  http.get(`*/monitor/streams/${streamId}`, () => {
+                    return HttpResponse.json({
+                      ...mockStream,
+                      status,
+                    });
+                  })
+                );
+
+                renderWithThemeAndHookFormContext({
+                  component: <StreamEdit />,
+                });
+                const loadingElement = screen.queryByTestId(loadingTestId);
+                await waitForElementToBeRemoved(loadingElement);
+
+                const editStreamButton = screen.getByRole('button', {
+                  name: saveStreamButtonText,
+                });
+
+                // Edit stream button should be disabled
+                expect(editStreamButton).toBeDisabled();
+
+                // Edit stream
+                await userEvent.hover(editStreamButton);
+
+                await waitFor(() => {
+                  expect(screen.getByRole('tooltip')).toBeInTheDocument();
+                });
+
+                const disabledButtonTooltip = screen.getByText((content) =>
+                  content.includes(
+                    `You cannot save changes while the stream status is ${status}`
+                  )
+                );
+
+                expect(disabledButtonTooltip).toBeInTheDocument();
               });
-              const loadingElement = screen.queryByTestId(loadingTestId);
-              await waitForElementToBeRemoved(loadingElement);
-
-              const editStreamButton = screen.getByRole('button', {
-                name: saveStreamButtonText,
-              });
-
-              // Edit stream button should be disabled
-              expect(editStreamButton).toBeDisabled();
-
-              // Edit stream
-              await userEvent.hover(editStreamButton);
-
-              await waitFor(() => {
-                expect(screen.getByRole('tooltip')).toBeInTheDocument();
-              });
-
-              const disabledButtonTooltip = screen.getByText(
-                'You cannot save changes while the stream is provisioning.'
-              );
-
-              expect(disabledButtonTooltip).toBeInTheDocument();
-            });
-          });
+            }
+          );
         });
       });
 

packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx

@@ -77,12 +77,23 @@ export const StreamForm = (props: StreamFormProps) => {
     control,
     name: 'stream.status',
   });
+
+  const isStreamStatusBlocking =
+    !!selectedStreamStatus &&
+    (
+      [
+        streamStatus.Provisioning,
+        streamStatus.Deactivating,
+        streamStatus.Failed,
+      ] as StreamStatus[]
+    ).includes(selectedStreamStatus);
+
   const submitButtonTooltip = useMemo(
     () =>
-      selectedStreamStatus === streamStatus.Provisioning
-        ? 'You cannot save changes while the stream is provisioning.'
+      isStreamStatusBlocking
+        ? `You cannot save changes while the stream status is ${selectedStreamStatus}`
         : undefined,
-    [selectedStreamStatus]
+    [isStreamStatusBlocking, selectedStreamStatus]
   );
 
   useEffect(() => {
@@ -211,8 +222,7 @@ export const StreamForm = (props: StreamFormProps) => {
         <Grid size={{ lg: 3, md: 12, sm: 12, xs: 12 }}>
           <FormSubmitBar
             blockSubmit={
-              selectedStreamStatus === streamStatus.Provisioning ||
-              !selectedDestinations?.length
+              isStreamStatusBlocking || !selectedDestinations?.length
             }
             connectionTested={destinationVerified}
             destinationType={destination?.type}

packages/manager/src/features/Delivery/Streams/StreamTableRow.tsx

@@ -23,9 +23,13 @@ interface StreamTableRowProps extends StreamHandlers {
 export const StreamTableRow = React.memo((props: StreamTableRowProps) => {
   const { stream, onDelete, onDisableOrEnable, onEdit } = props;
   const { id, status } = stream;
-  const iconStatus = (
-    ['active', 'error', 'inactive'].includes(status) ? status : 'other'
-  ) as Status;
+  const iconStatus = ((): Status => {
+    if (status === 'failed') return 'error';
+    if (['active', 'error', 'inactive'].includes(status)) {
+      return status as Status;
+    }
+    return 'other';
+  })();
 
   return (
     <TableRow key={id}>
@@ -72,6 +76,10 @@ const humanizeStreamStatus = (status: StreamStatus) => {
   switch (status) {
     case 'active':
       return 'Active';
+    case 'deactivating':
+      return 'Deactivating';
+    case 'failed':
+      return 'Failed';
     case 'inactive':
       return 'Inactive';
     case 'provisioning':

packages/validation/src/delivery.schema.ts

@@ -351,11 +351,9 @@ const streamSchemaBase = object({
     .min(3, 'Stream name must have at least 3 characters.')
     .max(maxLength, maxLengthMessage)
     .required('Stream name is required.'),
-  status: mixed<'active' | 'inactive' | 'provisioning'>().oneOf([
-    'active',
-    'inactive',
-    'provisioning',
-  ]),
+  status: mixed<
+    'active' | 'deactivating' | 'failed' | 'inactive' | 'provisioning'
+  >().oneOf(['active', 'deactivating', 'failed', 'inactive', 'provisioning']),
   type: string()
     .oneOf(['audit_logs', 'lke_audit_logs'])
     .required('Stream type is required.'),
@@ -372,8 +370,10 @@ export const createStreamSchema = streamSchemaBase;
 export const updateStreamSchema = streamSchemaBase
   .omit(['type'])
   .shape({
-    status: mixed<'active' | 'inactive' | 'provisioning'>()
-      .oneOf(['active', 'inactive', 'provisioning'])
+    status: mixed<
+      'active' | 'deactivating' | 'failed' | 'inactive' | 'provisioning'
+    >()
+      .oneOf(['active', 'deactivating', 'failed', 'inactive', 'provisioning'])
       .required(),
     details: lazy((value) => {
       if (