regression: add missing check for 'all' in app logs export (#36485)

Author: MartinSchoeler

apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx

@@ -44,8 +44,13 @@ export const AppLogsFilter = ({ appId, expandAll, refetchLogs, isLoading, noResu
 	const refreshLogs = () => {
 		refetchLogs();
 	};
+
+	const onExportConfirm = (url: string) => {
+		window.open(url, '_blank', 'noopener noreferrer');
+	};
+
 	const openExportModal = () => {
-		setModal(<ExportLogsModal onClose={() => setModal(null)} filterValues={getValues()} />);
+		setModal(<ExportLogsModal onClose={() => setModal(null)} filterValues={getValues()} onConfirm={onExportConfirm} />);
 	};
 
 	const compactMode = useCompactMode();

apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/ExportLogsModal.spec.tsx

@@ -1,11 +1,14 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { composeStories } from '@storybook/react';
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { axe } from 'jest-axe';
 
 import * as stories from './ExportLogsModal.stories';
 
 const testCases = Object.values(composeStories(stories)).map((Story) => [Story.storyName || 'Story', Story]);
+const onConfirm = jest.fn();
+const { Default } = composeStories(stories);
 
 test.each(testCases)(`renders without crashing`, async (_storyname, Story) => {
 	const view = render(<Story />, {
@@ -21,3 +24,14 @@ test.each(testCases)('Should have no a11y violations', async (_storyname, Story)
 
 	expect(results).toHaveNoViolations();
 });
+
+it('should send the correct payload to the endpoint', async () => {
+	render(<Default onConfirm={onConfirm} />, {
+		wrapper: mockAppRoot().build(),
+	});
+
+	expect(screen.getByRole('button', { name: 'Download' })).toBeInTheDocument();
+	await userEvent.click(screen.getByRole('button', { name: 'Download' }));
+	expect(onConfirm).toHaveBeenCalledTimes(1);
+	expect(onConfirm).toHaveBeenCalledWith('/api/apps/undefined/export-logs?count=2000&type=json');
+});

apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/ExportLogsModal.stories.tsx

@@ -18,6 +18,7 @@ export default {
 			startDate: '',
 			endDate: '',
 		},
+		onConfirm: () => action('onConfirm'),
 	},
 	decorators: [
 		mockAppRoot().buildStoryDecorator(),

apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/ExportLogsModal.tsx

@@ -24,6 +24,7 @@ import type { AppLogsFilterFormData } from '../useAppLogsFilterForm';
 type ExportLogsModalProps = {
 	onClose: () => void;
 	filterValues: AppLogsFilterFormData;
+	onConfirm: (url: string) => void;
 };
 
 type FormDataType = {
@@ -32,7 +33,7 @@ type FormDataType = {
 	customExportAmount: number;
 };
 
-export const ExportLogsModal = ({ onClose, filterValues }: ExportLogsModalProps) => {
+export const ExportLogsModal = ({ onClose, filterValues, onConfirm }: ExportLogsModalProps) => {
 	const { t } = useTranslation();
 
 	const appId = useRouteParameter('id');
@@ -67,7 +68,7 @@ export const ExportLogsModal = ({ onClose, filterValues }: ExportLogsModalProps)
 		if (severity && severity !== 'all') {
 			baseUrl += `logLevel=${severity}&`;
 		}
-		if (event) {
+		if (event && event !== 'all') {
 			baseUrl += `method=${event}&`;
 		}
 		if (startDate) {
@@ -85,7 +86,7 @@ export const ExportLogsModal = ({ onClose, filterValues }: ExportLogsModalProps)
 
 	const handleConfirm = (): void => {
 		const url = getFileUrl({ ...filterValues, type, count: count === 'max' ? 2000 : getValues('customExportAmount') });
-		window.open(url, '_blank', 'noopener noreferrer');
+		onConfirm(url);
 		onClose();
 	};