refactor: move app/ui modules

apps/meteor/app/ui/client/lib/recorderjs/AudioEncoder.ts → apps/meteor/client/lib/AudioEncoder.ts

@@ -1,6 +1,6 @@
 import { Emitter } from '@rocket.chat/emitter';
 
-import { absoluteUrl } from '../../../../../client/lib/absoluteUrl';
+import { absoluteUrl } from './absoluteUrl';
 
 export class AudioEncoder extends Emitter {
 	private worker: Worker;

apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts → apps/meteor/client/lib/AudioRecorder.ts

@@ -1,5 +1,5 @@
 import { AudioEncoder } from './AudioEncoder';
-import { settings } from '../../../../../client/lib/settings';
+import { settings } from './settings';
 
 export class AudioRecorder {
 	private audioContext: AudioContext | undefined;

apps/meteor/app/ui/client/lib/ChatMessages.ts → apps/meteor/client/lib/ChatMessages.ts

@@ -4,19 +4,19 @@ import type { IActionManager } from '@rocket.chat/ui-contexts';
 
 import { CurrentEditingMessage } from './CurrentEditingMessage';
 import { UserAction } from './UserAction';
-import type { ChatAPI, ComposerAPI, DataAPI } from '../../../../client/lib/chats/ChatAPI';
-import { createDataAPI } from '../../../../client/lib/chats/data';
-import { processMessageEditing } from '../../../../client/lib/chats/flows/processMessageEditing';
-import { processMessageUploads } from '../../../../client/lib/chats/flows/processMessageUploads';
-import { processSetReaction } from '../../../../client/lib/chats/flows/processSetReaction';
-import { processSlashCommand } from '../../../../client/lib/chats/flows/processSlashCommand';
-import { processTooLongMessage } from '../../../../client/lib/chats/flows/processTooLongMessage';
-import { replyBroadcast } from '../../../../client/lib/chats/flows/replyBroadcast';
-import { requestMessageDeletion } from '../../../../client/lib/chats/flows/requestMessageDeletion';
-import { sendMessage } from '../../../../client/lib/chats/flows/sendMessage';
-import { uploadFiles } from '../../../../client/lib/chats/flows/uploadFiles';
-import { ReadStateManager } from '../../../../client/lib/chats/readStateManager';
-import { setHighlightMessage } from '../../../../client/views/room/MessageList/providers/messageHighlightSubscription';
+import type { ChatAPI, ComposerAPI, DataAPI } from './chats/ChatAPI';
+import { createDataAPI } from './chats/data';
+import { processMessageEditing } from './chats/flows/processMessageEditing';
+import { processMessageUploads } from './chats/flows/processMessageUploads';
+import { processSetReaction } from './chats/flows/processSetReaction';
+import { processSlashCommand } from './chats/flows/processSlashCommand';
+import { processTooLongMessage } from './chats/flows/processTooLongMessage';
+import { replyBroadcast } from './chats/flows/replyBroadcast';
+import { requestMessageDeletion } from './chats/flows/requestMessageDeletion';
+import { sendMessage } from './chats/flows/sendMessage';
+import { uploadFiles } from './chats/flows/uploadFiles';
+import { ReadStateManager } from './chats/readStateManager';
+import { setHighlightMessage } from '../views/room/MessageList/providers/messageHighlightSubscription';
 
 export class ChatMessages implements ChatAPI {
 	public uid: string | undefined;

apps/meteor/app/ui/client/lib/CurrentEditingMessage.ts → apps/meteor/client/lib/CurrentEditingMessage.ts

@@ -1,5 +1,5 @@
-import type { ChatAPI } from '../../../../client/lib/chats/ChatAPI';
-import { clearHighlightMessage } from '../../../../client/views/room/MessageList/providers/messageHighlightSubscription';
+import type { ChatAPI } from './chats/ChatAPI';
+import { clearHighlightMessage } from '../views/room/MessageList/providers/messageHighlightSubscription';
 
 export class CurrentEditingMessage {
 	private lock = false;

apps/meteor/app/ui/client/lib/UserAction.ts → apps/meteor/client/lib/UserAction.ts

@@ -2,10 +2,10 @@ import type { IExtras, IRoomActivity, IUser } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { debounce } from 'lodash';
 
-import { sdk } from '../../../../client/lib/SDKClient';
-import { settings } from '../../../../client/lib/settings';
-import { getUser, getUserId } from '../../../../client/lib/user';
-import { Users } from '../../../../client/stores';
+import { sdk } from './SDKClient';
+import { settings } from './settings';
+import { getUser, getUserId } from './user';
+import { Users } from '../stores';
 
 const TIMEOUT = 15000;
 const RENEW = TIMEOUT / 3;

apps/meteor/client/lib/chats/uploads.ts

@@ -6,9 +6,9 @@ import fileSize from 'filesize';
 import { getErrorMessage } from '../errorHandling';
 import type { UploadsAPI, EncryptedFileUploadContent } from './ChatAPI';
 import { isEncryptedUpload, type Upload } from './Upload';
-import { USER_ACTIVITIES, UserAction } from '../../../app/ui/client/lib/UserAction';
 import { i18n } from '../../../app/utils/lib/i18n';
 import { sdk } from '../SDKClient';
+import { USER_ACTIVITIES, UserAction } from '../UserAction';
 import { settings } from '../settings';
 import { fileUploadIsValidContentType } from '../utils/restrictions';
 

apps/meteor/app/ui/client/views/app/lib/scrolling.ts → apps/meteor/client/lib/scrolling.ts

@@ -1,9 +1,3 @@
-export function isAtBottom(element: HTMLElement, scrollThreshold = 0): boolean {
-	return element.scrollTop + scrollThreshold >= element.scrollHeight - element.clientHeight;
-}
-
-// Mainly used for allow mock during testing
-
 export const getBoundingClientRect = (ref: HTMLElement) => {
 	const { top, bottom, left, right } = ref.getBoundingClientRect();
 	const { scrollTop, scrollHeight, clientHeight } = ref;

apps/meteor/app/ui/client/lib/recorderjs/videoRecorder.spec.ts → apps/meteor/client/lib/videoRecorder.spec.ts

@@ -1,5 +1,5 @@
 import { VideoRecorder } from './videoRecorder';
-import { createDeferredPromise } from '../../../../../tests/mocks/utils/createDeferredMockFn';
+import { createDeferredPromise } from '../../tests/mocks/utils/createDeferredMockFn';
 
 describe('VideoRecorder', () => {
 	let mockStream: MediaStream;

apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirror.spec.tsx

@@ -26,7 +26,7 @@ jest.mock('codemirror/addon/edit/matchtags', () => ({}));
 jest.mock('codemirror/addon/edit/trailingspace', () => ({}));
 jest.mock('codemirror/addon/search/match-highlighter', () => ({}));
 jest.mock('codemirror/lib/codemirror.css', () => ({}));
-jest.mock('../../../../../../../app/ui/client/lib/codeMirror/codeMirror', () => ({}));
+jest.mock('../../../../../../lib/codeMirror', () => ({}));
 
 const flushAsync = () => act(() => Promise.resolve());
 

apps/meteor/client/views/admin/settings/Setting/inputs/CodeMirror/CodeMirror.tsx

@@ -12,7 +12,7 @@ const loadCodeMirror = (): Promise<CodeMirrorModule> => {
 	if (!codeMirrorPromise) {
 		codeMirrorPromise = Promise.all([
 			import('codemirror'),
-			import('../../../../../../../app/ui/client/lib/codeMirror/codeMirror'),
+			import('../../../../../../lib/codeMirror'),
 			import('codemirror/addon/edit/matchbrackets'),
 			import('codemirror/addon/edit/closebrackets'),
 			import('codemirror/addon/edit/matchtags'),

apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx

@@ -5,7 +5,7 @@ import { MessageComposerAction } from '@rocket.chat/ui-composer';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { AudioRecorder } from '../../../../app/ui/client/lib/recorderjs/AudioRecorder';
+import { AudioRecorder } from '../../../lib/AudioRecorder';
 import { useChat } from '../../room/contexts/ChatContext';
 
 const audioRecorder = new AudioRecorder();

apps/meteor/client/views/composer/VideoMessageRecorder/VideoMessageRecorder.tsx

@@ -6,8 +6,8 @@ import { useTranslation, useToastMessageDispatch } from '@rocket.chat/ui-context
 import type { AllHTMLAttributes, RefObject } from 'react';
 import { useRef, useEffect, useState } from 'react';
 
-import { UserAction, USER_ACTIVITIES } from '../../../../app/ui/client/lib/UserAction';
-import { VideoRecorder, useVideoRecorderCameraStarted } from '../../../../app/ui/client/lib/recorderjs/videoRecorder';
+import { UserAction, USER_ACTIVITIES } from '../../../lib/UserAction';
+import { VideoRecorder, useVideoRecorderCameraStarted } from '../../../lib/videoRecorder';
 import { useChat } from '../../room/contexts/ChatContext';
 
 export type VideoMessageRecorderProps = {
@@ -114,7 +114,7 @@ const VideoMessageRecorder = ({ rid, tmid, reference }: VideoMessageRecorderProp
 	}, [dispatchToastMessage, handleCancel, t]);
 
 	return (
-		<PositionAnimated visible='visible' anchor={reference as RefObject<HTMLElement>} placement='top-end'>
+		<PositionAnimated visible='visible' anchor={reference} placement='top-end'>
 			<Box role='dialog' aria-label={t('Video_record')} backgroundColor='light' padding={4} borderRadius={4} elevation='2'>
 				<Box className={videoContainerClass} overflow='hidden' height={240} borderRadius={4}>
 					<video muted autoPlay playsInline ref={videoRef} width={320} height={240} />

apps/meteor/client/views/room/body/hooks/useGetMore.spec.tsx

@@ -3,8 +3,8 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { useState } from 'react';
 
 import { useGetMore } from './useGetMore';
-import { getBoundingClientRect } from '../../../../../app/ui/client/views/app/lib/scrolling';
 import { RoomHistoryManager } from '../../../../lib/RoomHistoryManager';
+import { getBoundingClientRect } from '../../../../lib/scrolling';
 
 jest.mock('../../../../lib/RoomHistoryManager', () => ({
 	RoomHistoryManager: {
@@ -18,7 +18,7 @@ jest.mock('../../../../lib/RoomHistoryManager', () => ({
 	},
 }));
 
-jest.mock('../../../../../app/ui/client/views/app/lib/scrolling', () => ({
+jest.mock('../../../../lib/scrolling', () => ({
 	getBoundingClientRect: jest.fn(),
 }));
 

apps/meteor/client/views/room/body/hooks/useGetMore.ts

@@ -3,9 +3,9 @@ import { useSearchParameter } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
 import { flushSync } from 'react-dom';
 
-import { getBoundingClientRect } from '../../../../../app/ui/client/views/app/lib/scrolling';
 import { withThrottling } from '../../../../../lib/utils/highOrderFunctions';
 import { RoomHistoryManager } from '../../../../lib/RoomHistoryManager';
+import { getBoundingClientRect } from '../../../../lib/scrolling';
 
 export const useGetMore = (rid: string, isJumpingToMessage: boolean) => {
 	const msgId = useSearchParameter('msg');

apps/meteor/client/views/room/composer/ComposerUserActionIndicator/ComposerUserActionIndicator.tsx

@@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
 import { useCallback, Fragment, useSyncExternalStore, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { UserAction, USER_ACTIVITIES } from '../../../../../app/ui/client/lib/UserAction';
+import { UserAction, USER_ACTIVITIES } from '../../../../lib/UserAction';
 
 const maxUsernames = 5;
 

apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts

@@ -3,7 +3,7 @@ import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect, useMemo } from 'react';
 
-import { AudioRecorder } from '../../../../../../../app/ui/client/lib/recorderjs/AudioRecorder';
+import { AudioRecorder } from '../../../../../../lib/AudioRecorder';
 import { useChat } from '../../../../contexts/ChatContext';
 import { useMediaActionTitle } from '../../hooks/useMediaActionTitle';
 import { useMediaPermissions } from '../../hooks/useMediaPermissions';

apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts

@@ -3,7 +3,7 @@ import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect, useMemo } from 'react';
 
-import { VideoRecorder } from '../../../../../../../app/ui/client/lib/recorderjs/videoRecorder';
+import { VideoRecorder } from '../../../../../../lib/videoRecorder';
 import { useChat } from '../../../../contexts/ChatContext';
 import { useMediaActionTitle } from '../../hooks/useMediaActionTitle';
 import { useMediaPermissions } from '../../hooks/useMediaPermissions';

apps/meteor/client/views/room/providers/RoomProvider.tsx

@@ -7,12 +7,12 @@ import RoomToolboxProvider from './RoomToolboxProvider';
 import UserCardProvider from './UserCardProvider';
 import { useRedirectOnSettingsChanged } from './hooks/useRedirectOnSettingsChanged';
 import { useUsersNameChanged } from './hooks/useUsersNameChanged';
-import { UserAction } from '../../../../app/ui/client/lib/UserAction';
 import { omit } from '../../../../lib/utils/omit';
 import { useFireGlobalEvent } from '../../../hooks/useFireGlobalEvent';
 import { useRoomRolesQuery } from '../../../hooks/useRoomRolesQuery';
 import { RoomHistoryManager, useRoomHistoryState } from '../../../lib/RoomHistoryManager';
 import { RoomManager } from '../../../lib/RoomManager';
+import { UserAction } from '../../../lib/UserAction';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 import ImageGalleryProvider from '../../../providers/ImageGalleryProvider';
 import { Rooms, Subscriptions } from '../../../stores';

apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts

@@ -4,8 +4,8 @@ import { useUserId } from '@rocket.chat/ui-contexts';
 import { renderHook } from '@testing-library/react';
 
 import { useChatMessagesInstance } from './useChatMessagesInstance';
-import { ChatMessages } from '../../../../../app/ui/client/lib/ChatMessages';
 import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext';
+import { ChatMessages } from '../../../../lib/ChatMessages';
 import type { E2ERoomState } from '../../../../lib/e2ee/E2ERoomState';
 import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager';
 import { useRoomSubscription } from '../../contexts/RoomContext';
@@ -28,7 +28,7 @@ jest.mock('../../../../contexts/EmojiPickerContext', () => ({
 }));
 
 const updateSubscriptionMock = jest.fn();
-jest.mock('../../../../../app/ui/client/lib/ChatMessages', () => {
+jest.mock('../../../../lib/ChatMessages', () => {
 	return {
 		ChatMessages: jest.fn().mockImplementation(() => {
 			return {

apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts

@@ -3,8 +3,8 @@ import { useUserId } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
 import { useInstance } from './useInstance';
-import { ChatMessages } from '../../../../../app/ui/client/lib/ChatMessages';
 import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext';
+import { ChatMessages } from '../../../../lib/ChatMessages';
 import type { ChatAPI } from '../../../../lib/chats/ChatAPI';
 import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager';
 import { useRoomSubscription } from '../../contexts/RoomContext';