Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/api-v4/src/delivery/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export const streamStatus = {
Active: 'active',
Inactive: 'inactive',
Provisioning: 'provisioning',
} as const;

export type StreamStatus = (typeof streamStatus)[keyof typeof streamStatus];
Expand Down
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-13284-added-1768550251063.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Added
---

Logs Stream - Provisioning status ([#13284](https://github.com/linode/manager/pull/13284))
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ interface StreamFormSubmitBarProps {
mode: FormMode;
onSubmit: () => void;
onTestConnection: () => void;
submitButtonTooltip?: string;
}

export const FormSubmitBar = (props: StreamFormSubmitBarProps) => {
Expand All @@ -35,6 +36,7 @@ export const FormSubmitBar = (props: StreamFormSubmitBarProps) => {
isSubmitting,
isTesting,
disableTestConnection = false,
submitButtonTooltip,
} = props;

const capitalizedFormType = capitalize(formType);
Expand Down Expand Up @@ -108,6 +110,7 @@ export const FormSubmitBar = (props: StreamFormSubmitBarProps) => {
alignSelf: 'flex-end',
},
})}
tooltipText={submitButtonTooltip}
>
{buttonLabel}
</Button>
Expand Down
5 changes: 5 additions & 0 deletions packages/manager/src/features/Delivery/Shared/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ export const streamStatusOptions: AutocompleteOption[] = [
label: 'Inactive',
pendoId: 'Logs Delivery Streams-Status Inactive',
},
{
value: streamStatus.Provisioning,
label: 'Provisioning',
pendoId: 'Logs Delivery Streams-Status Provisioning',
},
];

export type DestinationDetailsForm =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const StreamActionMenu = (props: StreamActionMenuProps) => {
},
title: stream.status === streamStatus.Active ? 'Deactivate' : 'Activate',
pendoId: `Logs Delivery Streams-${stream.status === streamStatus.Active ? 'Deactivate' : 'Activate'}`,
disabled: stream.status === streamStatus.Provisioning,
},
{
onClick: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,48 @@
expect(editStreamSpy).toHaveBeenCalled();
});
});

describe('and stream has status: provisioning', () => {

Check warning on line 228 in packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx

View workflow job for this annotation

GitHub Actions / ESLint Review (manager)

[eslint] reported by reviewdog 🐢 Refactor this code to not nest functions more than 4 levels deep. Raw Output: {"ruleId":"sonarjs/no-nested-functions","severity":1,"message":"Refactor this code to not nest functions more than 4 levels deep.","line":228,"column":62,"nodeType":null,"endLine":228,"endColumn":64}
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 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();

Check warning on line 259 in packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx

View workflow job for this annotation

GitHub Actions / ESLint Review (manager)

[eslint] reported by reviewdog 🐢 Don't wrap `getBy*` query with `expect` & presence matchers like `toBeInTheDocument` or `not.toBeNull` as `getBy*` queries fail implicitly when element is not found Raw Output: {"ruleId":"testing-library/prefer-implicit-assert","severity":1,"message":"Don't wrap `getBy*` query with `expect` & presence matchers like `toBeInTheDocument` or `not.toBeNull` as `getBy*` queries fail implicitly when element is not found","line":259,"column":24,"nodeType":"MemberExpression","messageId":"preferImplicitAssert","endLine":259,"endColumn":40}
});

const disabledButtonTooltip = screen.getByText(
'You cannot save changes while the stream is provisioning.'
);

expect(disabledButtonTooltip).toBeInTheDocument();
});
});
});
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
type CreateDestinationPayload,
streamStatus,
type StreamStatus,
streamType,
} from '@linode/api-v4';
Expand All @@ -14,7 +15,7 @@ import Grid from '@mui/material/Grid';
import { useNavigate } from '@tanstack/react-router';
import { enqueueSnackbar } from 'notistack';
import * as React from 'react';
import { useEffect, useState } from 'react';
import { useEffect, useMemo, useState } from 'react';
import { type SubmitHandler, useFormContext, useWatch } from 'react-hook-form';

import {
Expand Down Expand Up @@ -72,6 +73,18 @@ export const StreamForm = (props: StreamFormProps) => {
name: 'destination',
});

const selectedStreamStatus = useWatch({
control,
name: 'stream.status',
});
const submitButtonTooltip = useMemo(
() =>
selectedStreamStatus === streamStatus.Provisioning
? 'You cannot save changes while the stream is provisioning.'
: undefined,
[selectedStreamStatus]
);

useEffect(() => {
setDestinationVerified(false);
}, [destination, setDestinationVerified]);
Expand Down Expand Up @@ -194,7 +207,10 @@ export const StreamForm = (props: StreamFormProps) => {
</Grid>
<Grid size={{ lg: 3, md: 12, sm: 12, xs: 12 }}>
<FormSubmitBar
blockSubmit={!selectedDestinations?.length}
blockSubmit={
selectedStreamStatus === streamStatus.Provisioning ||
!selectedDestinations?.length
}
connectionTested={destinationVerified}
destinationType={destination?.type}
disableTestConnection={disableTestConnection}
Expand All @@ -206,6 +222,7 @@ export const StreamForm = (props: StreamFormProps) => {
scrollErrorIntoViewV2(formRef)
)}
onTestConnection={handleTestConnection}
submitButtonTooltip={submitButtonTooltip}
/>
</Grid>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { LinkWithTooltipAndEllipsis } from 'src/features/Delivery/Shared/LinkWit
import { StreamActionMenu } from 'src/features/Delivery/Streams/StreamActionMenu';

import type { Stream, StreamStatus } from '@linode/api-v4';
import type { Status } from 'src/components/StatusIcon/StatusIcon';
import type { StreamHandlers } from 'src/features/Delivery/Streams/StreamActionMenu';

interface StreamTableRowProps extends StreamHandlers {
Expand All @@ -22,6 +23,9 @@ 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;

return (
<TableRow key={id}>
Expand All @@ -35,7 +39,7 @@ export const StreamTableRow = React.memo((props: StreamTableRowProps) => {
</TableCell>
<TableCell>{getStreamTypeOption(stream.type)?.label}</TableCell>
<TableCell statusCell>
<StatusIcon status={status} />
<StatusIcon pulse={false} status={iconStatus} />
{humanizeStreamStatus(status)}
</TableCell>
<TableCell>{id}</TableCell>
Expand Down Expand Up @@ -70,6 +74,8 @@ const humanizeStreamStatus = (status: StreamStatus) => {
return 'Active';
case 'inactive':
return 'Inactive';
case 'provisioning':
return 'Provisioning';
default:
return 'Unknown';
}
Expand Down
10 changes: 7 additions & 3 deletions packages/validation/src/delivery.schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,11 @@ 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'>().oneOf(['active', 'inactive']),
status: mixed<'active' | 'inactive' | 'provisioning'>().oneOf([
'active',
'inactive',
'provisioning',
]),
type: string()
.oneOf(['audit_logs', 'lke_audit_logs'])
.required('Stream type is required.'),
Expand All @@ -229,8 +233,8 @@ export const createStreamSchema = streamSchemaBase;
export const updateStreamSchema = streamSchemaBase
.omit(['type'])
.shape({
status: mixed<'active' | 'inactive'>()
.oneOf(['active', 'inactive'])
status: mixed<'active' | 'inactive' | 'provisioning'>()
.oneOf(['active', 'inactive', 'provisioning'])
.required(),
details: lazy((value) => {
if (
Expand Down