upcoming: [DPS-34879] - Delivery bugfixes after devcloud release

kagora-akamai · kagora-akamai · commit b0a27a796eeb · 2025-09-22T17:14:20.000+02:00
diff --git a/packages/api-v4/.changeset/pr-12898-upcoming-features-1758553903759.md b/packages/api-v4/.changeset/pr-12898-upcoming-features-1758553903759.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Logs Delivery Stream details type update ([#12898](https://github.com/linode/manager/pull/12898))
diff --git a/packages/api-v4/src/delivery/types.ts b/packages/api-v4/src/delivery/types.ts
@@ -21,7 +21,7 @@ export interface AuditData {
 
 export interface Stream extends AuditData {
   destinations: Destination[];
-  details: StreamDetails;
+  details: StreamDetailsType;
   id: number;
   label: string;
   primary_destination_id: number;
@@ -36,6 +36,8 @@ export interface StreamDetails {
   is_auto_add_all_clusters_enabled?: boolean;
 }
 
+export type StreamDetailsType = null | StreamDetails;
+
 export const destinationType = {
   CustomHttps: 'custom_https',
   LinodeObjectStorage: 'linode_object_storage',
@@ -103,18 +105,17 @@ interface CustomHeader {
 
 export interface CreateStreamPayload {
   destinations: number[];
-  details: StreamDetails;
+  details?: StreamDetailsType;
   label: string;
   status?: StreamStatus;
   type: StreamType;
 }
 
 export interface UpdateStreamPayload {
   destinations: number[];
-  details: StreamDetails;
+  details?: StreamDetailsType;
   label: string;
   status: StreamStatus;
-  type: StreamType;
 }
 
 export interface UpdateStreamPayloadWithId extends UpdateStreamPayload {
diff --git a/packages/manager/.changeset/pr-12898-upcoming-features-1758554025685.md b/packages/manager/.changeset/pr-12898-upcoming-features-1758554025685.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Logs Delivery fixes after devcloud release ([#12898](https://github.com/linode/manager/pull/12898))
diff --git a/packages/manager/src/factories/delivery.ts b/packages/manager/src/factories/delivery.ts
@@ -27,7 +27,7 @@ export const streamFactory = Factory.Sync.makeFactory<Stream>({
   destinations: Factory.each(() => [
     { ...destinationFactory.build(), id: 123 },
   ]),
-  details: {},
+  details: null,
   updated: '2025-07-30',
   updated_by: 'username',
   id: Factory.each((id) => id),
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
@@ -86,6 +86,9 @@ describe('StreamFormDelivery', () => {
             label: '',
             type: destinationType.LinodeObjectStorage,
           },
+          stream: {
+            destinations: [],
+          },
         },
       },
     });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
@@ -44,7 +44,11 @@ export const StreamFormDelivery = () => {
   const theme = useTheme();
   const { control, setValue, clearErrors } =
     useFormContext<StreamAndDestinationFormType>();
-  const { data: destinations, isLoading, error } = useAllDestinationsQuery();
+  const {
+    data: destinations,
+    isLoading,
+    error,
+  } = useAllDestinationsQuery({ page_size: 100 });
 
   const [creatingNewDestination, setCreatingNewDestination] =
     useState<boolean>(false);
@@ -67,11 +71,19 @@ export const StreamFormDelivery = () => {
     name: 'stream.destinations',
   });
 
-  const destinationNameFilterOptions = createFilterOptions<DestinationName>();
+  const destinationNameFilterOptions = createFilterOptions<DestinationName>({
+    stringify: (destination) => destination.label,
+  });
 
   const findDestination = (id: number) =>
     destinations?.data?.find((destination) => destination.id === id);
 
+  const restDestinationForm = () => {
+    Object.values(controlPaths).forEach((controlPath) =>
+      setValue(controlPath, '')
+    );
+  };
+
   const getDestinationForm = () => (
     <>
       <Controller
@@ -121,6 +133,10 @@ export const StreamFormDelivery = () => {
             onChange={(_, newValue) => {
               const id = newValue?.id;
 
+              if (id === undefined && selectedDestinations.length > 0) {
+                restDestinationForm();
+              }
+
               setValue('stream.destinations', id ? [id] : []);
               const selectedDestination = id ? findDestination(id) : undefined;
               if (selectedDestination) {
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
@@ -33,7 +33,8 @@ export const StreamCreate = () => {
     defaultValues: {
       stream: {
         type: streamType.AuditLogs,
-        details: {},
+        details: null,
+        destinations: [],
       },
       destination: {
         type: destinationType.LinodeObjectStorage,
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
@@ -25,7 +25,7 @@ export const StreamEdit = () => {
     data: destinations,
     isLoading: isLoadingDestinations,
     error: errorDestinations,
-  } = useAllDestinationsQuery();
+  } = useAllDestinationsQuery({ page_size: 100 });
   const {
     data: stream,
     isLoading: isLoadingStream,
@@ -51,7 +51,8 @@ export const StreamEdit = () => {
     defaultValues: {
       stream: {
         type: streamType.AuditLogs,
-        details: {},
+        details: null,
+        destinations: [],
       },
       destination: {
         type: destinationType.LinodeObjectStorage,
@@ -65,15 +66,14 @@ export const StreamEdit = () => {
   });
 
   useEffect(() => {
-    if (stream) {
-      const details =
-        Object.keys(stream.details).length > 0
-          ? {
-              is_auto_add_all_clusters_enabled: false,
-              cluster_ids: [],
-              ...stream.details,
-            }
-          : {};
+    if (stream && destinations) {
+      const details = stream.details
+        ? {
+            is_auto_add_all_clusters_enabled: false,
+            cluster_ids: [],
+            ...stream.details,
+          }
+        : null;
 
       const streamsDestinationIds = stream.destinations.map(({ id }) => id);
       form.reset({
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
@@ -119,7 +119,6 @@ export const StreamForm = (props: StreamFormProps) => {
         await updateStream({
           id: streamId,
           label,
-          type,
           status: status as StreamStatus,
           destinations: [destinationId],
           details: payloadDetails,
@@ -172,7 +171,7 @@ export const StreamForm = (props: StreamFormProps) => {
           <FormSubmitBar
             blockSubmit={!selectedDestinations?.length}
             connectionTested={destinationVerified}
-            destinationType={destination.type}
+            destinationType={destination?.type}
             formType={'stream'}
             isSubmitting={isSubmitting}
             isTesting={isVerifyingDestination}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
@@ -26,7 +26,7 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
     if (value === streamType.LKEAuditLogs) {
       setValue('stream.details.is_auto_add_all_clusters_enabled', false);
     } else {
-      setValue('stream.details', {});
+      setValue('stream.details', null);
     }
   };
 
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts b/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts
@@ -1,7 +1,11 @@
-import type { CreateStreamPayload } from '@linode/api-v4';
+import type { CreateStreamPayload, StreamDetailsType } from '@linode/api-v4';
 import type { DestinationFormType } from 'src/features/Delivery/Shared/types';
 
+export interface StreamFromType extends Omit<CreateStreamPayload, 'details'> {
+  details: StreamDetailsType;
+}
+
 export interface StreamAndDestinationFormType {
   destination: DestinationFormType;
-  stream: CreateStreamPayload;
+  stream: StreamFromType;
 }
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
@@ -159,8 +159,7 @@ describe('Streams Landing Table', () => {
           status: 'inactive',
           label: 'Stream 1',
           destinations: [123],
-          details: {},
-          type: 'audit_logs',
+          details: null,
         });
       });
     });
@@ -182,8 +181,7 @@ describe('Streams Landing Table', () => {
           status: 'active',
           label: 'Stream 1',
           destinations: [123],
-          details: {},
-          type: 'audit_logs',
+          details: null,
         });
       });
     });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
@@ -63,7 +63,7 @@ export const StreamsLanding = () => {
       label: { '+contains': search?.label },
     }),
     ...(search?.status !== undefined && {
-      status: { '+contains': search?.status },
+      status: search?.status,
     }),
   };
 
@@ -151,15 +151,13 @@ export const StreamsLanding = () => {
     destinations,
     details,
     label,
-    type,
     status,
   }: Stream) => {
     updateStream({
       id,
       destinations: destinations.map(({ id: destinationId }) => destinationId),
       details,
       label,
-      type,
       status:
         status === streamStatus.Active
           ? streamStatus.Inactive
diff --git a/packages/manager/src/features/Delivery/deliveryUtils.ts b/packages/manager/src/features/Delivery/deliveryUtils.ts
@@ -2,6 +2,8 @@ import {
   type Destination,
   isEmpty,
   type Stream,
+  type StreamDetailsType,
+  type StreamType,
   streamType,
 } from '@linode/api-v4';
 import { omitProps } from '@linode/ui';
@@ -11,7 +13,6 @@ import {
   streamTypeOptions,
 } from 'src/features/Delivery/Shared/types';
 
-import type { StreamDetails, StreamType } from '@linode/api-v4';
 import type {
   FormMode,
   LabelValueOption,
@@ -31,19 +32,21 @@ export const isFormInEditMode = (mode: FormMode) => mode === 'edit';
 
 export const getStreamPayloadDetails = (
   type: StreamType,
-  details: StreamDetails
-): StreamDetails => {
-  let payloadDetails: StreamDetails = {};
+  details: StreamDetailsType
+): StreamDetailsType => {
+  if (!details) {
+    return null;
+  }
 
   if (!isEmpty(details) && type === streamType.LKEAuditLogs) {
     if (details.is_auto_add_all_clusters_enabled) {
-      payloadDetails = omitProps(details, ['cluster_ids']);
+      return omitProps(details, ['cluster_ids']);
     } else {
-      payloadDetails = omitProps(details, ['is_auto_add_all_clusters_enabled']);
+      return omitProps(details, ['is_auto_add_all_clusters_enabled']);
     }
   }
 
-  return payloadDetails;
+  return null;
 };
 
 export const getStreamDescription = (stream: Stream) => {
diff --git a/packages/manager/src/mocks/presets/crud/handlers/delivery.ts b/packages/manager/src/mocks/presets/crud/handlers/delivery.ts
@@ -67,7 +67,7 @@ export const createStreams = (mockState: MockState) => [
         destinations: payload['destinations'].map((destinationId: number) =>
           destinations?.find(({ id }) => id === destinationId)
         ),
-        details: payload['details'],
+        details: payload['details'] ?? null,
         created: DateTime.now().toISO(),
         updated: DateTime.now().toISO(),
       });
diff --git a/packages/validation/.changeset/pr-12898-upcoming-features-1758553940234.md b/packages/validation/.changeset/pr-12898-upcoming-features-1758553940234.md
@@ -0,0 +1,5 @@
+---
+"@linode/validation": Upcoming Features
+---
+
+Logs Delivery Stream details validation update ([#12898](https://github.com/linode/manager/pull/12898))
diff --git a/packages/validation/src/delivery.schema.ts b/packages/validation/src/delivery.schema.ts
@@ -111,13 +111,13 @@ const streamDetailsSchema = streamDetailsBase.test(
   },
 );
 
-const detailsShouldBeEmpty = (schema: MixedSchema) =>
+const detailsShouldNotExistOrBeNull = (schema: MixedSchema) =>
   schema
-    .defined()
+    .nullable()
     .test(
-      'details-should-be-empty',
-      'Empty details for type `audit_logs`',
-      (value) => Object.keys(value).length === 0,
+      'details-should-not-exist',
+      'Details should be null or no details passed for type `audit_logs`',
+      (value, ctx) => !('details' in ctx) || value === null,
     );
 
 const streamSchemaBase = object({
@@ -130,33 +130,35 @@ const streamSchemaBase = object({
     .oneOf(['audit_logs', 'lke_audit_logs'])
     .required('Stream type is required.'),
   destinations: array().of(number().defined()).ensure().min(1).required(),
-  details: mixed<InferType<typeof streamDetailsSchema> | object>()
-    .when('type', {
-      is: 'lke_audit_logs',
-      then: () => streamDetailsSchema.required(),
-      otherwise: detailsShouldBeEmpty,
-    })
-    .required(),
+  details: mixed().when('type', {
+    is: 'lke_audit_logs',
+    then: () => streamDetailsSchema.required(),
+    otherwise: detailsShouldNotExistOrBeNull,
+  }),
 });
 
 export const createStreamSchema = streamSchemaBase;
 
-export const updateStreamSchema = streamSchemaBase.shape({
-  status: mixed<'active' | 'inactive'>()
-    .oneOf(['active', 'inactive'])
-    .required(),
-});
+export const updateStreamSchema = streamSchemaBase
+  .omit(['type'])
+  .shape({
+    status: mixed<'active' | 'inactive'>()
+      .oneOf(['active', 'inactive'])
+      .required(),
+  })
+  .noUnknown('Object contains unknown fields');
 
 export const streamAndDestinationFormSchema = object({
   stream: streamSchemaBase.shape({
     destinations: array().of(number().required()).required(),
-    details: mixed<InferType<typeof streamDetailsSchema> | object>()
-      .when('type', {
-        is: 'lke_audit_logs',
-        then: () => streamDetailsBase.required(),
-        otherwise: detailsShouldBeEmpty,
-      })
-      .required(),
+    details: mixed().when('type', {
+      is: 'lke_audit_logs',
+      then: () => streamDetailsBase.required(),
+      otherwise: (schema) =>
+        schema
+          .nullable()
+          .equals([null], 'Details must be null for audit_logs type'),
+    }) as Schema<InferType<typeof streamDetailsSchema> | null>,
   }),
   destination: destinationSchema.defined().when('stream.destinations', {
     is: (value: never[]) => !value?.length,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@linode/api-v4": Upcoming Features
 +---
++
 +Logs Delivery Stream details type update ([#12898](https://github.com/linode/manager/pull/12898))
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {`
`26`	`26`	`if (value === streamType.LKEAuditLogs) {`
`27`	`27`	`setValue('stream.details.is_auto_add_all_clusters_enabled', false);`
`28`	`28`	`} else {`
`29`		`- setValue('stream.details', {});`
	`29`	`+ setValue('stream.details', null);`
`30`	`30`	`}`
`31`	`31`	`};`
`32`	`32`