Merge branch 'develop' into fix/CORE-217/fixing-room-search-filter-persistence

Author: AllanPazRibeiro

.changeset/clever-guests-invent.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue that forces the focus on the last message when interacting by mouse on message list

.changeset/eleven-seas-explain.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/livechat": patch
+---
+
+Fixes the livechat client ignoring the `livechat_fileuploads_enabled` setting when uploading files

.changeset/fair-peaches-cough.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed an issue where mentioning a team would trigger the bot message warning that the team is not a part of the channel

.changeset/lemon-schools-double.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/eslint-config': minor
+---
+
+Adds eslint-plugin-jsx-a11y plugin to eslint react config

.changeset/nice-hounds-enjoy.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue where Rocket.Chat would ask admins to confirm fingerprint change (new workspace vs configuration update), even when `AUTO_ACCEPT_FINGERPRINT` environment variable set to `"true"`.

.changeset/shaggy-yaks-train.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed supported versions not being updated in airgapped environments

.changeset/sharp-yaks-turn.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+This PR have made enhancements to the select and multiselect inputs related to Omnichannel Departments, now the options properly display the complete department names, ensuring clarity for users and added text wrapping for long department names, enhancing readability and UX.

.changeset/soft-shrimps-beg.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Added "Enable Users" option under "Sync User Active State" LDAP setting to allow only re-enabling users found on LDAP background sync

.changeset/swift-readers-speak.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where message reactions are vertically misaligned when zooming out

.changeset/thin-peaches-own.md

@@ -1,6 +1,6 @@
+import { applyLicense } from '@rocket.chat/license';
 import { Settings } from '@rocket.chat/models';
 
-import { applyLicense } from '../../../../ee/app/license/server/applyLicense';
 import { settings } from '../../../settings/server';
 import { syncCloudData } from './syncWorkspace/syncCloudData';
 

apps/meteor/app/cloud/server/functions/saveRegistrationData.ts

