Merge branch 'develop' into feat/openapi-oauth-apps-list

ahmed-n-abdeltwab · web-flow · commit 288a340fa7d3 · 2025-08-01T06:23:21.000+03:00
diff --git a/.changeset/pretty-geckos-lick.md b/.changeset/pretty-geckos-lick.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes an issue that caused some types of messages to generate an empty thread preview
diff --git a/.changeset/seven-gorillas-sell.md b/.changeset/seven-gorillas-sell.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes order on featured room header actions
diff --git a/.changeset/soft-suns-sip.md b/.changeset/soft-suns-sip.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Adds a "Collapse All" button to the Apps Logs Filter and moves existing "Expand All" button to a kebab menu
diff --git a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.spec.tsx b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.spec.tsx
@@ -0,0 +1,87 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { composeStories } from '@storybook/react';
+import { render, screen } from '@testing-library/react';
+import { axe } from 'jest-axe';
+
+import * as stories from './ThreadMessagePreviewBody.stories';
+
+const { Default } = composeStories(stories);
+
+const testCases = Object.values(composeStories(stories)).map((Story) => [Story.storyName || 'Story', Story]);
+
+jest.mock('../../../../lib/utils/fireGlobalEvent', () => ({
+	fireGlobalEvent: jest.fn(),
+}));
+
+jest.mock('../../../../views/room/hooks/useGoToRoom', () => ({
+	useGoToRoom: jest.fn(),
+}));
+
+test.each(testCases)(`renders ThreadMessagePreviewBody without crashing`, async (_storyname, Story) => {
+	const view = render(<Story />, { wrapper: mockAppRoot().build() });
+
+	expect(view.baseElement).toMatchSnapshot();
+});
+
+test.each(testCases)('ThreadMessagePreviewBody should have no a11y violations', async (_storyname, Story) => {
+	const { container } = render(<Story />, { wrapper: mockAppRoot().build() });
+
+	const results = await axe(container);
+
+	expect(results).toHaveNoViolations();
+});
+
+it('should not show an empty thread preview', async () => {
+	const { container } = render(
+		<Default
+			message={{
+				_id: 'message-id',
+				ts: new Date(),
+				msg: 'http://localhost:3000/group/ds?msg=ZoX9pDowqNb4BiWxf',
+				md: [
+					{
+						type: 'PARAGRAPH',
+						value: [
+							{
+								type: 'PLAIN_TEXT',
+								value: 'message attachment text quote',
+							},
+						],
+					},
+				],
+				attachments: [
+					{
+						text: 'message attachment text quote',
+						md: [
+							{
+								type: 'PARAGRAPH',
+								value: [
+									{
+										type: 'PLAIN_TEXT',
+										value: 'message attachment text quote',
+									},
+								],
+							},
+						],
+						message_link: 'http://localhost:3000/group/ds?msg=ZoX9pDowqNb4BiWxf',
+						author_name: 'b',
+						author_icon: '/avatar/b',
+						attachments: [],
+						ts: new Date('2025-07-24T18:05:45.339Z'),
+					},
+				],
+				u: {
+					_id: 'user-id',
+					username: 'username',
+				},
+				rid: 'room-id',
+				_updatedAt: new Date(),
+			}}
+		/>,
+		{ wrapper: mockAppRoot().build() },
+	);
+	expect(container).toMatchSnapshot();
+	const text = screen.getByText('http://localhost:3000/group/ds?msg=ZoX9pDowqNb4BiWxf');
+
+	expect(text).toBeInTheDocument;
+});
diff --git a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.stories.tsx b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.stories.tsx
@@ -0,0 +1,29 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import type { Meta, StoryFn } from '@storybook/react';
+import type { ComponentProps } from 'react';
+
+import ThreadMessagePreviewBody from './ThreadMessagePreviewBody';
+
+export default {
+	title: 'Components/ThreadMessagePreviewBody',
+	component: ThreadMessagePreviewBody,
+	parameters: {
+		layout: 'fullscreen',
+	},
+	decorators: [mockAppRoot().withSetting('UI_Use_Real_Name', true).withJohnDoe().buildStoryDecorator()],
+	args: {
+		message: {
+			_id: 'message-id',
+			ts: new Date(),
+			msg: 'This is a message',
+			u: {
+				_id: 'user-id',
+				username: 'username',
+			},
+			rid: 'room-id',
+			_updatedAt: new Date(),
+		},
+	},
+} satisfies Meta<typeof ThreadMessagePreviewBody>;
+
+export const Default: StoryFn<ComponentProps<typeof ThreadMessagePreviewBody>> = (args) => <ThreadMessagePreviewBody {...args} />;
diff --git a/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx b/apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx
@@ -30,7 +30,7 @@ const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): R
 			return <>{t('Message_with_attachment')}</>;
 		}
 		if (!isEncryptedMessage || message.e2e === 'done') {
-			return mdTokens ? (
+			return mdTokens?.length ? (
 				<GazzodownText>
 					<PreviewMarkup tokens={mdTokens} />
 				</GazzodownText>
diff --git a/apps/meteor/client/components/message/variants/threadPreview/__snapshots__/ThreadMessagePreviewBody.spec.tsx.snap b/apps/meteor/client/components/message/variants/threadPreview/__snapshots__/ThreadMessagePreviewBody.spec.tsx.snap
@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`renders ThreadMessagePreviewBody without crashing 1`] = `
+<body>
+  <div>
+    This is a message
+  </div>
+</body>
+`;
+
+exports[`should not show an empty thread preview 1`] = `
+<div>
+  http://localhost:3000/group/ds?msg=ZoX9pDowqNb4BiWxf
+</div>
+`;
diff --git a/apps/meteor/client/hooks/roomActions/useAppsRoomStarActions.tsx b/apps/meteor/client/hooks/roomActions/useAppsRoomStarActions.tsx
@@ -24,7 +24,6 @@ export const useAppsRoomStarActions = () => {
 		if (!result.data) {
 			return undefined;
 		}
-
 		const filteredActions = result.data.filter(applyButtonFilters);
 
 		if (filteredActions.length === 0) {
@@ -37,6 +36,7 @@ export const useAppsRoomStarActions = () => {
 			icon: 'stars',
 			groups: ['group', 'channel', 'live', 'team', 'direct', 'direct_multiple'],
 			featured: true,
+			order: 3,
 			renderToolboxItem: ({ id, icon, title, disabled, className }) => (
 				<GenericMenu
 					button={<HeaderToolbarAction />}
diff --git a/apps/meteor/client/hooks/roomActions/useVideoCallRoomAction.tsx b/apps/meteor/client/hooks/roomActions/useVideoCallRoomAction.tsx
@@ -77,7 +77,7 @@ export const useVideoCallRoomAction = () => {
 			icon: 'video',
 			featured: true,
 			action: handleOpenVideoConf,
-			order: -1,
+			order: 1,
 			groups,
 			disabled,
 			tooltip,
diff --git a/apps/meteor/client/hooks/roomActions/useVoiceCallRoomAction.tsx b/apps/meteor/client/hooks/roomActions/useVoiceCallRoomAction.tsx
@@ -65,6 +65,7 @@ export const useVoiceCallRoomAction = () => {
 			featured: true,
 			action: handleOnClick,
 			groups: ['direct'] as const,
+			order: 2,
 			disabled,
 			tooltip,
 		};
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
@@ -16,7 +16,11 @@ import { useLogs } from '../../../hooks/useLogs';
 
 function expandedReducer(
 	expandedStates: { id: string; expanded: boolean }[],
-	action: { type: 'update'; id: string; expanded: boolean } | { type: 'expand-all' } | { type: 'reset'; logs: ILogItem[] },
+	action:
+		| { type: 'update'; id: string; expanded: boolean }
+		| { type: 'expand-all' }
+		| { type: 'reset-all' }
+		| { type: 'reset'; logs: ILogItem[] },
 ) {
 	switch (action.type) {
 		case 'update':
@@ -28,6 +32,9 @@ function expandedReducer(
 		case 'reset':
 			return action.logs.map((log) => ({ id: log._id, expanded: false }));
 
+		case 'reset-all':
+			return expandedStates.map((state) => ({ ...state, expanded: false }));
+
 		default:
 			return expandedStates;
 	}
@@ -48,6 +55,8 @@ const AppLogs = ({ id }: { id: string }): ReactElement => {
 
 	const handleExpandAll = () => dispatch({ type: 'expand-all' });
 
+	const handleCollapseAll = () => dispatch({ type: 'reset-all' });
+
 	const { data, isSuccess, isError, error, refetch, isFetching } = useLogs({
 		appId: id,
 		current,
@@ -84,6 +93,7 @@ const AppLogs = ({ id }: { id: string }): ReactElement => {
 					noResults={isFetching || !isSuccess || data?.logs?.length === 0}
 					isLoading={isFetching}
 					expandAll={() => handleExpandAll()}
+					collapseAll={() => handleCollapseAll()}
 					refetchLogs={() => refetch()}
 				/>
 			</Box>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.stories.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.stories.tsx
@@ -35,5 +35,11 @@ export default {
 } satisfies Meta<typeof AppLogsFilter>;
 
 export const Default = () => (
-	<AppLogsFilter appId='app-id' expandAll={action('expandAll')} refetchLogs={action('refetchLogs')} isLoading={false} />
+	<AppLogsFilter
+		appId='app-id'
+		expandAll={action('expandAll')}
+		collapseAll={action('collapseAll')}
+		refetchLogs={action('refetchLogs')}
+		isLoading={false}
+	/>
 );
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx
@@ -3,6 +3,7 @@ import { useRouter, useSetModal } from '@rocket.chat/ui-contexts';
 import { Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import AppsLogsFilterOptions from './AppLogsFilterOptions';
 import CompactFilterOptions from './CompactFilterOptions';
 import { EventFilterSelect } from './EventFilterSelect';
 import { InstanceFilterSelect } from './InstanceFilterSelect';
@@ -15,12 +16,13 @@ import { ExportLogsModal } from './ExportLogsModal';
 type AppsLogsFilterProps = {
 	appId: string;
 	expandAll: () => void;
+	collapseAll: () => void;
 	refetchLogs: () => void;
 	isLoading: boolean;
 	noResults?: boolean;
 };
 
-export const AppLogsFilter = ({ appId, expandAll, refetchLogs, isLoading, noResults = false }: AppsLogsFilterProps) => {
+export const AppLogsFilter = ({ appId, expandAll, collapseAll, refetchLogs, isLoading, noResults = false }: AppsLogsFilterProps) => {
 	const { t } = useTranslation();
 
 	const { control, getValues } = useAppLogsFilterFormContext();
@@ -95,11 +97,6 @@ export const AppLogsFilter = ({ appId, expandAll, refetchLogs, isLoading, noResu
 					<Controller control={control} name='severity' render={({ field }) => <SeverityFilterSelect id='severityFilter' {...field} />} />
 				</Box>
 			)}
-			{!compactMode && (
-				<Button alignSelf='flex-end' icon='arrow-expand' secondary mie={10} onClick={() => openAllLogs()}>
-					{t('Expand_all')}
-				</Button>
-			)}
 			{!compactMode && (
 				<IconButton
 					title={isLoading ? t('Loading') : t('Refresh_logs')}
@@ -129,8 +126,15 @@ export const AppLogsFilter = ({ appId, expandAll, refetchLogs, isLoading, noResu
 					{t('Filters')}
 				</Button>
 			)}
+			{!compactMode && <AppsLogsFilterOptions onExpandAll={openAllLogs} onCollapseAll={collapseAll} />}
 			{compactMode && (
-				<CompactFilterOptions isLoading={isLoading} onExportLogs={openExportModal} onExpandAll={openAllLogs} onRefreshLogs={refreshLogs} />
+				<CompactFilterOptions
+					isLoading={isLoading}
+					onExportLogs={openExportModal}
+					onExpandAll={openAllLogs}
+					onCollapseAll={collapseAll}
+					onRefreshLogs={refreshLogs}
+				/>
 			)}
 		</Box>
 	);
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterOptions.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterOptions.tsx
@@ -0,0 +1,35 @@
+import { Box, Icon, Menu } from '@rocket.chat/fuselage';
+import { useTranslation } from 'react-i18next';
+
+type AppsLogsFilterOptionsProps = {
+	onExpandAll: () => void;
+	onCollapseAll: () => void;
+};
+
+const AppsLogsFilterOptions = ({ onExpandAll, onCollapseAll, ...props }: AppsLogsFilterOptionsProps) => {
+	const { t } = useTranslation();
+
+	const menuOptions = {
+		expandAll: {
+			label: (
+				<Box>
+					<Icon name='arrow-expand' size='x16' marginInlineEnd={4} />
+					{t('Expand_all')}
+				</Box>
+			),
+			action: onExpandAll,
+		},
+		collapseAll: {
+			label: (
+				<Box>
+					<Icon name='arrow-collapse' size='x16' marginInlineEnd={4} />
+					{t('Collapse_all')}
+				</Box>
+			),
+			action: onCollapseAll,
+		},
+	};
+	return <Menu title={t('Options')} small={false} alignSelf='flex-end' options={menuOptions} {...props} />;
+};
+
+export default AppsLogsFilterOptions;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/CompactFilterOptions.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/CompactFilterOptions.tsx
@@ -3,12 +3,20 @@ import { useTranslation } from 'react-i18next';
 
 type CompactFilterOptionsProps = {
 	onExpandAll: () => void;
+	onCollapseAll: () => void;
 	onRefreshLogs: () => void;
 	onExportLogs: () => void;
 	isLoading: boolean;
 };
 
-const CompactFilterOptions = ({ onExportLogs, onExpandAll, onRefreshLogs, isLoading, ...props }: CompactFilterOptionsProps) => {
+const CompactFilterOptions = ({
+	onExportLogs,
+	onExpandAll,
+	onCollapseAll,
+	onRefreshLogs,
+	isLoading,
+	...props
+}: CompactFilterOptionsProps) => {
 	const { t } = useTranslation();
 
 	const menuOptions = {
@@ -30,6 +38,15 @@ const CompactFilterOptions = ({ onExportLogs, onExpandAll, onRefreshLogs, isLoad
 			),
 			action: onExpandAll,
 		},
+		collapseAll: {
+			label: (
+				<Box>
+					<Icon name='arrow-collapse' size='x16' marginInlineEnd={4} />
+					{t('Collapse_all')}
+				</Box>
+			),
+			action: onCollapseAll,
+		},
 		refreshLogs: {
 			label: (
 				<Box>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@rocket.chat/meteor": patch
 +---
++
 +Fixes an issue that caused some types of messages to generate an empty thread preview
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): R`
`30`	`30`	`return <>{t('Message_with_attachment')}</>;`
`31`	`31`	`}`
`32`	`32`	`if (!isEncryptedMessage \|\| message.e2e === 'done') {`
`33`		`- return mdTokens ? (`
	`33`	`+ return mdTokens?.length ? (`
`34`	`34`	`<GazzodownText>`
`35`	`35`	`<PreviewMarkup tokens={mdTokens} />`
`36`	`36`	`</GazzodownText>`