@@ -13,9 +13,9 @@ import { syncCloudData } from './syncCloudData';
  */
 export async function syncWorkspace() {
 	try {
+		await getCachedSupportedVersionsToken.reset();
 		await announcementSync();
 		await syncCloudData();
-		await getCachedSupportedVersionsToken.reset();
 	} catch (err) {
 		switch (true) {
 			case err instanceof CloudWorkspaceRegistrationError:
@@ -33,8 +33,8 @@ export async function syncWorkspace() {
 					function: 'syncCloudData',
 				});
 				try {
-					await legacySyncWorkspace();
 					await getCachedSupportedVersionsToken.reset();
+					await legacySyncWorkspace();
 				} catch (err) {
 					switch (true) {
 						case err instanceof CloudWorkspaceRegistrationError:

apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts

@@ -4,6 +4,7 @@ import { Subscriptions } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
+import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 import { getDefaultChannels } from './getDefaultChannels';
 
 export const addUserToDefaultChannels = async function (user: IUser, silenced?: boolean): Promise<void> {
@@ -23,6 +24,7 @@ export const addUserToDefaultChannels = async function (user: IUser, silenced?:
 				groupMentions: 0,
 				...(room.favorite && { f: true }),
 				...autoTranslateConfig,
+				...getDefaultSubscriptionPref(user),
 			});
 
 			// Insert user joined message

apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts

@@ -9,6 +9,7 @@ import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
 import { callbacks } from '../../../../lib/callbacks';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
 import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
+import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 
 export const addUserToRoom = async function (
 	rid: string,
@@ -81,6 +82,7 @@ export const addUserToRoom = async function (
 		userMentions: 1,
 		groupMentions: 0,
 		...autoTranslateConfig,
+		...getDefaultSubscriptionPref(userToBeAdded as IUser),
 	});
 
 	if (!userToBeAdded.username) {

apps/meteor/app/lib/server/functions/addUserToRoom.ts

@@ -10,6 +10,7 @@ import { Meteor } from 'meteor/meteor';
 import { callbacks } from '../../../../lib/callbacks';
 import { beforeCreateRoomCallback } from '../../../../lib/callbacks/beforeCreateRoomCallback';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
+import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 import { getValidRoomName } from '../../../utils/server/lib/getValidRoomName';
 import { createDirectRoom } from './createDirectRoom';
 
@@ -36,14 +37,14 @@ async function createUsersSubscriptions({
 	options?: ICreateRoomParams['options'];
 }) {
 	if (shouldBeHandledByFederation) {
-		const extra: Partial<ISubscriptionExtraData> = options?.subscriptionExtra || {};
-		extra.open = true;
-		extra.ls = now;
-		extra.roles = ['owner'];
-
-		if (room.prid) {
-			extra.prid = room.prid;
-		}
+		const extra: Partial<ISubscriptionExtraData> = {
+			...options?.subscriptionExtra,
+			open: true,
+			ls: now,
+			roles: ['owner'],
+			...(room.prid && { prid: room.prid }),
+			...getDefaultSubscriptionPref(owner),
+		};
 
 		await Subscriptions.createWithRoomAndUser(room, owner, extra);
 

apps/meteor/app/lib/server/functions/createRoom.ts

@@ -62,7 +62,7 @@ callbacks.add(
 			return message;
 		}
 
-		const mentions = message.mentions.filter(({ _id }) => _id !== 'all' && _id !== 'here');
+		const mentions = message.mentions.filter(({ _id, type }) => _id !== 'all' && _id !== 'here' && type !== 'team');
 		if (!mentions.length) {
 			return message;
 		}

apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts

@@ -14,6 +14,14 @@ API.v1.addRoute('livechat/upload/:rid', {
 			return API.v1.unauthorized();
 		}
 
+		const canUpload = settings.get<boolean>('Livechat_fileupload_enabled') && settings.get<boolean>('FileUpload_Enabled');
+
+		if (!canUpload) {
+			return API.v1.failure({
+				reason: 'error-file-upload-disabled',
+			});
+		}
+
 		const visitorToken = this.request.headers['x-visitor-token'];
 		const visitor = await LivechatVisitors.getVisitorByToken(visitorToken as string, {});
 

apps/meteor/app/livechat/imports/server/rest/upload.ts

@@ -1,29 +1,15 @@
 import { log } from 'console';
 
 import { Analytics } from '@rocket.chat/core-services';
+import type { IStats } from '@rocket.chat/core-typings';
 import { License } from '@rocket.chat/license';
 import { CannedResponse, OmnichannelServiceLevelAgreements, LivechatRooms, LivechatTag, LivechatUnit, Users } from '@rocket.chat/models';
 
-type ENTERPRISE_STATISTICS = GenericStats & Partial<EEOnlyStats>;
-
-type GenericStats = {
-	modules: string[];
-	tags: string[];
-	seatRequests: number;
-};
-
-type EEOnlyStats = {
-	livechatTags: number;
-	cannedResponses: number;
-	priorities: number;
-	slas: number;
-	businessUnits: number;
-	omnichannelPdfTranscriptRequested: number;
-	omnichannelPdfTranscriptSucceeded: number;
-	omnichannelRoomsWithSlas: number;
-	omnichannelRoomsWithPriorities: number;
-	livechatMonitors: number;
-};
+type ENTERPRISE_STATISTICS = IStats['enterprise'];
+
+type GenericStats = Pick<ENTERPRISE_STATISTICS, 'modules' | 'tags' | 'seatRequests'>;
+
+type EEOnlyStats = Omit<ENTERPRISE_STATISTICS, keyof GenericStats>;
 
 export async function getStatistics(): Promise<ENTERPRISE_STATISTICS> {
 	const genericStats: GenericStats = {
@@ -42,7 +28,6 @@ export async function getStatistics(): Promise<ENTERPRISE_STATISTICS> {
 	return statistics;
 }
 
-// These models are only available on EE license so don't import them inside CE license as it will break the build
 async function getEEStatistics(): Promise<EEOnlyStats | undefined> {
 	if (!License.hasModule('livechat-enterprise')) {
 		return;

apps/meteor/ee/app/license/server/getStatistics.ts apps/meteor/app/statistics/server/lib/getEEStatistics.ts

@@ -29,7 +29,6 @@ import {
 import { MongoInternals } from 'meteor/mongo';
 import moment from 'moment';
 
-import { getStatistics as getEnterpriseStatistics } from '../../../../ee/app/license/server/getStatistics';
 import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
 import { isRunningMs } from '../../../../server/lib/isRunningMs';
 import { getControl } from '../../../../server/lib/migrations';
@@ -40,6 +39,7 @@ import { settings } from '../../../settings/server';
 import { Info } from '../../../utils/rocketchat.info';
 import { getMongoInfo } from '../../../utils/server/functions/getMongoInfo';
 import { getAppsStatistics } from './getAppsStatistics';
+import { getStatistics as getEnterpriseStatistics } from './getEEStatistics';
 import { getImporterStatistics } from './getImporterStatistics';
 import { getServicesStatistics } from './getServicesStatistics';
 

apps/meteor/app/statistics/server/lib/statistics.ts

@@ -51,8 +51,8 @@ const AutoCompleteDepartment = ({
 
 	return (
 		<PaginatedSelectFiltered
-			{...props}
 			withTitle
+			{...props}
 			value={value}
 			onChange={onChange}
 			filter={departmentsFilter}

apps/meteor/client/components/AutoCompleteDepartment.tsx

@@ -1,4 +1,4 @@
-import { PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
+import { Option, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
 import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
@@ -65,6 +65,7 @@ const AutoCompleteDepartmentMultiple = ({
 							return loadMoreDepartments(start, Math.min(50, departmentsTotal));
 					  }
 			}
+			renderItem={({ label, ...props }) => <Option {...props} label={<span style={{ whiteSpace: 'normal' }}>{label}</span>} />}
 		/>
 	);
 };

apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx

@@ -1,14 +1,14 @@
 import { Box, Icon, TextInput, Button, Margins } from '@rocket.chat/fuselage';
+import { useAutoFocus, useMergedRefs } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import type { ReactNode, ChangeEvent, FormEvent, ReactElement } from 'react';
-import React, { memo, useCallback, useEffect, useState } from 'react';
+import type { ReactNode, ChangeEvent, FormEvent } from 'react';
+import React, { forwardRef, memo, useCallback, useEffect, useState } from 'react';
 
 type FilterByTextCommonProps = {
 	children?: ReactNode | undefined;
 	placeholder?: string;
-	inputRef?: () => void;
 	onChange: (filter: { text: string }) => void;
-	autoFocus?: boolean;
+	shouldAutoFocus?: boolean;
 };
 
 type FilterByTextPropsWithButton = FilterByTextCommonProps & {
@@ -22,10 +22,14 @@ type FilterByTextProps = FilterByTextCommonProps | FilterByTextPropsWithButton;
 const isFilterByTextPropsWithButton = (props: any): props is FilterByTextPropsWithButton =>
 	'displayButton' in props && props.displayButton === true;
 
-const FilterByText = ({ placeholder, onChange: setFilter, inputRef, children, autoFocus, ...props }: FilterByTextProps): ReactElement => {
+const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function FilterByText(
+	{ placeholder, onChange: setFilter, shouldAutoFocus, children, ...props },
+	ref,
+) {
 	const t = useTranslation();
-
 	const [text, setText] = useState('');
+	const autoFocusRef = useAutoFocus(shouldAutoFocus);
+	const mergedRefs = useMergedRefs(ref, autoFocusRef);
 
 	const handleInputChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
 		setText(event.currentTarget.value);
@@ -44,11 +48,10 @@ const FilterByText = ({ placeholder, onChange: setFilter, inputRef, children, au
 			<Box mi={4} display='flex' flexGrow={1}>
 				<TextInput
 					placeholder={placeholder ?? t('Search')}
-					ref={inputRef}
+					ref={mergedRefs}
 					addon={<Icon name='magnifier' size='x20' />}
 					onChange={handleInputChange}
 					value={text}
-					autoFocus={autoFocus}
 					flexGrow={2}
 					minWidth='x220'
 				/>
@@ -62,6 +65,6 @@ const FilterByText = ({ placeholder, onChange: setFilter, inputRef, children, au
 			)}
 		</Box>
 	);
-};
+});
 
-export default memo<FilterByTextProps>(FilterByText);
+export default memo(FilterByText);

apps/meteor/client/components/FilterByText.tsx

@@ -128,7 +128,7 @@ export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[];
 	return createPortal(
 		<FocusScope contain autoFocus>
 			<Box className={swiperStyle}>
-				<div className='swiper-container' onClick={onClose}>
+				<div role='presentation' className='swiper-container' onClick={onClose}>
 					<ButtonGroup className='rcx-swiper-controls' onClick={preventPropagation}>
 						{zoomScale !== 1 && <IconButton small icon='arrow-collapse' title='Resize' rcx-swiper-zoom-out onClick={handleResize} />}
 						<IconButton small icon='h-bar' title='Zoom out' rcx-swiper-zoom-out onClick={handleZoomOut} disabled={zoomScale === 1} />
@@ -155,7 +155,10 @@ export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[];
 						{images?.map(({ _id, url }) => (
 							<SwiperSlide key={_id}>
 								<div className='swiper-zoom-container'>
-									<img src={url} loading='lazy' onClick={preventPropagation} />
+									<span tabIndex={0} role='link' onClick={preventPropagation} onKeyDown={preventPropagation}>
+										<img src={url} loading='lazy' alt='' />
+									</span>
+
 									<div className='rcx-lazy-preloader'>
 										<Throbber inheritColor />
 									</div>

apps/meteor/client/components/ImageGallery/ImageGallery.tsx

@@ -10,6 +10,7 @@ import {
 	Divider,
 	FieldLabel,
 	FieldRow,
+	Option,
 } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
@@ -106,7 +107,7 @@ const ForwardChatModal = ({
 						<FieldLabel>{t('Forward_to_department')}</FieldLabel>
 						<FieldRow>
 							<PaginatedSelectFiltered
-								withTitle
+								withTitle={false}
 								filter={departmentsFilter as string}
 								setFilter={setDepartmentsFilter}
 								options={departments}
@@ -118,6 +119,7 @@ const ForwardChatModal = ({
 								}}
 								flexGrow={1}
 								endReached={endReached}
+								renderItem={({ label, ...props }) => <Option {...props} label={<span style={{ whiteSpace: 'normal' }}>{label}</span>} />}
 							/>
 						</FieldRow>
 					</Field>

apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx

@@ -19,9 +19,15 @@ const IgnoredContent = ({ onShowMessageIgnored }: IgnoredContentProps): ReactEle
 	return (
 		<MessageBody data-qa-type='message-body' dir='auto'>
 			<Box display='flex' alignItems='center' fontSize='c2' color='hint'>
-				<p role='button' onClick={showMessageIgnored} style={{ cursor: 'pointer' }}>
+				<span
+					tabIndex={0}
+					role='button'
+					onClick={showMessageIgnored}
+					onKeyDown={(e) => e.code === 'Enter' && showMessageIgnored(e)}
+					style={{ cursor: 'pointer' }}
+				>
 					<Icon name='chevron-left' /> {t('Message_Ignored')}
-				</p>
+				</span>
 			</Box>
 		</MessageBody>
 	);