Updated dependencies [d3c493b6da, 02dd87574b, 16b67aa0ff, a565999ae0, 1056f220df, 1240c874a5, 768cad6de5, 2ef71e8ea6, 59df102d0c, eaf2f11a6c, 5f95c4ec6b, 363a011487, 495628bce0, f75a2cb4bb, 45dc3d5f72, ee43f2c57c, 07c4ca0621, 30399688fc, 4fd9c4cbaa, 4f72d62aa7, dfa49bdbb2]:
+ + - @rocket.chat/i18n@0.5.0-rc.0 + - @rocket.chat/fuselage-ui-kit@8.0.0-rc.0 + - @rocket.chat/ui-kit@0.35.0-rc.0 + - @rocket.chat/core-typings@6.10.0-rc.0 + - @rocket.chat/gazzodown@8.0.0-rc.0 + - @rocket.chat/model-typings@0.5.0-rc.0 + - @rocket.chat/rest-typings@6.10.0-rc.0 + - @rocket.chat/omnichannel-services@0.2.0-rc.0 + - @rocket.chat/web-ui-registration@8.0.0-rc.0 + - @rocket.chat/instance-status@0.1.0-rc.0 + - @rocket.chat/api-client@0.2.0-rc.0 + - @rocket.chat/pdf-worker@0.1.0-rc.0 + - @rocket.chat/ui-theming@0.2.0-rc.0 + - @rocket.chat/core-services@0.4.0-rc.0 + - @rocket.chat/ui-video-conf@8.0.0-rc.0 + - @rocket.chat/presence@0.2.0-rc.0 + - @rocket.chat/ui-composer@0.2.0-rc.0 + - @rocket.chat/ui-contexts@8.0.0-rc.0 + - @rocket.chat/license@0.2.0-rc.0 + - @rocket.chat/ui-avatar@4.0.0-rc.0 + - @rocket.chat/ui-client@8.0.0-rc.0 + - @rocket.chat/models@0.1.0-rc.0 + - @rocket.chat/apps@0.1.0-rc.0 + - @rocket.chat/cron@0.1.0-rc.0 + - @rocket.chat/server-cloud-communication@0.0.2 + - Bump @rocket.chat/meteor version. - ([#32683](https://github.com/RocketChat/Rocket.Chat/pull/32683) by [@dionisio-bot](https://github.com/dionisio-bot)) livechat `setDepartment` livechat api fixes: diff --git a/apps/meteor/app/2fa/server/functions/resetTOTP.ts b/apps/meteor/app/2fa/server/functions/resetTOTP.ts index 85fe696babe10..3be8ec7c80602 100644 --- a/apps/meteor/app/2fa/server/functions/resetTOTP.ts +++ b/apps/meteor/app/2fa/server/functions/resetTOTP.ts @@ -4,6 +4,7 @@ import { Meteor } from 'meteor/meteor'; import { i18n } from '../../../../server/lib/i18n'; import { isUserIdFederated } from '../../../../server/lib/isUserIdFederated'; +import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener'; import * as Mailer from '../../../mailer/server/api'; import { settings } from '../../../settings/server'; @@ -68,6 +69,14 @@ export async function resetTOTP(userId: string, notifyUser = false): Promise
{/* eslint-disable-next-line
jsx-a11y/no-noninteractive-element-interactions,
- jsx-a11y/click-events-have-key-events
- */}
- 
+ jsx-a11y/click-events-have-key-events
+ */}
+ 
;
+const fakeRoom = createFakeRoom();
+
export const Default: ComponentStory = () => (
= () => (
-
);
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx
new file mode 100644
index 0000000000000..9a2e7eac4c45a
--- /dev/null
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx
@@ -0,0 +1,28 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import '@testing-library/jest-dom/extend-expect';
+
+import { createRenteionPolicySettingsMock as createMock } from '../../../tests/mocks/client/mockRetentionPolicySettings';
+import { createFakeRoom } from '../../../tests/mocks/data';
+import { setDate } from '../../../tests/mocks/mockDate';
+import RetentionPolicyCallout from './RetentionPolicyCallout';
+
+jest.useFakeTimers();
+
+describe('RetentionPolicyCallout', () => {
+ it('Should render callout if settings are valid', () => {
+ setDate();
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ render( = ({ filesOnly, excludePinned, maxAge }) => {
+const RetentionPolicyCallout = ({ room }: { room: IRoom }) => {
+ const message = usePruneWarningMessage(room);
const t = useTranslation();
- const time = useFormattedRelativeTime(getMaxAgeInMS(maxAge));
return (
);
};
-export default RetentionPolicyCallout;
+export default withErrorBoundary(RetentionPolicyCallout);
diff --git a/apps/meteor/client/components/ModalBackdrop.tsx b/apps/meteor/client/components/ModalBackdrop.tsx
index 18d930f9b1cc8..e1e6964961837 100644
--- a/apps/meteor/client/components/ModalBackdrop.tsx
+++ b/apps/meteor/client/components/ModalBackdrop.tsx
@@ -90,7 +90,7 @@ const ModalBackdrop = ({ children, onDismiss }: ModalBackdropProps): ReactElemen
children={children}
className='rcx-modal__backdrop'
position='fixed'
- zIndex={999999}
+ zIndex={9999}
inset={0}
display='flex'
flexDirection='column'
diff --git a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
index 0fd882f2c5cc2..401448ceb3966 100644
--- a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
@@ -18,7 +18,7 @@ import type { ReactElement } from 'react';
import React, { useCallback, useState, useEffect, useMemo } from 'react';
import { useForm } from 'react-hook-form';
-import { useHasLicenseModule } from '../../../../ee/client/hooks/useHasLicenseModule';
+import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
import { dispatchToastMessage } from '../../../lib/toast';
import GenericModal from '../../GenericModal';
import Tags from '../Tags';
diff --git a/apps/meteor/client/components/Page/PageHeader.tsx b/apps/meteor/client/components/Page/PageHeader.tsx
index 197592d3e98cc..4549c69dccec9 100644
--- a/apps/meteor/client/components/Page/PageHeader.tsx
+++ b/apps/meteor/client/components/Page/PageHeader.tsx
@@ -24,12 +24,20 @@ const PageHeader: FC = ({ children = undefined, title, onClickB
-
+
{isMobile && (
-
-
+
);
diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index 10bea7cc0b60a..0da0e942b2e2a 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -1,9 +1,10 @@
+import type { IRoom } from '@rocket.chat/core-typings';
import { AutoComplete, Option, Box } from '@rocket.chat/fuselage';
import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
import { RoomAvatar } from '@rocket.chat/ui-avatar';
import { useEndpoint } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
-import type { ComponentProps } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
import React, { memo, useMemo, useState } from 'react';
const generateQuery = (
@@ -12,7 +13,11 @@ const generateQuery = (
selector: string;
} => ({ selector: JSON.stringify({ name: term }) });
-type RoomAutoCompleteProps = Omit, 'filter'> & { scope?: 'admin' | 'regular' };
+type RoomAutoCompleteProps = Omit, 'filter'> & {
+ scope?: 'admin' | 'regular';
+ renderRoomIcon?: (props: { encrypted: IRoom['encrypted']; type: IRoom['t'] }) => ReactElement | null;
+ setSelectedRoom?: React.Dispatch>;
+};
const AVATAR_SIZE = 'x20';
@@ -27,7 +32,7 @@ const ROOM_AUTOCOMPLETE_PARAMS = {
},
} as const;
-const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: RoomAutoCompleteProps) => {
+const RoomAutoComplete = ({ value, onChange, scope = 'regular', renderRoomIcon, setSelectedRoom, ...props }: RoomAutoCompleteProps) => {
const [filter, setFilter] = useState('');
const filterDebounced = useDebouncedValue(filter, 300);
const roomsAutoCompleteEndpoint = useEndpoint('GET', ROOM_AUTOCOMPLETE_PARAMS[scope].endpoint);
@@ -43,9 +48,9 @@ const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: Room
const options = useMemo(
() =>
result.isSuccess
- ? result.data.items.map(({ name, fname, _id, avatarETag, t }) => ({
+ ? result.data.items.map(({ name, fname, _id, avatarETag, t, encrypted }) => ({
value: _id,
- label: { name: fname || name, avatarETag, type: t },
+ label: { name: fname || name, avatarETag, type: t, encrypted },
}))
: [],
[result.data?.items, result.isSuccess],
@@ -55,7 +60,14 @@ const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: Room
{
+ onChange(val);
+
+ if (setSelectedRoom && typeof setSelectedRoom === 'function') {
+ const selectedRoom = result?.data?.items.find(({ _id }) => _id === val) as unknown as IRoom;
+ setSelectedRoom(selectedRoom);
+ }
+ }}
filter={filter}
setFilter={setFilter}
renderSelected={({ selected: { value, label } }) => (
@@ -66,6 +78,7 @@ const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: Room
{label?.name}
+ {renderRoomIcon?.({ ...label })}
)}
renderItem={({ value, label, ...props }) => (
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 025889edc7cd1..a4656373b4885 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -39,6 +39,7 @@ type UserInfoProps = UserInfoDataProps & {
verified?: boolean;
actions: ReactElement;
roles: ReactElement[];
+ reason?: string;
};
const UserInfo = ({
@@ -59,6 +60,7 @@ const UserInfo = ({
customFields,
canViewAllInfo,
actions,
+ reason,
...props
}: UserInfoProps): ReactElement => {
const t = useTranslation();
@@ -79,53 +81,47 @@ const UserInfo = ({
{userDisplayName &&
-
)}
- {roles.length !== 0 && (
+ {reason && (
- {t('Roles')}
- {roles}
+ {t('Reason_for_joining')}
+ {reason}
)}
- {Number.isInteger(utcOffset) && (
-
- {t('Local_Time')}
- {utcOffset &&
-
- )}
-
- {username && username !== name && (
+ {nickname && (
- {t('Username')}
- {username}
+ {t('Nickname')}
+ {nickname}
)}
- {canViewAllInfo && (
+ {roles.length !== 0 && (
- {t('Last_login')}
- {lastLogin ? timeAgo(lastLogin) : t('Never')}
+ {t('Roles')}
+ {roles}
)}
- {name && (
+ {username && username !== name && (
- {t('Full_Name')}
- {name}
+ {t('Username')}
+ {username}
)}
- {nickname && (
+ {Number.isInteger(utcOffset) && (
- {t('Nickname')}
- {nickname}
+ {t('Local_Time')}
+ {utcOffset &&
)}
@@ -138,6 +134,13 @@ const UserInfo = ({
)}
+ {Number.isInteger(utcOffset) && canViewAllInfo && (
+
+ {t('Last_login')}
+ {lastLogin ? timeAgo(lastLogin) : t('Never')}
+
+ )}
+
{phone && (
{t('Phone')}
diff --git a/apps/meteor/ee/client/components/dashboards/DownloadDataButton.tsx b/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
similarity index 95%
rename from apps/meteor/ee/client/components/dashboards/DownloadDataButton.tsx
rename to apps/meteor/client/components/dashboards/DownloadDataButton.tsx
index fb379021f7805..2edaf80237e30 100644
--- a/apps/meteor/ee/client/components/dashboards/DownloadDataButton.tsx
+++ b/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
@@ -4,7 +4,7 @@ import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-context
import type { ComponentProps, ReactElement } from 'react';
import React from 'react';
-import { downloadCsvAs } from '../../../../client/lib/download';
+import { downloadCsvAs } from '../../lib/download';
type RowFor = readonly unknown[] & {
length: THeaders['length'];
diff --git a/apps/meteor/ee/client/components/dashboards/PeriodSelector.tsx b/apps/meteor/client/components/dashboards/PeriodSelector.tsx
similarity index 100%
rename from apps/meteor/ee/client/components/dashboards/PeriodSelector.tsx
rename to apps/meteor/client/components/dashboards/PeriodSelector.tsx
diff --git a/apps/meteor/ee/client/components/dashboards/periods.ts b/apps/meteor/client/components/dashboards/periods.ts
similarity index 100%
rename from apps/meteor/ee/client/components/dashboards/periods.ts
rename to apps/meteor/client/components/dashboards/periods.ts
diff --git a/apps/meteor/ee/client/components/dashboards/usePeriodLabel.ts b/apps/meteor/client/components/dashboards/usePeriodLabel.ts
similarity index 100%
rename from apps/meteor/ee/client/components/dashboards/usePeriodLabel.ts
rename to apps/meteor/client/components/dashboards/usePeriodLabel.ts
diff --git a/apps/meteor/ee/client/components/dashboards/usePeriodSelectorState.ts b/apps/meteor/client/components/dashboards/usePeriodSelectorState.ts
similarity index 100%
rename from apps/meteor/ee/client/components/dashboards/usePeriodSelectorState.ts
rename to apps/meteor/client/components/dashboards/usePeriodSelectorState.ts
diff --git a/apps/meteor/ee/client/components/dashboards/usePeriodSelectorStorage.ts b/apps/meteor/client/components/dashboards/usePeriodSelectorStorage.ts
similarity index 100%
rename from apps/meteor/ee/client/components/dashboards/usePeriodSelectorStorage.ts
rename to apps/meteor/client/components/dashboards/usePeriodSelectorStorage.ts
diff --git a/apps/meteor/ee/client/components/deviceManagement/DeviceIcon.tsx b/apps/meteor/client/components/deviceManagement/DeviceIcon.tsx
similarity index 100%
rename from apps/meteor/ee/client/components/deviceManagement/DeviceIcon.tsx
rename to apps/meteor/client/components/deviceManagement/DeviceIcon.tsx
diff --git a/apps/meteor/ee/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
similarity index 89%
rename from apps/meteor/ee/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
rename to apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
index 40e550e1f4ba6..9bc4f11fd3cdc 100644
--- a/apps/meteor/ee/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
+++ b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/DeviceManagementTable.tsx
@@ -5,14 +5,9 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ComponentProps, ReactElement } from 'react';
import React from 'react';
-import GenericNoResults from '../../../../../client/components/GenericNoResults/GenericNoResults';
-import {
- GenericTable,
- GenericTableHeader,
- GenericTableBody,
- GenericTableLoadingTable,
-} from '../../../../../client/components/GenericTable';
-import { AsyncStatePhase } from '../../../../../client/lib/asyncState';
+import { AsyncStatePhase } from '../../../lib/asyncState';
+import GenericNoResults from '../../GenericNoResults/GenericNoResults';
+import { GenericTable, GenericTableHeader, GenericTableBody, GenericTableLoadingTable } from '../../GenericTable';
type DeviceManagementTableProps = {
data?: Serialized>;
diff --git a/apps/meteor/ee/client/components/deviceManagement/DeviceManagementTable/index.ts b/apps/meteor/client/components/deviceManagement/DeviceManagementTable/index.ts
similarity index 100%
rename from apps/meteor/ee/client/components/deviceManagement/DeviceManagementTable/index.ts
rename to apps/meteor/client/components/deviceManagement/DeviceManagementTable/index.ts
diff --git a/apps/meteor/ee/client/components/deviceManagement/LoggedOutBanner.tsx b/apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
similarity index 100%
rename from apps/meteor/ee/client/components/deviceManagement/LoggedOutBanner.tsx
rename to apps/meteor/client/components/deviceManagement/LoggedOutBanner.tsx
diff --git a/apps/meteor/client/components/message/StatusIndicators.tsx b/apps/meteor/client/components/message/StatusIndicators.tsx
index f47d25e7c7b2d..eb47fb040b210 100644
--- a/apps/meteor/client/components/message/StatusIndicators.tsx
+++ b/apps/meteor/client/components/message/StatusIndicators.tsx
@@ -1,5 +1,5 @@
import type { IMessage, ITranslatedMessage } from '@rocket.chat/core-typings';
-import { isEditedMessage, isE2EEMessage, isOTRMessage, isOTRAckMessage } from '@rocket.chat/core-typings';
+import { isEditedMessage, isE2EEMessage, isOTRMessage, isOTRAckMessage, isE2EEPinnedMessage } from '@rocket.chat/core-typings';
import { MessageStatusIndicator, MessageStatusIndicatorItem } from '@rocket.chat/fuselage';
import { useUserId, useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
@@ -17,7 +17,7 @@ const StatusIndicators = ({ message }: StatusIndicatorsProps): ReactElement => {
const starred = useShowStarred({ message });
const following = useShowFollowing({ message });
- const isEncryptedMessage = isE2EEMessage(message);
+ const isEncryptedMessage = isE2EEMessage(message) || isE2EEPinnedMessage(message);
const isOtrMessage = isOTRMessage(message) || isOTRAckMessage(message);
const uid = useUserId();
diff --git a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
index 7c2c2011cac92..394bf24995dc6 100644
--- a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
@@ -67,12 +67,12 @@ export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps): ReactElem
)}
- {attachment.md ?
)}
+ {attachment.md ?
+
{title}
{size && (
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
index de790f9e39363..b76cb268bb2f8 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
@@ -1,25 +1,20 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ComponentProps, FC } from 'react';
import React from 'react';
-import Action from '../../Action';
+import type Action from '../../Action';
+import AttachmentDownloadBase from './AttachmentDownloadBase';
+import AttachmentEncryptedDownload from './AttachmentEncryptedDownload';
type AttachmentDownloadProps = Omit, 'icon'> & { title?: string | undefined; href: string };
const AttachmentDownload: FC = ({ title, href, ...props }) => {
- const t = useTranslation();
- return (
- , 'icon'> & { title?: string | undefined; href: string };
+
+const AttachmentDownloadBase: FC = ({ title, href, ...props }) => {
+ const t = useTranslation();
+
+ return (
+ ;
+
+const AttachmentEncryptedDownload: FC = ({ title, href, ...props }) => {
+ const encryptedAnchorProps = useDownloadFromServiceWorker(href, title);
+
+ return = ({ id, previewUrl, dataSrc, lo
alt=''
width={dimensions.width}
height={dimensions.height}
+ loading='lazy'
/>
diff --git a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
index 2ade3deb49267..715a84a2359bc 100644
--- a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
+++ b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
@@ -1,4 +1,12 @@
-import type { IMessage } from '@rocket.chat/core-typings';
+import { Base64 } from '@rocket.chat/base64';
+import type { IMessage, MessageAttachment } from '@rocket.chat/core-typings';
+import {
+ isFileImageAttachment,
+ isFileAttachment,
+ isFileAudioAttachment,
+ isFileVideoAttachment,
+ isQuoteAttachment,
+} from '@rocket.chat/core-typings';
import type { Options } from '@rocket.chat/message-parser';
import { useSetting } from '@rocket.chat/ui-contexts';
import { useMemo } from 'react';
@@ -10,6 +18,48 @@ import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoT
import { useKatex } from '../../../views/room/MessageList/hooks/useKatex';
import { useSubscriptionFromMessageQuery } from './useSubscriptionFromMessageQuery';
+const normalizeAttachments = (attachments: MessageAttachment[], name?: string, type?: string): MessageAttachment[] => {
+ if (name) {
+ name = String.fromCharCode(...new TextEncoder().encode(name));
+ }
+
+ return attachments.map((attachment) => {
+ if (isQuoteAttachment(attachment) && attachment.attachments) {
+ attachment.attachments = normalizeAttachments(attachment.attachments);
+ return attachment;
+ }
+
+ if (!attachment.encryption) {
+ return attachment;
+ }
+
+ const key = Base64.encode(
+ JSON.stringify({
+ ...attachment.encryption,
+ name,
+ type,
+ }),
+ );
+
+ if (isFileAttachment(attachment)) {
+ if (attachment.title_link && !attachment.title_link.startsWith('/file-decrypt/')) {
+ attachment.title_link = `/file-decrypt${attachment.title_link}?key=${key}`;
+ }
+ if (isFileImageAttachment(attachment) && !attachment.image_url.startsWith('/file-decrypt/')) {
+ attachment.image_url = `/file-decrypt${attachment.image_url}?key=${key}`;
+ }
+ if (isFileAudioAttachment(attachment) && !attachment.audio_url.startsWith('/file-decrypt/')) {
+ attachment.audio_url = `/file-decrypt${attachment.audio_url}?key=${key}`;
+ }
+ if (isFileVideoAttachment(attachment) && !attachment.video_url.startsWith('/file-decrypt/')) {
+ attachment.video_url = `/file-decrypt${attachment.video_url}?key=${key}`;
+ }
+ }
+
+ return attachment;
+ });
+};
+
export const useNormalizedMessage = (message: TMessage): MessageWithMdEnforced => {
const { katexEnabled, katexDollarSyntaxEnabled, katexParenthesisSyntaxEnabled } = useKatex();
const customDomains = useAutoLinkDomains();
@@ -30,6 +80,16 @@ export const useNormalizedMessage = (message: TMessag
}),
};
- return parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions);
+ const normalizedMessage = parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions);
+
+ if (normalizedMessage.attachments) {
+ normalizedMessage.attachments = normalizeAttachments(
+ normalizedMessage.attachments,
+ normalizedMessage.file?.name,
+ normalizedMessage.file?.type,
+ );
+ }
+
+ return normalizedMessage;
}, [showColors, customDomains, katexEnabled, katexDollarSyntaxEnabled, katexParenthesisSyntaxEnabled, message, autoTranslateOptions]);
};
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 8d266fe35d0eb..6c35f7b73dbd7 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -1,8 +1,9 @@
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
import { useTranslation } from '@rocket.chat/ui-contexts';
import type { MouseEvent, ReactElement } from 'react';
import React from 'react';
-import type { MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
+import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
import GenericMenu from '../../GenericMenu/GenericMenu';
import type { GenericMenuItemProps } from '../../GenericMenu/GenericMenuItem';
@@ -19,11 +20,13 @@ type MessageActionSection = {
type MessageActionMenuProps = {
onChangeMenuVisibility: (visible: boolean) => void;
options: MessageActionConfigOption[];
+ context: MessageActionConditionProps;
+ isMessageEncrypted: boolean;
};
-const MessageActionMenu = ({ options, onChangeMenuVisibility }: MessageActionMenuProps): ReactElement => {
+const MessageActionMenu = ({ options, onChangeMenuVisibility, context, isMessageEncrypted }: MessageActionMenuProps): ReactElement => {
const t = useTranslation();
-
+ const id = useUniqueId();
const groupOptions = options
.map((option) => ({
variant: option.color === 'alert' ? 'danger' : '',
@@ -32,6 +35,9 @@ const MessageActionMenu = ({ options, onChangeMenuVisibility }: MessageActionMen
content: t(option.label),
onClick: option.action,
type: option.type,
+ ...(option.disabled && { disabled: option?.disabled?.(context) }),
+ ...(option.disabled &&
+ option?.disabled?.(context) && { tooltip: t('Action_not_available_encrypted_content', { action: t(option.label) }) }),
}))
.reduce((acc, option) => {
const group = option.type ? option.type : '';
@@ -44,7 +50,31 @@ const MessageActionMenu = ({ options, onChangeMenuVisibility }: MessageActionMen
acc.push(newSection);
return acc;
- }, [] as unknown as MessageActionSection[]);
+ }, [] as unknown as MessageActionSection[])
+ .map((section) => {
+ if (section.id !== 'apps') {
+ return section;
+ }
+
+ if (!isMessageEncrypted) {
+ return section;
+ }
+
+ return {
+ id: 'apps',
+ title: t('Apps'),
+ items: [
+ {
+ content: t('Unavailable'),
+ type: 'apps',
+ id,
+ disabled: true,
+ gap: false,
+ tooltip: t('Action_not_available_encrypted_content', { action: t('Apps') }),
+ },
+ ],
+ };
+ });
return (
action.action(e, { message, tabbar: toolbox, room, chat, autoTranslateOptions })}
key={action.id}
icon={action.icon}
- title={t(action.label)}
+ title={
+ action?.disabled?.({ message, room, user, subscription, settings: mapSettings, chat, context })
+ ? t('Action_not_available_encrypted_content', { action: t(action.label) })
+ : t(action.label)
+ }
data-qa-id={action.label}
data-qa-type='message-action-menu'
+ disabled={action?.disabled?.({ message, room, user, subscription, settings: mapSettings, chat, context })}
/>
))}
{actionsQueryResult.isSuccess && actionsQueryResult.data.menu.length > 0 && (
@@ -138,6 +143,8 @@ const MessageToolbar = ({
}))}
onChangeMenuVisibility={onChangeMenuVisibility}
data-qa-type='message-action-menu-options'
+ context={{ message, room, user, subscription, settings: mapSettings, chat, context }}
+ isMessageEncrypted={isE2EEMessage(message)}
/>
)}
diff --git a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
index 84ea4039ca93b..89da3724cfbce 100644
--- a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
@@ -1,5 +1,6 @@
import type { IMessage } from '@rocket.chat/core-typings';
-import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage } from '@rocket.chat/core-typings';
+import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
+import { MessageBody } from '@rocket.chat/fuselage';
import type { TranslationKey } from '@rocket.chat/ui-contexts';
import { useSetting, useTranslation, useUserId } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
@@ -43,9 +44,18 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
const t = useTranslation();
const normalizedMessage = useNormalizedMessage(message);
+ const isMessageEncrypted = encrypted && normalizedMessage?.e2e === 'pending';
+
+ const quotes = normalizedMessage?.attachments?.filter(isQuoteAttachment) || [];
+
+ const attachments = normalizedMessage?.attachments?.filter((attachment) => !isQuoteAttachment(attachment)) || [];
return (
<>
+ {isMessageEncrypted && {t('E2E_message_encrypted_placeholder')} }
+
+ {!!quotes?.length && {t('E2E_message_encrypted_placeholder')} }
+
+ {!!quotes?.length && (Component: ComponentType, fallback: ReactNode = null) {
+ const WrappedComponent = function (props: ComponentProps) {
+ return (
+ {fallback}}>
+
+ );
+ };
+
+ WrappedComponent.displayName = `withErrorBoundary(${Component.displayName ?? Component.name ?? 'Component'})`;
+
+ return WrappedComponent;
+}
+
+export { withErrorBoundary };
diff --git a/apps/meteor/client/contexts/AppsContext.tsx b/apps/meteor/client/contexts/AppsContext.tsx
index 1fbf7399d6482..2be8e74c2d672 100644
--- a/apps/meteor/client/contexts/AppsContext.tsx
+++ b/apps/meteor/client/contexts/AppsContext.tsx
@@ -4,7 +4,7 @@ import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
import type { Serialized } from '@rocket.chat/core-typings';
import { createContext } from 'react';
-import type { IAppExternalURL, ICategory } from '../../ee/client/apps/@types/IOrchestrator';
+import type { IAppExternalURL, ICategory } from '../apps/@types/IOrchestrator';
import type { AsyncState } from '../lib/asyncState';
import { AsyncStatePhase } from '../lib/asyncState';
import type { App } from '../views/marketplace/types';
diff --git a/apps/meteor/client/contexts/CallContext.ts b/apps/meteor/client/contexts/CallContext.ts
index ce9af784fb0df..316f5690cf69e 100644
--- a/apps/meteor/client/contexts/CallContext.ts
+++ b/apps/meteor/client/contexts/CallContext.ts
@@ -3,7 +3,7 @@ import type { Device } from '@rocket.chat/ui-contexts';
import { createContext, useContext, useMemo } from 'react';
import { useSyncExternalStore } from 'use-sync-external-store/shim';
-import { useHasLicenseModule } from '../../ee/client/hooks/useHasLicenseModule';
+import { useHasLicenseModule } from '../hooks/useHasLicenseModule';
import type { VoIPUser } from '../lib/voip/VoIPUser';
export type CallContextValue = CallContextDisabled | CallContextReady | CallContextError | CallContextEnabled;
diff --git a/apps/meteor/client/definitions/cron.d.ts b/apps/meteor/client/definitions/cron.d.ts
new file mode 100644
index 0000000000000..25c4be4f97a7c
--- /dev/null
+++ b/apps/meteor/client/definitions/cron.d.ts
@@ -0,0 +1,3 @@
+declare module 'cron' {
+ export declare function sendAt(precision: string): Moment;
+}
diff --git a/apps/meteor/ee/client/ecdh.ts b/apps/meteor/client/ecdh.ts
similarity index 97%
rename from apps/meteor/ee/client/ecdh.ts
rename to apps/meteor/client/ecdh.ts
index bbec5c19e0ad5..1e49f887e62b4 100644
--- a/apps/meteor/ee/client/ecdh.ts
+++ b/apps/meteor/client/ecdh.ts
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
-import { sdk } from '../../app/utils/client/lib/SDKClient';
import type { ClientSession } from '../app/ecdh/client/ClientSession';
+import { sdk } from '../app/utils/client/lib/SDKClient';
let resolveSession: (value: ClientSession | void) => void;
const sessionPromise = new Promise((resolve) => {
diff --git a/apps/meteor/ee/client/hooks/quickActions/useOnHoldChatQuickAction.ts b/apps/meteor/client/hooks/quickActions/useOnHoldChatQuickAction.ts
similarity index 91%
rename from apps/meteor/ee/client/hooks/quickActions/useOnHoldChatQuickAction.ts
rename to apps/meteor/client/hooks/quickActions/useOnHoldChatQuickAction.ts
index 7a3f5bbd51f2f..92c7ddf4c1c3d 100644
--- a/apps/meteor/ee/client/hooks/quickActions/useOnHoldChatQuickAction.ts
+++ b/apps/meteor/client/hooks/quickActions/useOnHoldChatQuickAction.ts
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
-import { QuickActionsEnum, type QuickActionsActionConfig } from '../../../../client/views/room/lib/quickActions';
+import { QuickActionsEnum, type QuickActionsActionConfig } from '../../views/room/lib/quickActions';
import { useHasLicenseModule } from '../useHasLicenseModule';
export const useOnHoldChatQuickAction = (): QuickActionsActionConfig | undefined => {
diff --git a/apps/meteor/ee/client/hooks/roomActions/useCallsRoomAction.ts b/apps/meteor/client/hooks/roomActions/useCallsRoomAction.ts
similarity index 74%
rename from apps/meteor/ee/client/hooks/roomActions/useCallsRoomAction.ts
rename to apps/meteor/client/hooks/roomActions/useCallsRoomAction.ts
index 7c21ac9a47ff2..31be4b2300ee4 100644
--- a/apps/meteor/ee/client/hooks/roomActions/useCallsRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useCallsRoomAction.ts
@@ -2,11 +2,11 @@ import { isRoomFederated } from '@rocket.chat/core-typings';
import { lazy, useContext, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
-import { RoomContext } from '../../../../client/views/room/contexts/RoomContext';
-import type { RoomToolboxActionConfig } from '../../../../client/views/room/contexts/RoomToolboxContext';
+import { RoomContext } from '../../views/room/contexts/RoomContext';
+import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
import { useHasLicenseModule } from '../useHasLicenseModule';
-const VideoConfList = lazy(() => import('../../../../client/views/room/contextualBar/VideoConference/VideoConfList'));
+const VideoConfList = lazy(() => import('../../views/room/contextualBar/VideoConference/VideoConfList'));
export const useCallsRoomAction = () => {
const licensed = useHasLicenseModule('videoconference-enterprise') === true;
diff --git a/apps/meteor/ee/client/hooks/roomActions/useCannedResponsesRoomAction.ts b/apps/meteor/client/hooks/roomActions/useCannedResponsesRoomAction.ts
similarity index 88%
rename from apps/meteor/ee/client/hooks/roomActions/useCannedResponsesRoomAction.ts
rename to apps/meteor/client/hooks/roomActions/useCannedResponsesRoomAction.ts
index 432a991697394..e5f44c67fbef9 100644
--- a/apps/meteor/ee/client/hooks/roomActions/useCannedResponsesRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useCannedResponsesRoomAction.ts
@@ -1,7 +1,7 @@
import { useSetting } from '@rocket.chat/ui-contexts';
import { lazy, useMemo } from 'react';
-import type { RoomToolboxActionConfig } from '../../../../client/views/room/contexts/RoomToolboxContext';
+import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
import { useHasLicenseModule } from '../useHasLicenseModule';
const CannedResponse = lazy(() => import('../../omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList'));
diff --git a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts
new file mode 100644
index 0000000000000..eb0cbe5b24f47
--- /dev/null
+++ b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts
@@ -0,0 +1,122 @@
+import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
+import { act, renderHook } from '@testing-library/react-hooks';
+
+import { E2EEState } from '../../../app/e2e/client/E2EEState';
+import { e2e } from '../../../app/e2e/client/rocketchat.e2e';
+import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
+import { dispatchToastMessage } from '../../lib/toast';
+import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
+import { useE2EEState } from '../../views/room/hooks/useE2EEState';
+import { useOTR } from '../useOTR';
+import { useE2EERoomAction } from './useE2EERoomAction';
+
+jest.mock('@rocket.chat/ui-contexts', () => ({
+ useSetting: jest.fn(),
+ usePermission: jest.fn(),
+ useEndpoint: jest.fn(),
+}));
+
+jest.mock('../../lib/toast', () => ({
+ dispatchToastMessage: jest.fn(),
+}));
+
+jest.mock('../../views/room/contexts/RoomContext', () => ({
+ useRoom: jest.fn(),
+ useRoomSubscription: jest.fn(),
+}));
+
+jest.mock('../useOTR', () => ({
+ useOTR: jest.fn(),
+}));
+
+jest.mock('../../../app/e2e/client/rocketchat.e2e', () => ({
+ e2e: {
+ isReady: jest.fn(),
+ },
+}));
+
+jest.mock('../../views/room/hooks/useE2EEState', () => ({
+ useE2EEState: jest.fn(),
+}));
+
+jest.mock('react-i18next', () => ({
+ useTranslation: () => ({
+ t: (key: string) => key,
+ }),
+}));
+
+jest.mock('meteor/tracker', () => ({
+ Tracker: {
+ autorun: jest.fn(),
+ },
+}));
+
+describe('useE2EERoomAction', () => {
+ const mockRoom = { _id: 'roomId', encrypted: false, t: 'd', name: 'Test Room' };
+ const mockSubscription = { autoTranslate: false };
+
+ beforeEach(() => {
+ (useSetting as jest.Mock).mockReturnValue(true);
+ (useRoom as jest.Mock).mockReturnValue(mockRoom);
+ (useRoomSubscription as jest.Mock).mockReturnValue(mockSubscription);
+ (useE2EEState as jest.Mock).mockReturnValue(E2EEState.READY);
+ (usePermission as jest.Mock).mockReturnValue(true);
+ (useEndpoint as jest.Mock).mockReturnValue(jest.fn().mockResolvedValue({ success: true }));
+ (e2e.isReady as jest.Mock).mockReturnValue(true);
+ });
+
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('should dispatch error toast message when otrState is ESTABLISHED', async () => {
+ (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.ESTABLISHED });
+
+ const { result } = renderHook(() => useE2EERoomAction());
+
+ await act(async () => {
+ await result?.current?.action?.();
+ });
+
+ expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' });
+ });
+
+ it('should dispatch error toast message when otrState is ESTABLISHING', async () => {
+ (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.ESTABLISHING });
+
+ const { result } = renderHook(() => useE2EERoomAction());
+
+ await act(async () => {
+ await result?.current?.action?.();
+ });
+
+ expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' });
+ });
+
+ it('should dispatch error toast message when otrState is REQUESTED', async () => {
+ (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.REQUESTED });
+
+ const { result } = renderHook(() => useE2EERoomAction());
+
+ await act(async () => {
+ await result?.current?.action?.();
+ });
+
+ expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' });
+ });
+
+ it('should dispatch success toast message when encryption is enabled', async () => {
+ (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.NOT_STARTED });
+
+ const { result } = renderHook(() => useE2EERoomAction());
+
+ await act(async () => {
+ await result?.current?.action?.();
+ });
+
+ expect(dispatchToastMessage).toHaveBeenCalledWith({
+ type: 'success',
+ message: 'E2E_Encryption_enabled_for_room',
+ });
+ });
+});
diff --git a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts
index 73b0f34836e17..bed73ab45c6b7 100644
--- a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts
@@ -1,29 +1,40 @@
import { isRoomFederated } from '@rocket.chat/core-typings';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
-import { useCallback, useMemo } from 'react';
+import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
-import { e2e } from '../../../app/e2e/client/rocketchat.e2e';
+import { E2EEState } from '../../../app/e2e/client/E2EEState';
+import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
import { dispatchToastMessage } from '../../lib/toast';
import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
-import { useReactiveValue } from '../useReactiveValue';
+import { useE2EEState } from '../../views/room/hooks/useE2EEState';
+import { useOTR } from '../useOTR';
export const useE2EERoomAction = () => {
const enabled = useSetting('E2E_Enable', false);
const room = useRoom();
const subscription = useRoomSubscription();
- const readyToEncrypt = useReactiveValue(useCallback(() => e2e.isReady(), [])) || room.encrypted;
+ const e2eeState = useE2EEState();
+ const isE2EEReady = e2eeState === E2EEState.READY || e2eeState === E2EEState.SAVE_PASSWORD;
+ const readyToEncrypt = isE2EEReady || room.encrypted;
const permittedToToggleEncryption = usePermission('toggle-room-e2e-encryption', room._id);
const permittedToEditRoom = usePermission('edit-room', room._id);
const permitted = (room.t === 'd' || (permittedToEditRoom && permittedToToggleEncryption)) && readyToEncrypt;
const federated = isRoomFederated(room);
const { t } = useTranslation();
+ const { otrState } = useOTR();
const toggleE2E = useEndpoint('POST', '/v1/rooms.saveRoomSettings');
- const action = useMutableCallback(async () => {
+ const action = useEffectEvent(async () => {
+ if (otrState === OtrRoomState.ESTABLISHED || otrState === OtrRoomState.ESTABLISHING || otrState === OtrRoomState.REQUESTED) {
+ dispatchToastMessage({ type: 'error', message: t('E2EE_not_available_OTR') });
+
+ return;
+ }
+
const { success } = await toggleE2E({ rid: room._id, encrypted: !room.encrypted });
if (!success) {
return;
diff --git a/apps/meteor/ee/client/hooks/roomActions/useGameCenterRoomAction.ts b/apps/meteor/client/hooks/roomActions/useGameCenterRoomAction.ts
similarity index 86%
rename from apps/meteor/ee/client/hooks/roomActions/useGameCenterRoomAction.ts
rename to apps/meteor/client/hooks/roomActions/useGameCenterRoomAction.ts
index 66a59d7fe81c2..f08e0fe03d0b9 100644
--- a/apps/meteor/ee/client/hooks/roomActions/useGameCenterRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useGameCenterRoomAction.ts
@@ -1,7 +1,7 @@
import { lazy, useMemo } from 'react';
-import type { RoomToolboxActionConfig } from '../../../../client/views/room/contexts/RoomToolboxContext';
import { useExternalComponentsQuery } from '../../apps/gameCenter/hooks/useExternalComponentsQuery';
+import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
const GameCenter = lazy(() => import('../../apps/gameCenter/GameCenter'));
diff --git a/apps/meteor/ee/client/hooks/useDeviceLogout.tsx b/apps/meteor/client/hooks/useDeviceLogout.tsx
similarity index 92%
rename from apps/meteor/ee/client/hooks/useDeviceLogout.tsx
rename to apps/meteor/client/hooks/useDeviceLogout.tsx
index 0cc0df4630ac2..c9c089aa2ce0c 100644
--- a/apps/meteor/ee/client/hooks/useDeviceLogout.tsx
+++ b/apps/meteor/client/hooks/useDeviceLogout.tsx
@@ -1,8 +1,8 @@
import { useSetModal, useTranslation, useToastMessageDispatch, useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
import React, { useCallback } from 'react';
-import GenericModal from '../../../client/components/GenericModal';
-import { useEndpointAction } from '../../../client/hooks/useEndpointAction';
+import GenericModal from '../components/GenericModal';
+import { useEndpointAction } from './useEndpointAction';
export const useDeviceLogout = (
sessionId: string,
diff --git a/apps/meteor/ee/client/hooks/useDevicesMenuOption.tsx b/apps/meteor/client/hooks/useDevicesMenuOption.tsx
similarity index 100%
rename from apps/meteor/ee/client/hooks/useDevicesMenuOption.tsx
rename to apps/meteor/client/hooks/useDevicesMenuOption.tsx
diff --git a/apps/meteor/client/hooks/useDialModal.tsx b/apps/meteor/client/hooks/useDialModal.tsx
index ead4c9c070c7e..ef513e5212834 100644
--- a/apps/meteor/client/hooks/useDialModal.tsx
+++ b/apps/meteor/client/hooks/useDialModal.tsx
@@ -4,7 +4,7 @@ import React, { Suspense, lazy, useCallback, useMemo } from 'react';
import { useIsVoipEnterprise } from '../contexts/CallContext';
import { dispatchToastMessage } from '../lib/toast';
-const DialPadModal = lazy(() => import('../../ee/client/voip/modal/DialPad/DialPadModal'));
+const DialPadModal = lazy(() => import('../voip/modal/DialPad/DialPadModal'));
type DialModalProps = {
initialValue?: string;
diff --git a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
new file mode 100644
index 0000000000000..5ab7f804fec78
--- /dev/null
+++ b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
@@ -0,0 +1,56 @@
+import { Emitter } from '@rocket.chat/emitter';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useCallback, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { downloadAs } from '../lib/download';
+
+const ee = new Emitter>();
+
+navigator.serviceWorker.addEventListener('message', (event) => {
+ if (event.data.type === 'attachment-download-result') {
+ const { result } = event.data as { result: ArrayBuffer; id: string };
+
+ ee.emit(event.data.id, { result, id: event.data.id });
+ }
+});
+
+export const registerDownloadForUid = (uid: string, t: ReturnType['t'], title?: string) => {
+ ee.once(uid, ({ result }) => {
+ downloadAs({ data: [new Blob([result])] }, title ?? t('Download'));
+ });
+};
+
+export const forAttachmentDownload = (uid: string, href: string, controller?: ServiceWorker | null) => {
+ if (!controller) {
+ controller = navigator.serviceWorker.controller;
+ }
+ controller?.postMessage({
+ type: 'attachment-download',
+ url: href,
+ id: uid,
+ });
+};
+
+export const useDownloadFromServiceWorker = (href: string, title?: string) => {
+ const { controller } = navigator.serviceWorker;
+
+ const uid = useUniqueId();
+
+ const { t } = useTranslation();
+
+ useEffect(() => registerDownloadForUid(uid, t, title), [title, t, uid]);
+
+ return {
+ disabled: !controller,
+ onContextMenu: useCallback((e) => e.preventDefault(), []),
+ onClick: useCallback(
+ (e: React.MouseEvent) => {
+ e.preventDefault();
+
+ forAttachmentDownload(uid, href, controller);
+ },
+ [href, uid, controller],
+ ),
+ };
+};
diff --git a/apps/meteor/ee/client/hooks/useHasLicenseModule.ts b/apps/meteor/client/hooks/useHasLicenseModule.ts
similarity index 81%
rename from apps/meteor/ee/client/hooks/useHasLicenseModule.ts
rename to apps/meteor/client/hooks/useHasLicenseModule.ts
index f2d75ab237464..ea40807308846 100644
--- a/apps/meteor/ee/client/hooks/useHasLicenseModule.ts
+++ b/apps/meteor/client/hooks/useHasLicenseModule.ts
@@ -1,6 +1,6 @@
import type { LicenseModule } from '@rocket.chat/core-typings';
-import { useLicenseBase } from '../../../client/hooks/useLicense';
+import { useLicenseBase } from './useLicense';
export const useHasLicenseModule = (licenseName: LicenseModule): 'loading' | boolean => {
return (
diff --git a/apps/meteor/client/hooks/useHighlightedCode.ts b/apps/meteor/client/hooks/useHighlightedCode.ts
index 43c4a5e6ea584..4e3405ca30342 100644
--- a/apps/meteor/client/hooks/useHighlightedCode.ts
+++ b/apps/meteor/client/hooks/useHighlightedCode.ts
@@ -1,7 +1,19 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
import { useMemo } from 'react';
-import hljs from '../../app/markdown/lib/hljs';
+import hljs, { register } from '../../app/markdown/lib/hljs';
export function useHighlightedCode(language: string, text: string): string {
- return useMemo(() => hljs.highlight(language, text).value, [language, text]);
+ const t = useTranslation();
+ const { isLoading } = useQuery(['register-highlight-language', language], async () => {
+ try {
+ await register(language);
+ return true;
+ } catch (error) {
+ console.error('Not possible to register the provided language');
+ }
+ });
+
+ return useMemo(() => (isLoading ? t('Loading') : hljs.highlight(language, text).value), [isLoading, language, text, t]);
}
diff --git a/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts b/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
new file mode 100644
index 0000000000000..7ccea2dd4bd4e
--- /dev/null
+++ b/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
@@ -0,0 +1,63 @@
+import type { LicenseBehavior, LicenseLimitKind } from '@rocket.chat/core-typings';
+import { validateWarnLimit } from '@rocket.chat/license/src/validation/validateLimit';
+
+import { useLicense } from './useLicense';
+
+type LicenseLimitsByBehavior = Record;
+
+export const useLicenseLimitsByBehavior = () => {
+ const result = useLicense({ loadValues: true });
+
+ if (result.isLoading || result.isError) {
+ return null;
+ }
+
+ const { license, limits } = result.data;
+
+ if (!license || !limits) {
+ return null;
+ }
+
+ const keyLimits = Object.keys(limits) as Array;
+
+ // Get the rule with the highest limit that applies to this key
+ const rules = keyLimits
+ .map((key) => {
+ const rule = license.limits[key]
+ ?.filter((limit) => validateWarnLimit(limit.max, limits[key].value ?? 0, limit.behavior))
+ .reduce<{ max: number; behavior: LicenseBehavior } | null>(
+ (maxLimit, currentLimit) => (!maxLimit || currentLimit.max > maxLimit.max ? currentLimit : maxLimit),
+ null,
+ );
+
+ if (!rule) {
+ return undefined;
+ }
+
+ if (rule.max === 0) {
+ return undefined;
+ }
+
+ if (rule.max === -1) {
+ return undefined;
+ }
+
+ return [key, rule.behavior];
+ })
+ .filter(Boolean) as Array<[keyof typeof limits, LicenseBehavior]>;
+
+ if (!rules.length) {
+ return null;
+ }
+
+ // Group by behavior
+ return rules.reduce((acc, [key, behavior]) => {
+ if (!acc[behavior]) {
+ acc[behavior] = [];
+ }
+
+ acc[behavior].push(key);
+
+ return acc;
+ }, {} as LicenseLimitsByBehavior);
+};
diff --git a/apps/meteor/client/hooks/useOTR.spec.tsx b/apps/meteor/client/hooks/useOTR.spec.tsx
new file mode 100644
index 0000000000000..0206d96ca176e
--- /dev/null
+++ b/apps/meteor/client/hooks/useOTR.spec.tsx
@@ -0,0 +1,70 @@
+import { useUserId } from '@rocket.chat/ui-contexts';
+import { renderHook } from '@testing-library/react-hooks';
+
+import OTR from '../../app/otr/client/OTR';
+import { OtrRoomState } from '../../app/otr/lib/OtrRoomState';
+import { useRoom } from '../views/room/contexts/RoomContext';
+import { useOTR } from './useOTR';
+
+jest.mock('@rocket.chat/ui-contexts', () => ({
+ useUserId: jest.fn(),
+}));
+
+jest.mock('../views/room/contexts/RoomContext', () => ({
+ useRoom: jest.fn(),
+}));
+
+jest.mock('../../app/otr/client/OTR', () => ({
+ getInstanceByRoomId: jest.fn(),
+}));
+
+jest.mock('./useReactiveValue', () => ({
+ useReactiveValue: jest.fn((fn) => fn()),
+}));
+
+describe('useOTR', () => {
+ it('should return error state when user ID is not available', () => {
+ (useUserId as jest.Mock).mockReturnValue(undefined);
+ (useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' });
+
+ const { result } = renderHook(() => useOTR());
+
+ expect(result.current.otr).toBeUndefined();
+ expect(result.current.otrState).toBe(OtrRoomState.ERROR);
+ });
+
+ it('should return error state when room ID is not available', () => {
+ (useUserId as jest.Mock).mockReturnValue('userId');
+ (useRoom as jest.Mock).mockReturnValue(undefined);
+
+ const { result } = renderHook(() => useOTR());
+
+ expect(result.current.otr).toBeUndefined();
+ expect(result.current.otrState).toBe(OtrRoomState.ERROR);
+ });
+
+ it('should return error state when OTR instance is not available', () => {
+ (useUserId as jest.Mock).mockReturnValue('userId');
+ (useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' });
+ (OTR.getInstanceByRoomId as jest.Mock).mockReturnValue(undefined);
+
+ const { result } = renderHook(() => useOTR());
+
+ expect(result.current.otr).toBeUndefined();
+ expect(result.current.otrState).toBe(OtrRoomState.ERROR);
+ });
+
+ it('should return the correct OTR instance and state when available', () => {
+ const mockOtrInstance = {
+ getState: jest.fn().mockReturnValue(OtrRoomState.NOT_STARTED),
+ };
+ (useUserId as jest.Mock).mockReturnValue('userId');
+ (useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' });
+ (OTR.getInstanceByRoomId as jest.Mock).mockReturnValue(mockOtrInstance);
+
+ const { result } = renderHook(() => useOTR());
+
+ expect(result.current.otr).toBe(mockOtrInstance);
+ expect(result.current.otrState).toBe(OtrRoomState.NOT_STARTED);
+ });
+});
diff --git a/apps/meteor/client/hooks/useOTR.ts b/apps/meteor/client/hooks/useOTR.ts
new file mode 100644
index 0000000000000..65f9004cf323d
--- /dev/null
+++ b/apps/meteor/client/hooks/useOTR.ts
@@ -0,0 +1,28 @@
+import { useUserId } from '@rocket.chat/ui-contexts';
+import { useMemo, useCallback } from 'react';
+
+import OTR from '../../app/otr/client/OTR';
+import type { OTRRoom } from '../../app/otr/client/OTRRoom';
+import { OtrRoomState } from '../../app/otr/lib/OtrRoomState';
+import { useRoom } from '../views/room/contexts/RoomContext';
+import { useReactiveValue } from './useReactiveValue';
+
+export const useOTR = (): { otr: OTRRoom | undefined; otrState: OtrRoomState } => {
+ const uid = useUserId();
+ const room = useRoom();
+
+ const otr = useMemo(() => {
+ if (!uid || !room) {
+ return;
+ }
+
+ return OTR.getInstanceByRoomId(uid, room._id);
+ }, [uid, room]);
+
+ const otrState = useReactiveValue(useCallback(() => (otr ? otr.getState() : OtrRoomState.ERROR), [otr]));
+
+ return {
+ otr,
+ otrState,
+ };
+};
diff --git a/apps/meteor/ee/client/hooks/useOutboundDialer.ts b/apps/meteor/client/hooks/useOutboundDialer.ts
similarity index 78%
rename from apps/meteor/ee/client/hooks/useOutboundDialer.ts
rename to apps/meteor/client/hooks/useOutboundDialer.ts
index fc7ae8a8522e7..2ffdc9b149694 100644
--- a/apps/meteor/ee/client/hooks/useOutboundDialer.ts
+++ b/apps/meteor/client/hooks/useOutboundDialer.ts
@@ -1,4 +1,4 @@
-import { useCallClient, useIsVoipEnterprise } from '../../../client/contexts/CallContext';
+import { useCallClient, useIsVoipEnterprise } from '../contexts/CallContext';
import { EEVoipClient } from '../lib/voip/EEVoipClient';
export const useOutboundDialer = (): EEVoipClient | null => {
diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
new file mode 100644
index 0000000000000..1ea3825c61ec9
--- /dev/null
+++ b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
@@ -0,0 +1,190 @@
+import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+import { renderHook } from '@testing-library/react-hooks';
+
+import { createRenteionPolicySettingsMock as createMock } from '../../tests/mocks/client/mockRetentionPolicySettings';
+import { createFakeRoom } from '../../tests/mocks/data';
+import { setDate } from '../../tests/mocks/mockDate';
+import { usePruneWarningMessage } from './usePruneWarningMessage';
+
+jest.useFakeTimers();
+
+const getRetentionRoomProps = (props: Partial = {}) => {
+ return {
+ retention: {
+ enabled: true,
+ overrideGlobal: true,
+ maxAge: 30,
+ filesOnly: false,
+ excludePinned: false,
+ ignoreThreads: false,
+ ...props,
+ },
+ };
+};
+
+describe('usePruneWarningMessage hook', () => {
+ describe('Cron timer and precision', () => {
+ it('Should update the message after the nextRunDate has passaed', async () => {
+ setDate();
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ }),
+ });
+ expect(result.current).toEqual('a minute June 1, 2024, 12:30 AM');
+ jest.advanceTimersByTime(31 * 60 * 1000);
+ expect(result.current).toEqual('a minute June 1, 2024, 1:00 AM');
+ });
+
+ it('Should return the default warning with precision set to every_hour', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ precision: '1',
+ }),
+ });
+ expect(result.current).toEqual('a minute June 1, 2024, 1:00 AM');
+ });
+
+ it('Should return the default warning with precision set to every_six_hours', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ precision: '2',
+ }),
+ });
+ expect(result.current).toEqual('a minute June 1, 2024, 6:00 AM');
+ });
+
+ it('Should return the default warning with precision set to every_day', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ precision: '3',
+ }),
+ });
+ expect(result.current).toEqual('a minute June 2, 2024, 12:00 AM');
+ });
+
+ it('Should return the default warning with advanced precision', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ advancedPrecision: true,
+ advancedPrecisionCron: '0 0 1 */1 *',
+ }),
+ });
+ expect(result.current).toEqual('a minute July 1, 2024, 12:00 AM');
+ });
+ });
+
+ describe('No override', () => {
+ it('Should return the default warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ }),
+ });
+ expect(result.current).toEqual('a minute June 1, 2024, 12:30 AM');
+ });
+
+ it('Should return the unpinned messages warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ doNotPrunePinned: true,
+ }),
+ });
+ expect(result.current).toEqual('Unpinned a minute June 1, 2024, 12:30 AM');
+ });
+
+ it('Should return the files only warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ filesOnly: true,
+ }),
+ });
+ expect(result.current).toEqual('FilesOnly a minute June 1, 2024, 12:30 AM');
+ });
+
+ it('Should return the unpinned files only warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'c' });
+ setDate();
+
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock({
+ appliesToChannels: true,
+ TTLChannels: 60000,
+ filesOnly: true,
+ doNotPrunePinned: true,
+ }),
+ });
+ expect(result.current).toEqual('UnpinnedFilesOnly a minute June 1, 2024, 12:30 AM');
+ });
+ });
+
+ describe('Overriden', () => {
+ it('Should return the default warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps() });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock(),
+ });
+ expect(result.current).toEqual('30 days June 1, 2024, 12:30 AM');
+ });
+
+ it('Should return the unpinned messages warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true }) });
+ setDate();
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock(),
+ });
+ expect(result.current).toEqual('Unpinned 30 days June 1, 2024, 12:30 AM');
+ });
+
+ it('Should return the files only warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ filesOnly: true }) });
+ setDate();
+
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock(),
+ });
+ expect(result.current).toEqual('FilesOnly 30 days June 1, 2024, 12:30 AM');
+ });
+
+ it('Should return the unpinned files only warning', () => {
+ const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true, filesOnly: true }) });
+ setDate();
+
+ const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+ wrapper: createMock(),
+ });
+ expect(result.current).toEqual('UnpinnedFilesOnly 30 days June 1, 2024, 12:30 AM');
+ });
+ });
+});
diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.ts b/apps/meteor/client/hooks/usePruneWarningMessage.ts
new file mode 100644
index 0000000000000..bb1eec5a59891
--- /dev/null
+++ b/apps/meteor/client/hooks/usePruneWarningMessage.ts
@@ -0,0 +1,105 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useSafely } from '@rocket.chat/fuselage-hooks';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation, useLanguage } from '@rocket.chat/ui-contexts';
+import { sendAt } from 'cron';
+import intlFormat from 'date-fns/intlFormat';
+import { useEffect, useState } from 'react';
+
+import { getCronAdvancedTimerFromPrecisionSetting } from '../../lib/getCronAdvancedTimerFromPrecisionSetting';
+import { useRetentionPolicy } from '../views/room/hooks/useRetentionPolicy';
+import { useFormattedRelativeTime } from './useFormattedRelativeTime';
+
+const getMessage = ({ filesOnly, excludePinned }: { filesOnly: boolean; excludePinned: boolean }): TranslationKey => {
+ if (filesOnly) {
+ return excludePinned
+ ? 'RetentionPolicy_RoomWarning_UnpinnedFilesOnly_NextRunDate'
+ : 'RetentionPolicy_RoomWarning_FilesOnly_NextRunDate';
+ }
+
+ return excludePinned ? 'RetentionPolicy_RoomWarning_Unpinned_NextRunDate' : 'RetentionPolicy_RoomWarning_NextRunDate';
+};
+
+type CronPrecisionSetting = '0' | '1' | '2' | '3';
+const getNextRunDate = ({
+ enableAdvancedCronTimer,
+ cronPrecision,
+ advancedCronTimer,
+}: {
+ enableAdvancedCronTimer: boolean;
+ cronPrecision: CronPrecisionSetting;
+ advancedCronTimer: string;
+}) => {
+ if (enableAdvancedCronTimer) {
+ return sendAt(advancedCronTimer);
+ }
+
+ return sendAt(getCronAdvancedTimerFromPrecisionSetting(cronPrecision));
+};
+
+const useNextRunDate = ({
+ enableAdvancedCronTimer,
+ advancedCronTimer,
+ cronPrecision,
+}: {
+ enableAdvancedCronTimer: boolean;
+ cronPrecision: CronPrecisionSetting;
+ advancedCronTimer: string;
+}) => {
+ const [nextRunDate, setNextRunDate] = useSafely(useState(getNextRunDate({ enableAdvancedCronTimer, advancedCronTimer, cronPrecision })));
+ const lang = useLanguage();
+
+ useEffect(() => {
+ const timeoutBetweenRunAndNow = nextRunDate.valueOf() - Date.now();
+
+ const timeout = setTimeout(
+ () => setNextRunDate(getNextRunDate({ enableAdvancedCronTimer, advancedCronTimer, cronPrecision })),
+ timeoutBetweenRunAndNow,
+ );
+
+ return () => clearTimeout(timeout);
+ }, [advancedCronTimer, cronPrecision, enableAdvancedCronTimer, nextRunDate, setNextRunDate]);
+
+ return intlFormat(
+ new Date(nextRunDate.valueOf()),
+ {
+ localeMatcher: 'best fit',
+ year: 'numeric',
+ month: 'long',
+ day: 'numeric',
+ hour: 'numeric',
+ minute: 'numeric',
+ },
+ {
+ locale: lang,
+ },
+ );
+};
+
+export const usePruneWarningMessage = (room: IRoom) => {
+ const retention = useRetentionPolicy(room);
+ if (!retention) {
+ throw new Error('usePruneWarningMessage - No room provided');
+ }
+
+ const { maxAge, filesOnly, excludePinned } = retention;
+
+ const cronPrecision = String(useSetting('RetentionPolicy_Precision')) as CronPrecisionSetting;
+
+ const t = useTranslation();
+
+ const enableAdvancedCronTimer = Boolean(useSetting('RetentionPolicy_Advanced_Precision'));
+ const advancedCronTimer = String(useSetting('RetentionPolicy_Advanced_Precision_Cron'));
+
+ const message = getMessage({ filesOnly, excludePinned });
+
+ const nextRunDate = useNextRunDate({
+ enableAdvancedCronTimer,
+ advancedCronTimer,
+ cronPrecision,
+ });
+
+ const maxAgeFormatted = useFormattedRelativeTime(maxAge);
+
+ return t(message, { maxAge: maxAgeFormatted, nextRunDate });
+};
diff --git a/apps/meteor/ee/client/hooks/useTagsList.ts b/apps/meteor/client/hooks/useTagsList.ts
similarity index 86%
rename from apps/meteor/ee/client/hooks/useTagsList.ts
rename to apps/meteor/client/hooks/useTagsList.ts
index 41062d1b9dceb..3aa80b4e07b3a 100644
--- a/apps/meteor/ee/client/hooks/useTagsList.ts
+++ b/apps/meteor/client/hooks/useTagsList.ts
@@ -1,9 +1,9 @@
import { useEndpoint } from '@rocket.chat/ui-contexts';
import { useCallback, useState } from 'react';
-import { useScrollableRecordList } from '../../../client/hooks/lists/useScrollableRecordList';
-import { useComponentDidUpdate } from '../../../client/hooks/useComponentDidUpdate';
-import { RecordList } from '../../../client/lib/lists/RecordList';
+import { RecordList } from '../lib/lists/RecordList';
+import { useScrollableRecordList } from './lists/useScrollableRecordList';
+import { useComponentDidUpdate } from './useComponentDidUpdate';
type TagsListOptions = {
filter: string;
diff --git a/apps/meteor/ee/client/hooks/useVoipClient.ts b/apps/meteor/client/hooks/useVoipClient.ts
similarity index 91%
rename from apps/meteor/ee/client/hooks/useVoipClient.ts
rename to apps/meteor/client/hooks/useVoipClient.ts
index 93048c50016a8..a9a941b1a0e16 100644
--- a/apps/meteor/ee/client/hooks/useVoipClient.ts
+++ b/apps/meteor/client/hooks/useVoipClient.ts
@@ -5,9 +5,9 @@ import { useUser, useSetting, useEndpoint, useStream } from '@rocket.chat/ui-con
import { KJUR } from 'jsrsasign';
import { useEffect, useState } from 'react';
-import { VoIPUser } from '../../../client/lib/voip/VoIPUser';
-import { useWebRtcServers } from '../../../client/providers/CallProvider/hooks/useWebRtcServers';
import { EEVoipClient } from '../lib/voip/EEVoipClient';
+import { VoIPUser } from '../lib/voip/VoIPUser';
+import { useWebRtcServers } from '../providers/CallProvider/hooks/useWebRtcServers';
import { useHasLicenseModule } from './useHasLicenseModule';
type UseVoipClientResult = {
@@ -39,13 +39,13 @@ export const useVoipClient = (): UseVoipClientResult => {
const isEE = useHasLicenseModule('voip-enterprise');
const voipEnabled = settingVoipEnabled && voipConnectorEnabled;
- useEffect(
- () =>
- subscribeToNotifyLoggedIn(`voip.statuschanged`, (enabled: boolean): void => {
+ useEffect(() => {
+ if (user) {
+ return subscribeToNotifyLoggedIn(`voip.statuschanged`, (enabled: boolean): void => {
setVoipConnectorEnabled(enabled);
- }),
- [setResult, setVoipConnectorEnabled, subscribeToNotifyLoggedIn],
- );
+ });
+ }
+ }, [setResult, setVoipConnectorEnabled, subscribeToNotifyLoggedIn, user]);
useEffect(() => {
const uid = user?._id;
diff --git a/apps/meteor/ee/client/hooks/useVoipFooterMenu.tsx b/apps/meteor/client/hooks/useVoipFooterMenu.tsx
similarity index 100%
rename from apps/meteor/ee/client/hooks/useVoipFooterMenu.tsx
rename to apps/meteor/client/hooks/useVoipFooterMenu.tsx
diff --git a/apps/meteor/client/importPackages.ts b/apps/meteor/client/importPackages.ts
index ffc81c35a9532..ddc173e631168 100644
--- a/apps/meteor/client/importPackages.ts
+++ b/apps/meteor/client/importPackages.ts
@@ -2,6 +2,7 @@ import '../app/cors/client';
import '../app/apple/client';
import '../app/authorization/client';
import '../app/autotranslate/client';
+import '../app/canned-responses/client';
import '../app/custom-sounds/client';
import '../app/dolphin/client';
import '../app/drupal/client';
@@ -12,7 +13,9 @@ import '../app/file-upload/client';
import '../app/github-enterprise/client';
import '../app/gitlab/client';
import '../app/iframe-login/client';
+import '../app/license/client';
import '../app/lib/client';
+import '../app/livechat-enterprise/client';
import '../app/message-mark-as-unread/client';
import '../app/nextcloud/client';
import '../app/notifications/client';
diff --git a/apps/meteor/client/lib/chats/ChatAPI.ts b/apps/meteor/client/lib/chats/ChatAPI.ts
index ceffab987a649..30dd5909ee03b 100644
--- a/apps/meteor/client/lib/chats/ChatAPI.ts
+++ b/apps/meteor/client/lib/chats/ChatAPI.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, ISubscription, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
import type { IActionManager } from '@rocket.chat/ui-contexts';
import type { FormattingButton } from '../../../app/ui-message/client/messageBox/messageBoxFormatting';
@@ -100,7 +100,12 @@ export type UploadsAPI = {
subscribe(callback: () => void): () => void;
wipeFailedOnes(): void;
cancel(id: Upload['id']): void;
- send(file: File, { description, msg }: { description?: string; msg?: string }): Promise;
+ send(
+ file: File,
+ { description, msg, t, e2e }: { description?: string; msg?: string; t?: IMessage['t']; e2e?: IMessage['e2e'] },
+ getContent?: (fileId: string, fileUrl: string) => Promise,
+ fileContent?: { raw: Partial; encrypted: IE2EEMessage['content'] },
+ ): Promise;
};
export type ChatAPI = {
@@ -140,7 +145,15 @@ export type ChatAPI = {
readonly flows: {
readonly uploadFiles: (files: readonly File[], resetFileInput?: () => void) => Promise;
- readonly sendMessage: ({ text, tshow }: { text: string; tshow?: boolean; previewUrls?: string[] }) => Promise;
+ readonly sendMessage: ({
+ text,
+ tshow,
+ }: {
+ text: string;
+ tshow?: boolean;
+ previewUrls?: string[];
+ isSlashCommandAllowed?: boolean;
+ }) => Promise;
readonly processSlashCommand: (message: IMessage, userId: string | null) => Promise;
readonly processTooLongMessage: (message: IMessage) => Promise;
readonly processMessageEditing: (
diff --git a/apps/meteor/client/lib/chats/data.ts b/apps/meteor/client/lib/chats/data.ts
index f2c049ad04b14..445f61f27226e 100644
--- a/apps/meteor/client/lib/chats/data.ts
+++ b/apps/meteor/client/lib/chats/data.ts
@@ -7,7 +7,6 @@ import { Messages, ChatRoom, ChatSubscription } from '../../../app/models/client
import { settings } from '../../../app/settings/client';
import { MessageTypes } from '../../../app/ui-utils/client';
import { sdk } from '../../../app/utils/client/lib/SDKClient';
-import { onClientBeforeSendMessage } from '../onClientBeforeSendMessage';
import { prependReplies } from '../utils/prependReplies';
import type { DataAPI } from './ChatAPI';
@@ -21,7 +20,7 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
const effectiveRID = originalMessage?.rid ?? rid;
const effectiveTMID = originalMessage ? originalMessage.tmid : tmid;
- return (await onClientBeforeSendMessage({
+ return {
_id: originalMessage?._id ?? Random.id(),
rid: effectiveRID,
...(effectiveTMID && {
@@ -29,7 +28,7 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
...(sendToChannel && { tshow: sendToChannel }),
}),
msg,
- })) as IMessage;
+ } as IMessage;
};
const findMessageByID = async (mid: IMessage['_id']): Promise =>
@@ -95,7 +94,7 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
}
const blockEditInMinutes = settings.get('Message_AllowEditing_BlockEditInMinutes') as number | undefined;
- const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete');
+ const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete', message.rid);
const elapsedMinutes = moment().diff(message.ts, 'minutes');
if (!bypassBlockTimeLimit && elapsedMinutes && blockEditInMinutes && elapsedMinutes > blockEditInMinutes) {
@@ -208,7 +207,7 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
}
const blockDeleteInMinutes = settings.get('Message_AllowDeleting_BlockDeleteInMinutes') as number | undefined;
- const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete');
+ const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete', message.rid);
const elapsedMinutes = moment().diff(message.ts, 'minutes');
const onTimeForDelete = bypassBlockTimeLimit || !blockDeleteInMinutes || !elapsedMinutes || elapsedMinutes <= blockDeleteInMinutes;
diff --git a/apps/meteor/client/lib/chats/flows/processMessageEditing.ts b/apps/meteor/client/lib/chats/flows/processMessageEditing.ts
index 029c56ff6d28b..d152f47f40965 100644
--- a/apps/meteor/client/lib/chats/flows/processMessageEditing.ts
+++ b/apps/meteor/client/lib/chats/flows/processMessageEditing.ts
@@ -17,7 +17,7 @@ export const processMessageEditing = async (
return false;
}
- if (!message.msg && !message.attachments?.length) {
+ if (!message.msg && !message.attachments?.length && !message.content) {
return false;
}
diff --git a/apps/meteor/client/lib/chats/flows/sendMessage.ts b/apps/meteor/client/lib/chats/flows/sendMessage.ts
index 62adbd80eb3e2..dbac8d808e4f6 100644
--- a/apps/meteor/client/lib/chats/flows/sendMessage.ts
+++ b/apps/meteor/client/lib/chats/flows/sendMessage.ts
@@ -3,6 +3,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
import { KonchatNotification } from '../../../../app/ui/client/lib/KonchatNotification';
import { sdk } from '../../../../app/utils/client/lib/SDKClient';
import { t } from '../../../../app/utils/lib/i18n';
+import { onClientBeforeSendMessage } from '../../onClientBeforeSendMessage';
import { dispatchToastMessage } from '../../toast';
import type { ChatAPI } from '../ChatAPI';
import { processMessageEditing } from './processMessageEditing';
@@ -10,7 +11,7 @@ import { processSetReaction } from './processSetReaction';
import { processSlashCommand } from './processSlashCommand';
import { processTooLongMessage } from './processTooLongMessage';
-const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[]): Promise => {
+const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[], isSlashCommandAllowed?: boolean): Promise => {
KonchatNotification.removeRoomNotification(message.rid);
if (await processSetReaction(chat, message)) {
@@ -21,11 +22,16 @@ const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[])
return;
}
- if (await processMessageEditing(chat, message, previewUrls)) {
+ if (isSlashCommandAllowed && (await processSlashCommand(chat, message))) {
return;
}
- if (await processSlashCommand(chat, message)) {
+ message = (await onClientBeforeSendMessage(message)) as IMessage;
+
+ // e2e should be a client property only
+ delete message.e2e;
+
+ if (await processMessageEditing(chat, message, previewUrls)) {
return;
}
@@ -34,7 +40,12 @@ const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[])
export const sendMessage = async (
chat: ChatAPI,
- { text, tshow, previewUrls }: { text: string; tshow?: boolean; previewUrls?: string[] },
+ {
+ text,
+ tshow,
+ previewUrls,
+ isSlashCommandAllowed,
+ }: { text: string; tshow?: boolean; previewUrls?: string[]; isSlashCommandAllowed?: boolean },
): Promise => {
if (!(await chat.data.isSubscribedToRoom())) {
try {
@@ -62,8 +73,23 @@ export const sendMessage = async (
originalMessage: chat.currentEditing ? await chat.data.findMessageByID(chat.currentEditing.mid) : null,
});
+ if (chat.currentEditing) {
+ const originalMessage = await chat.data.findMessageByID(chat.currentEditing.mid);
+
+ if (
+ originalMessage?.t === 'e2e' &&
+ originalMessage.attachments &&
+ originalMessage.attachments.length > 0 &&
+ originalMessage.attachments[0].description !== undefined
+ ) {
+ originalMessage.attachments[0].description = message.msg;
+ message.attachments = originalMessage.attachments;
+ message.msg = originalMessage.msg;
+ }
+ }
+
try {
- await process(chat, message, previewUrls);
+ await process(chat, message, previewUrls, isSlashCommandAllowed);
chat.composer?.dismissAllQuotedMessages();
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
diff --git a/apps/meteor/client/lib/chats/flows/uploadFiles.ts b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
index 82572aa2dbf5c..32e17da8ac6fa 100644
--- a/apps/meteor/client/lib/chats/flows/uploadFiles.ts
+++ b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
@@ -1,11 +1,27 @@
+import type { IMessage, FileAttachmentProps, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
import { isRoomFederated } from '@rocket.chat/core-typings';
+import { e2e } from '../../../../app/e2e/client';
import { fileUploadIsValidContentType } from '../../../../app/utils/client';
+import { getFileExtension } from '../../../../lib/utils/getFileExtension';
import FileUploadModal from '../../../views/room/modals/FileUploadModal';
import { imperativeModal } from '../../imperativeModal';
import { prependReplies } from '../../utils/prependReplies';
import type { ChatAPI } from '../ChatAPI';
+const getHeightAndWidthFromDataUrl = (dataURL: string): Promise<{ height: number; width: number }> => {
+ return new Promise((resolve) => {
+ const img = new Image();
+ img.onload = () => {
+ resolve({
+ height: img.height,
+ width: img.width,
+ });
+ };
+ img.src = dataURL;
+ });
+};
+
export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFileInput?: () => void): Promise => {
const replies = chat.composer?.quotedMessages.get() ?? [];
@@ -15,6 +31,26 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFi
const queue = [...files];
+ const uploadFile = (
+ file: File,
+ extraData?: Pick & { description?: string },
+ getContent?: (fileId: string, fileUrl: string) => Promise,
+ fileContent?: { raw: Partial; encrypted: IE2EEMessage['content'] },
+ ) => {
+ chat.uploads.send(
+ file,
+ {
+ msg,
+ ...extraData,
+ },
+ getContent,
+ fileContent,
+ );
+ chat.composer?.clear();
+ imperativeModal.close();
+ uploadNextFile();
+ };
+
const uploadNextFile = (): void => {
const file = queue.pop();
if (!file) {
@@ -33,20 +69,128 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFi
imperativeModal.close();
uploadNextFile();
},
- onSubmit: (fileName: string, description?: string): void => {
+ onSubmit: async (fileName: string, description?: string): Promise => {
Object.defineProperty(file, 'name', {
writable: true,
value: fileName,
});
- chat.uploads.send(file, {
- description,
- msg,
- });
- chat.composer?.clear();
- imperativeModal.close();
- uploadNextFile();
+
+ // encrypt attachment description
+ const e2eRoom = await e2e.getInstanceByRoomId(room._id);
+
+ if (!e2eRoom) {
+ uploadFile(file, { description });
+ return;
+ }
+
+ const shouldConvertSentMessages = await e2eRoom.shouldConvertSentMessages({ msg });
+
+ if (!shouldConvertSentMessages) {
+ uploadFile(file, { description });
+ return;
+ }
+
+ const encryptedFile = await e2eRoom.encryptFile(file);
+
+ if (encryptedFile) {
+ const getContent = async (_id: string, fileUrl: string): Promise => {
+ const attachments = [];
+
+ const attachment: FileAttachmentProps = {
+ title: file.name,
+ type: 'file',
+ description,
+ title_link: fileUrl,
+ title_link_download: true,
+ encryption: {
+ key: encryptedFile.key,
+ iv: encryptedFile.iv,
+ },
+ hashes: {
+ sha256: encryptedFile.hash,
+ },
+ };
+
+ if (/^image\/.+/.test(file.type)) {
+ const dimensions = await getHeightAndWidthFromDataUrl(window.URL.createObjectURL(file));
+
+ attachments.push({
+ ...attachment,
+ image_url: fileUrl,
+ image_type: file.type,
+ image_size: file.size,
+ ...(dimensions && {
+ image_dimensions: dimensions,
+ }),
+ });
+ } else if (/^audio\/.+/.test(file.type)) {
+ attachments.push({
+ ...attachment,
+ audio_url: fileUrl,
+ audio_type: file.type,
+ audio_size: file.size,
+ });
+ } else if (/^video\/.+/.test(file.type)) {
+ attachments.push({
+ ...attachment,
+ video_url: fileUrl,
+ video_type: file.type,
+ video_size: file.size,
+ });
+ } else {
+ attachments.push({
+ ...attachment,
+ size: file.size,
+ format: getFileExtension(file.name),
+ });
+ }
+
+ const files = [
+ {
+ _id,
+ name: file.name,
+ type: file.type,
+ size: file.size,
+ // "format": "png"
+ },
+ ];
+
+ return e2eRoom.encryptMessageContent({
+ attachments,
+ files,
+ file: files[0],
+ });
+ };
+
+ const fileContentData = {
+ type: file.type,
+ typeGroup: file.type.split('/')[0],
+ name: fileName,
+ encryption: {
+ key: encryptedFile.key,
+ iv: encryptedFile.iv,
+ },
+ hashes: {
+ sha256: encryptedFile.hash,
+ },
+ };
+
+ const fileContent = {
+ raw: fileContentData,
+ encrypted: await e2eRoom.encryptMessageContent(fileContentData),
+ };
+
+ uploadFile(
+ encryptedFile.file,
+ {
+ t: 'e2e',
+ },
+ getContent,
+ fileContent,
+ );
+ }
},
- invalidContentType: !(file.type && fileUploadIsValidContentType(file.type)),
+ invalidContentType: !fileUploadIsValidContentType(file?.type),
},
});
};
diff --git a/apps/meteor/client/lib/chats/uploads.ts b/apps/meteor/client/lib/chats/uploads.ts
index 2a06877807edb..8411a840c1d9b 100644
--- a/apps/meteor/client/lib/chats/uploads.ts
+++ b/apps/meteor/client/lib/chats/uploads.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
import { Emitter } from '@rocket.chat/emitter';
import { Random } from '@rocket.chat/random';
@@ -36,12 +36,16 @@ const send = async (
msg,
rid,
tmid,
+ t,
}: {
description?: string;
msg?: string;
rid: string;
tmid?: string;
+ t?: IMessage['t'];
},
+ getContent?: (fileId: string, fileUrl: string) => Promise,
+ fileContent?: { raw: Partial; encrypted: IE2EEMessage['content'] },
): Promise => {
const id = Random.id();
@@ -49,7 +53,7 @@ const send = async (
...uploads,
{
id,
- name: file.name,
+ name: fileContent?.raw.name || file.name,
percentage: 0,
},
]);
@@ -57,12 +61,12 @@ const send = async (
try {
await new Promise((resolve, reject) => {
const xhr = sdk.rest.upload(
- `/v1/rooms.upload/${rid}`,
+ `/v1/rooms.media/${rid}`,
{
- msg,
- tmid,
file,
- description,
+ ...(fileContent && {
+ content: JSON.stringify(fileContent.encrypted),
+ }),
},
{
load: (event) => {
@@ -109,6 +113,24 @@ const send = async (
},
);
+ xhr.onload = async () => {
+ if (xhr.readyState === xhr.DONE && xhr.status === 200) {
+ const result = JSON.parse(xhr.responseText);
+ let content;
+ if (getContent) {
+ content = await getContent(result.file._id, result.file.url);
+ }
+
+ await sdk.rest.post(`/v1/rooms.mediaConfirm/${rid}/${result.file._id}`, {
+ msg,
+ tmid,
+ description,
+ t,
+ content,
+ });
+ }
+ };
+
if (uploads.length) {
UserAction.performContinuously(rid, USER_ACTIVITIES.USER_UPLOADING, { tmid });
}
@@ -146,6 +168,10 @@ export const createUploadsAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid?: IMes
subscribe,
wipeFailedOnes,
cancel,
- send: (file: File, { description, msg }: { description?: string; msg?: string }): Promise =>
- send(file, { description, msg, rid, tmid }),
+ send: (
+ file: File,
+ { description, msg, t }: { description?: string; msg?: string; t?: IMessage['t'] },
+ getContent?: (fileId: string, fileUrl: string) => Promise,
+ fileContent?: { raw: Partial; encrypted: IE2EEMessage['content'] },
+ ): Promise => send(file, { description, msg, rid, tmid, t }, getContent, fileContent),
});
diff --git a/apps/meteor/client/lib/convertTimeUnit.spec.ts b/apps/meteor/client/lib/convertTimeUnit.spec.ts
new file mode 100644
index 0000000000000..e781d2d953a0f
--- /dev/null
+++ b/apps/meteor/client/lib/convertTimeUnit.spec.ts
@@ -0,0 +1,65 @@
+import { TIMEUNIT, timeUnitToMs, msToTimeUnit } from './convertTimeUnit';
+
+describe('timeUnitToMs function', () => {
+ it('should correctly convert days to milliseconds', () => {
+ expect(timeUnitToMs(TIMEUNIT.days, 1)).toBe(86400000);
+ expect(timeUnitToMs(TIMEUNIT.days, 2)).toBe(172800000);
+ expect(timeUnitToMs(TIMEUNIT.days, 0.5)).toBe(43200000);
+ });
+
+ it('should correctly convert hours to milliseconds', () => {
+ expect(timeUnitToMs(TIMEUNIT.hours, 1)).toBe(3600000);
+ expect(timeUnitToMs(TIMEUNIT.hours, 2)).toBe(7200000);
+ expect(timeUnitToMs(TIMEUNIT.hours, 0.5)).toBe(1800000);
+ });
+
+ it('should correctly convert minutes to milliseconds', () => {
+ expect(timeUnitToMs(TIMEUNIT.minutes, 1)).toBe(60000);
+ expect(timeUnitToMs(TIMEUNIT.minutes, 2)).toBe(120000);
+ expect(timeUnitToMs(TIMEUNIT.minutes, 0.5)).toBe(30000);
+ });
+
+ it('should throw an error for invalid time units', () => {
+ expect(() => timeUnitToMs('invalidUnit' as TIMEUNIT, 1)).toThrow('timeUnitToMs - invalid time unit');
+ });
+
+ it('should throw an error for invalid timespan', () => {
+ const errorMessage = 'timeUnitToMs - invalid timespan';
+ expect(() => timeUnitToMs(TIMEUNIT.days, NaN)).toThrow(errorMessage);
+ expect(() => timeUnitToMs(TIMEUNIT.days, Infinity)).toThrow(errorMessage);
+ expect(() => timeUnitToMs(TIMEUNIT.days, -Infinity)).toThrow(errorMessage);
+ expect(() => timeUnitToMs(TIMEUNIT.days, -1)).toThrow(errorMessage);
+ });
+});
+
+describe('msToTimeUnit function', () => {
+ it('should correctly convert milliseconds to days', () => {
+ expect(msToTimeUnit(TIMEUNIT.days, 86400000)).toBe(1); // 1 day
+ expect(msToTimeUnit(TIMEUNIT.days, 172800000)).toBe(2); // 2 days
+ expect(msToTimeUnit(TIMEUNIT.days, 43200000)).toBe(0.5); // .5 days
+ });
+
+ it('should correctly convert milliseconds to hours', () => {
+ expect(msToTimeUnit(TIMEUNIT.hours, 3600000)).toBe(1); // 1 hour
+ expect(msToTimeUnit(TIMEUNIT.hours, 7200000)).toBe(2); // 2 hours
+ expect(msToTimeUnit(TIMEUNIT.hours, 1800000)).toBe(0.5); // .5 hours
+ });
+
+ it('should correctly convert milliseconds to minutes', () => {
+ expect(msToTimeUnit(TIMEUNIT.minutes, 60000)).toBe(1); // 1 min
+ expect(msToTimeUnit(TIMEUNIT.minutes, 120000)).toBe(2); // 2 min
+ expect(msToTimeUnit(TIMEUNIT.minutes, 30000)).toBe(0.5); // .5 min
+ });
+
+ it('should throw an error for invalid time units', () => {
+ expect(() => msToTimeUnit('invalidUnit' as TIMEUNIT, 1)).toThrow('msToTimeUnit - invalid time unit');
+ });
+
+ it('should throw an error for invalid timespan', () => {
+ const errorMessage = 'msToTimeUnit - invalid timespan';
+ expect(() => msToTimeUnit(TIMEUNIT.days, NaN)).toThrow(errorMessage);
+ expect(() => msToTimeUnit(TIMEUNIT.days, Infinity)).toThrow(errorMessage);
+ expect(() => msToTimeUnit(TIMEUNIT.days, -Infinity)).toThrow(errorMessage);
+ expect(() => msToTimeUnit(TIMEUNIT.days, -1)).toThrow(errorMessage);
+ });
+});
diff --git a/apps/meteor/client/lib/convertTimeUnit.ts b/apps/meteor/client/lib/convertTimeUnit.ts
new file mode 100644
index 0000000000000..b19af29ee122b
--- /dev/null
+++ b/apps/meteor/client/lib/convertTimeUnit.ts
@@ -0,0 +1,58 @@
+export enum TIMEUNIT {
+ days = 'days',
+ hours = 'hours',
+ minutes = 'minutes',
+}
+
+export const isValidTimespan = (timespan: number): boolean => {
+ if (Number.isNaN(timespan)) {
+ return false;
+ }
+
+ if (!Number.isFinite(timespan)) {
+ return false;
+ }
+
+ if (timespan < 0) {
+ return false;
+ }
+
+ return true;
+};
+
+export const timeUnitToMs = (unit: TIMEUNIT, timespan: number) => {
+ if (!isValidTimespan(timespan)) {
+ throw new Error(`timeUnitToMs - invalid timespan:${timespan}`);
+ }
+
+ switch (unit) {
+ case TIMEUNIT.days:
+ return timespan * 24 * 60 * 60 * 1000;
+
+ case TIMEUNIT.hours:
+ return timespan * 60 * 60 * 1000;
+
+ case TIMEUNIT.minutes:
+ return timespan * 60 * 1000;
+
+ default:
+ throw new Error('timeUnitToMs - invalid time unit');
+ }
+};
+
+export const msToTimeUnit = (unit: TIMEUNIT, timespan: number) => {
+ if (!isValidTimespan(timespan)) {
+ throw new Error(`msToTimeUnit - invalid timespan:${timespan}`);
+ }
+
+ switch (unit) {
+ case TIMEUNIT.days:
+ return timespan / 24 / 60 / 60 / 1000;
+ case TIMEUNIT.hours:
+ return timespan / 60 / 60 / 1000;
+ case TIMEUNIT.minutes:
+ return timespan / 60 / 1000;
+ default:
+ throw new Error('msToTimeUnit - invalid time unit');
+ }
+};
diff --git a/apps/meteor/ee/client/lib/fetchFeatures.ts b/apps/meteor/client/lib/fetchFeatures.ts
similarity index 57%
rename from apps/meteor/ee/client/lib/fetchFeatures.ts
rename to apps/meteor/client/lib/fetchFeatures.ts
index 617fc9623e1a2..c481e8cf2f76d 100644
--- a/apps/meteor/ee/client/lib/fetchFeatures.ts
+++ b/apps/meteor/client/lib/fetchFeatures.ts
@@ -1,5 +1,5 @@
-import { CachedCollectionManager } from '../../../app/ui-cached-collection/client';
-import { sdk } from '../../../app/utils/client/lib/SDKClient';
+import { CachedCollectionManager } from '../../app/ui-cached-collection/client';
+import { sdk } from '../../app/utils/client/lib/SDKClient';
export const fetchFeatures = (): Promise =>
new Promise((resolve, reject) => {
diff --git a/apps/meteor/client/lib/getRoomTypeTranslation.ts b/apps/meteor/client/lib/getRoomTypeTranslation.ts
new file mode 100644
index 0000000000000..e0c8556bac367
--- /dev/null
+++ b/apps/meteor/client/lib/getRoomTypeTranslation.ts
@@ -0,0 +1,39 @@
+import {
+ isPublicRoom,
+ type IRoom,
+ isDirectMessageRoom,
+ isPrivateTeamRoom,
+ isPublicTeamRoom,
+ isPrivateDiscussion,
+ isPrivateRoom,
+} from '@rocket.chat/core-typings';
+
+import { t } from '../../app/utils/lib/i18n';
+
+export const getRoomTypeTranslation = (room: IRoom) => {
+ if (isPublicRoom(room)) {
+ return t('Channel');
+ }
+
+ if (isPrivateDiscussion(room)) {
+ return t('Private_Discussion');
+ }
+
+ if (isPrivateRoom(room)) {
+ return t('Private_Group');
+ }
+
+ if (isDirectMessageRoom(room)) {
+ return t('Direct_Message');
+ }
+
+ if (isPrivateTeamRoom(room)) {
+ return t('Teams_Private_Team');
+ }
+
+ if (isPublicTeamRoom(room)) {
+ return t('Teams_Public_Team');
+ }
+
+ return t('Room');
+};
diff --git a/apps/meteor/ee/client/lib/onToggledFeature.ts b/apps/meteor/client/lib/onToggledFeature.ts
similarity index 92%
rename from apps/meteor/ee/client/lib/onToggledFeature.ts
rename to apps/meteor/client/lib/onToggledFeature.ts
index 3f47b35bdbe2d..0147706869b60 100644
--- a/apps/meteor/ee/client/lib/onToggledFeature.ts
+++ b/apps/meteor/client/lib/onToggledFeature.ts
@@ -1,8 +1,8 @@
import type { LicenseModule } from '@rocket.chat/core-typings';
import { QueryObserver } from '@tanstack/react-query';
-import { queryClient } from '../../../client/lib/queryClient';
import { fetchFeatures } from './fetchFeatures';
+import { queryClient } from './queryClient';
export const onToggledFeature = (
feature: LicenseModule,
diff --git a/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts b/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts
index 41cbfed957506..0a1de5049e2bf 100644
--- a/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts
+++ b/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts
@@ -1,4 +1,4 @@
-import type { IMessage, ITranslatedMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
+import type { IMessage, ITranslatedMessage, MessageAttachment } from '@rocket.chat/core-typings';
import {
isFileAttachment,
isE2EEMessage,
@@ -56,21 +56,35 @@ export const parseMessageTextToAstMarkdown = <
};
};
-export const parseMessageQuoteAttachment = (
- quote: T,
+export const parseMessageAttachment = (
+ attachment: T,
parseOptions: Options,
autoTranslateOptions: { autoTranslateLanguage?: string; translated: boolean },
): T => {
const { translated, autoTranslateLanguage } = autoTranslateOptions;
- if (quote.attachments && quote.attachments?.length > 0) {
- quote.attachments = quote.attachments.map((attachment) => parseMessageQuoteAttachment(attachment, parseOptions, autoTranslateOptions));
+ if (!attachment.text && !attachment.description) {
+ return attachment;
}
- const text = (isTranslatedAttachment(quote) && autoTranslateLanguage && quote?.translations?.[autoTranslateLanguage]) || quote.text || '';
+ if (isQuoteAttachment(attachment) && attachment.attachments) {
+ attachment.attachments = parseMessageAttachments(attachment.attachments, parseOptions, autoTranslateOptions);
+ }
+
+ const text =
+ (isTranslatedAttachment(attachment) && autoTranslateLanguage && attachment?.translations?.[autoTranslateLanguage]) ||
+ attachment.text ||
+ attachment.description ||
+ '';
+
+ if (isFileAttachment(attachment) && attachment.description) {
+ attachment.descriptionMd = translated
+ ? textToMessageToken(text, parseOptions)
+ : attachment.descriptionMd ?? textToMessageToken(text, parseOptions);
+ }
return {
- ...quote,
- md: translated ? textToMessageToken(text, parseOptions) : quote.md ?? textToMessageToken(text, parseOptions),
+ ...attachment,
+ md: translated ? textToMessageToken(text, parseOptions) : attachment.md ?? textToMessageToken(text, parseOptions),
};
};
@@ -78,36 +92,7 @@ export const parseMessageAttachments = (
attachments: T[],
parseOptions: Options,
autoTranslateOptions: { autoTranslateLanguage?: string; translated: boolean },
-): T[] =>
- attachments.map((attachment) => {
- const { translated, autoTranslateLanguage } = autoTranslateOptions;
- if (!attachment.text && !attachment.description) {
- return attachment;
- }
-
- if (isQuoteAttachment(attachment) && attachment.attachments) {
- attachment.attachments = attachment.attachments.map((quoteAttachment) =>
- parseMessageQuoteAttachment(quoteAttachment, parseOptions, autoTranslateOptions),
- );
- }
-
- const text =
- (isTranslatedAttachment(attachment) && autoTranslateLanguage && attachment?.translations?.[autoTranslateLanguage]) ||
- attachment.text ||
- attachment.description ||
- '';
-
- if (isFileAttachment(attachment) && attachment.description) {
- attachment.descriptionMd = translated
- ? textToMessageToken(text, parseOptions)
- : attachment.descriptionMd ?? textToMessageToken(text, parseOptions);
- }
-
- return {
- ...attachment,
- md: translated ? textToMessageToken(text, parseOptions) : attachment.md ?? textToMessageToken(text, parseOptions),
- };
- });
+): T[] => attachments.map((attachment) => parseMessageAttachment(attachment, parseOptions, autoTranslateOptions));
const isNotNullOrUndefined = (value: unknown): boolean => value !== null && value !== undefined;
diff --git a/apps/meteor/ee/client/lib/voip/EEVoipClient.ts b/apps/meteor/client/lib/voip/EEVoipClient.ts
similarity index 97%
rename from apps/meteor/ee/client/lib/voip/EEVoipClient.ts
rename to apps/meteor/client/lib/voip/EEVoipClient.ts
index 6afa5b2a68354..5f3496ed317c5 100644
--- a/apps/meteor/ee/client/lib/voip/EEVoipClient.ts
+++ b/apps/meteor/client/lib/voip/EEVoipClient.ts
@@ -3,7 +3,7 @@ import { Operation, UserState } from '@rocket.chat/core-typings';
import { Inviter, UserAgent } from 'sip.js';
import type { IncomingResponse } from 'sip.js/lib/core';
-import { VoIPUser } from '../../../../client/lib/voip/VoIPUser';
+import { VoIPUser } from './VoIPUser';
export class EEVoipClient extends VoIPUser {
constructor(config: VoIPUserConfiguration, mediaRenderer?: IMediaStreamRenderer) {
diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts
index 0a35c44a10be9..d66b5bcec2de5 100644
--- a/apps/meteor/client/main.ts
+++ b/apps/meteor/client/main.ts
@@ -1,3 +1,4 @@
+import './serviceWorker';
import './startup/accounts';
import { FlowRouter } from 'meteor/kadira:flow-router';
@@ -10,8 +11,8 @@ FlowRouter.notFound = {
import('./polyfills')
.then(() => import('./meteorOverrides'))
- .then(() => import('../ee/client/ecdh'))
+ .then(() => import('./ecdh'))
.then(() => import('./importPackages'))
.then(() => Promise.all([import('./methods'), import('./startup')]))
- .then(() => import('../ee/client'))
+ .then(() => import('./omnichannel'))
.then(() => Promise.all([import('./views/admin'), import('./views/marketplace'), import('./views/account')]));
diff --git a/apps/meteor/client/methods/updateMessage.ts b/apps/meteor/client/methods/updateMessage.ts
index deb2878072c52..719a036f870c2 100644
--- a/apps/meteor/client/methods/updateMessage.ts
+++ b/apps/meteor/client/methods/updateMessage.ts
@@ -50,7 +50,7 @@ Meteor.methods({
}
const blockEditInMinutes = Number(settings.get('Message_AllowEditing_BlockEditInMinutes') as number | undefined);
- const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete');
+ const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete', message.rid);
if (!bypassBlockTimeLimit && blockEditInMinutes !== 0) {
if (originalMessage.ts) {
diff --git a/apps/meteor/ee/client/omnichannel/ContactManagerInfo.js b/apps/meteor/client/omnichannel/ContactManagerInfo.js
similarity index 67%
rename from apps/meteor/ee/client/omnichannel/ContactManagerInfo.js
rename to apps/meteor/client/omnichannel/ContactManagerInfo.js
index 282ecc2b423c9..d7272b901e26a 100644
--- a/apps/meteor/ee/client/omnichannel/ContactManagerInfo.js
+++ b/apps/meteor/client/omnichannel/ContactManagerInfo.js
@@ -2,11 +2,11 @@ import { css } from '@rocket.chat/css-in-js';
import { UserAvatar } from '@rocket.chat/ui-avatar';
import React, { useMemo } from 'react';
-import { UserStatus } from '../../../client/components/UserStatus';
-import { AsyncStatePhase } from '../../../client/hooks/useAsyncState';
-import { useEndpointData } from '../../../client/hooks/useEndpointData';
-import AgentInfoDetails from '../../../client/views/omnichannel/components/AgentInfoDetails';
-import Info from '../../../client/views/omnichannel/components/Info';
+import { UserStatus } from '../components/UserStatus';
+import { AsyncStatePhase } from '../hooks/useAsyncState';
+import { useEndpointData } from '../hooks/useEndpointData';
+import AgentInfoDetails from '../views/omnichannel/components/AgentInfoDetails';
+import Info from '../views/omnichannel/components/Info';
const wordBreak = css`
word-break: break-word;
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx
rename to apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.stories.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
similarity index 95%
rename from apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
rename to apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
index f5fc4838ba7ec..bba1fd135782a 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
@@ -5,7 +5,7 @@ import type { ComponentProps } from 'react';
import React from 'react';
import { Controller, useFormContext } from 'react-hook-form';
-import AutoCompleteDepartmentMultiple from '../../../../client/components/AutoCompleteDepartmentMultiple';
+import AutoCompleteDepartmentMultiple from '../../components/AutoCompleteDepartmentMultiple';
import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
const BusinessHoursMultiple = ({ className }: { className?: ComponentProps['className'] }) => {
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/ContactManager.js b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
similarity index 88%
rename from apps/meteor/ee/client/omnichannel/additionalForms/ContactManager.js
rename to apps/meteor/client/omnichannel/additionalForms/ContactManager.js
index 2b688378753d6..52ab527ef8411 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/ContactManager.js
+++ b/apps/meteor/client/omnichannel/additionalForms/ContactManager.js
@@ -2,7 +2,7 @@ import { Field } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React from 'react';
-import AutoCompleteAgent from '../../../../client/components/AutoCompleteAgent';
+import AutoCompleteAgent from '../../components/AutoCompleteAgent';
import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
export const ContactManager = ({ value: userId, handler }) => {
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/CurrentChatTags.tsx b/apps/meteor/client/omnichannel/additionalForms/CurrentChatTags.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/CurrentChatTags.tsx
rename to apps/meteor/client/omnichannel/additionalForms/CurrentChatTags.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx b/apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
rename to apps/meteor/client/omnichannel/additionalForms/CustomFieldsAdditionalForm.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx b/apps/meteor/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx
rename to apps/meteor/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/DepartmentForwarding.tsx b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
similarity index 91%
rename from apps/meteor/ee/client/omnichannel/additionalForms/DepartmentForwarding.tsx
rename to apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
index 4e99fee43acdb..47ee87f7ee2a8 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/DepartmentForwarding.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
@@ -5,9 +5,9 @@ import type { TranslationKey } from '@rocket.chat/ui-contexts';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React, { useMemo, useState } from 'react';
-import { useDepartmentsList } from '../../../../client/components/Omnichannel/hooks/useDepartmentsList';
-import { useRecordList } from '../../../../client/hooks/lists/useRecordList';
-import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
+import { useDepartmentsList } from '../../components/Omnichannel/hooks/useDepartmentsList';
+import { useRecordList } from '../../hooks/lists/useRecordList';
+import { AsyncStatePhase } from '../../hooks/useAsyncState';
import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
type DepartmentForwardingProps = {
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/EeNumberInput.tsx b/apps/meteor/client/omnichannel/additionalForms/EeNumberInput.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/EeNumberInput.tsx
rename to apps/meteor/client/omnichannel/additionalForms/EeNumberInput.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/EeTextAreaInput.tsx b/apps/meteor/client/omnichannel/additionalForms/EeTextAreaInput.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/EeTextAreaInput.tsx
rename to apps/meteor/client/omnichannel/additionalForms/EeTextAreaInput.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/EeTextInput.tsx b/apps/meteor/client/omnichannel/additionalForms/EeTextInput.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/EeTextInput.tsx
rename to apps/meteor/client/omnichannel/additionalForms/EeTextInput.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
rename to apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgent.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
similarity index 90%
rename from apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
rename to apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
index 286b1a344d3b9..91980f119316f 100644
--- a/apps/meteor/ee/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/MaxChatsPerAgentDisplay.tsx
@@ -1,7 +1,7 @@
import { useTranslation } from '@rocket.chat/ui-contexts';
import React from 'react';
-import UserInfo from '../../../../client/components/UserInfo';
+import UserInfo from '../../components/UserInfo';
import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
const MaxChatsPerAgentDisplay = ({ maxNumberSimultaneousChat = 0 }) => {
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/PrioritiesSelect.tsx b/apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/PrioritiesSelect.tsx
rename to apps/meteor/client/omnichannel/additionalForms/PrioritiesSelect.tsx
diff --git a/apps/meteor/ee/client/omnichannel/additionalForms/SlaPoliciesSelect.tsx b/apps/meteor/client/omnichannel/additionalForms/SlaPoliciesSelect.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/additionalForms/SlaPoliciesSelect.tsx
rename to apps/meteor/client/omnichannel/additionalForms/SlaPoliciesSelect.tsx
diff --git a/apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursRow.tsx b/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursRow.tsx
rename to apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx
index 0ab3a518075cb..fa6c9a40f1593 100644
--- a/apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursRow.tsx
+++ b/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx
@@ -5,7 +5,7 @@ import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
import type { KeyboardEvent } from 'react';
import React, { memo, useMemo } from 'react';
-import { GenericTableRow, GenericTableCell } from '../../../../client/components/GenericTable';
+import { GenericTableRow, GenericTableCell } from '../../components/GenericTable';
import { useRemoveBusinessHour } from './useRemoveBusinessHour';
const BusinessHoursRow = ({ _id, name, timezone, workHours, active, type }: Serialized) => {
diff --git a/apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursTable.stories.tsx b/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursTable.stories.tsx
rename to apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.stories.tsx
diff --git a/apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursTable.tsx b/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx
similarity index 90%
rename from apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursTable.tsx
rename to apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx
index 2da634cff9d50..6fddd95859d82 100644
--- a/apps/meteor/ee/client/omnichannel/businessHours/BusinessHoursTable.tsx
+++ b/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx
@@ -3,16 +3,16 @@ import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import React, { useMemo, useState } from 'react';
-import FilterByText from '../../../../client/components/FilterByText';
-import GenericNoResults from '../../../../client/components/GenericNoResults';
+import FilterByText from '../../components/FilterByText';
+import GenericNoResults from '../../components/GenericNoResults';
import {
GenericTable,
GenericTableBody,
GenericTableHeaderCell,
GenericTableHeader,
GenericTableLoadingRow,
-} from '../../../../client/components/GenericTable';
-import { usePagination } from '../../../../client/components/GenericTable/hooks/usePagination';
+} from '../../components/GenericTable';
+import { usePagination } from '../../components/GenericTable/hooks/usePagination';
import BusinessHoursRow from './BusinessHoursRow';
const BusinessHoursTable = () => {
diff --git a/apps/meteor/ee/client/omnichannel/businessHours/useRemoveBusinessHour.tsx b/apps/meteor/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
rename to apps/meteor/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
index f30cb75b2977d..626c541069461 100644
--- a/apps/meteor/ee/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
+++ b/apps/meteor/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
@@ -3,7 +3,7 @@ import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from
import { useQueryClient } from '@tanstack/react-query';
import React from 'react';
-import GenericModal from '../../../../client/components/GenericModal';
+import GenericModal from '../../components/GenericModal';
export const useRemoveBusinessHour = () => {
const t = useTranslation();
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
similarity index 98%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
index 3c903d5715182..28116cb26a13c 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
@@ -6,7 +6,7 @@ import { useQueryClient } from '@tanstack/react-query';
import React, { memo, useCallback } from 'react';
import { FormProvider, useForm } from 'react-hook-form';
-import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../../client/components/Page';
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../components/Page';
import CannedResponseForm from './components/cannedResponseForm';
import { useRemoveCannedResponse } from './useRemoveCannedResponse';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
index dd06afbcfa8dc..64cbe556db9cc 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
@@ -4,7 +4,7 @@ import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import React from 'react';
-import { FormSkeleton } from '../../../../client/components/Skeleton';
+import { FormSkeleton } from '../../components/Skeleton';
import CannedResponseEdit from './CannedResponseEdit';
import CannedResponseEditWithDepartmentData from './CannedResponseEditWithDepartmentData';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
similarity index 82%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
index 30f6639c054f6..90dd6bd4ed325 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
@@ -3,9 +3,9 @@ import { Callout } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React, { useMemo } from 'react';
-import { FormSkeleton } from '../../../../client/components/Skeleton';
-import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
-import { useEndpointData } from '../../../../client/hooks/useEndpointData';
+import { FormSkeleton } from '../../components/Skeleton';
+import { AsyncStatePhase } from '../../hooks/useAsyncState';
+import { useEndpointData } from '../../hooks/useEndpointData';
import CannedResponseEdit from './CannedResponseEdit';
const CannedResponseEditWithDepartmentData = ({ cannedResponseData }: { cannedResponseData: Serialized }) => {
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
similarity index 95%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
index fb379886318fc..4746e7df6bea3 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ChangeEvent } from 'react';
import React, { memo } from 'react';
-import AutoCompleteAgent from '../../../../client/components/AutoCompleteAgent';
+import AutoCompleteAgent from '../../components/AutoCompleteAgent';
type SharingValues = '' | 'user' | 'global' | 'department';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesPage.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
similarity index 92%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
index 9156cd7d678fc..f476868be27b9 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
@@ -2,7 +2,7 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage';
import { useRouteParameter, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
import React from 'react';
-import { Page, PageHeader, PageContent } from '../../../../client/components/Page';
+import { Page, PageHeader, PageContent } from '../../components/Page';
import CannedResponseEdit from './CannedResponseEdit';
import CannedResponseEditWithData from './CannedResponseEditWithData';
import CannedResponsesTable from './CannedResponsesTable';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
similarity index 83%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
index a0f49c14124bc..9e90ac015a46d 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
@@ -2,7 +2,7 @@ import { usePermission } from '@rocket.chat/ui-contexts';
import type { FC } from 'react';
import React from 'react';
-import NotAuthorizedPage from '../../../../client/views/notAuthorized/NotAuthorizedPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
import CannedResponsesPage from './CannedResponsesPage';
const CannedResponsesRoute: FC = () => {
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesTable.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
index dccef4dfdf092..8bf1d52e5ca97 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
@@ -5,7 +5,7 @@ import { useTranslation, usePermission, useToastMessageDispatch, useEndpoint, us
import { useQuery, hashQueryKey } from '@tanstack/react-query';
import React, { useMemo, useState } from 'react';
-import GenericNoResults from '../../../../client/components/GenericNoResults';
+import GenericNoResults from '../../components/GenericNoResults';
import {
GenericTable,
GenericTableBody,
@@ -14,10 +14,10 @@ import {
GenericTableLoadingRow,
GenericTableRow,
GenericTableCell,
-} from '../../../../client/components/GenericTable';
-import { usePagination } from '../../../../client/components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../client/components/GenericTable/hooks/useSort';
-import { useFormatDateAndTime } from '../../../../client/hooks/useFormatDateAndTime';
+} from '../../components/GenericTable';
+import { usePagination } from '../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../components/GenericTable/hooks/useSort';
+import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
import CannedResponseFilter from './CannedResponseFilter';
import { useRemoveCannedResponse } from './useRemoveCannedResponse';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.stories.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.stories.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
similarity index 96%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
index 087b2f3192ba6..0abc8d3bd203c 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
@@ -11,8 +11,8 @@ import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
import type { ComponentProps } from 'react';
import React, { memo, useCallback, useRef, useState } from 'react';
-import { Backdrop } from '../../../../../../client/components/Backdrop';
-import { useEmojiPicker } from '../../../../../../client/contexts/EmojiPickerContext';
+import { Backdrop } from '../../../../components/Backdrop';
+import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext';
import InsertPlaceholderDropdown from './InsertPlaceholderDropdown';
const CannedResponsesComposer = ({ onChange, ...props }: ComponentProps) => {
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposerPreview.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposerPreview.tsx
similarity index 87%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposerPreview.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposerPreview.tsx
index 840793db7e3cc..63dde93ac8d66 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposerPreview.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposerPreview.tsx
@@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import type { FC } from 'react';
import React, { memo } from 'react';
-import MarkdownText from '../../../../../../client/components/MarkdownText';
+import MarkdownText from '../../../../components/MarkdownText';
const CannedResponsesComposerPreview: FC<{ text: string }> = ({ text }) => {
const textM = text.split(/\n/).join(' \n');
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/InsertPlaceholderDropdown.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
similarity index 97%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
index e07c8e2898450..51c993d2542f3 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
@@ -5,8 +5,8 @@ import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
import React, { useState } from 'react';
import { useFormContext, Controller } from 'react-hook-form';
-import AutoCompleteDepartment from '../../../../../client/components/AutoCompleteDepartment';
-import Tags from '../../../../../client/components/Omnichannel/Tags';
+import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
+import Tags from '../../../components/Omnichannel/Tags';
import CannedResponsesComposer from './CannedResponsesComposer/CannedResponsesComposer';
import CannedResponsesComposerPreview from './CannedResponsesComposer/CannedResponsesComposerPreview';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.stories.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.stories.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
similarity index 98%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
index 90d6a4523cb7f..557d9672c027a 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx
@@ -11,7 +11,7 @@ import {
ContextualbarAction,
ContextualbarContent,
ContextualbarFooter,
-} from '../../../../../../client/components/Contextualbar';
+} from '../../../../components/Contextualbar';
import { useScopeDict } from '../../../hooks/useScopeDict';
const CannedResponse: FC<{
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
similarity index 96%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
index a27dc589fd78a..544502bda87fa 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
@@ -3,7 +3,7 @@ import { action } from '@storybook/addon-actions';
import type { ComponentMeta, ComponentStory } from '@storybook/react';
import React from 'react';
-import { Contextualbar } from '../../../../../../client/components/Contextualbar';
+import { Contextualbar } from '../../../../components/Contextualbar';
import CannedResponseList from './CannedResponseList';
export default {
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
index b9d3e57e31de1..cc1be1da33c8c 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
@@ -13,9 +13,9 @@ import {
ContextualbarContent,
ContextualbarInnerContent,
ContextualbarFooter,
-} from '../../../../../../client/components/Contextualbar';
-import { VirtuosoScrollbars } from '../../../../../../client/components/CustomScrollbars';
-import { useRoomToolbox } from '../../../../../../client/views/room/contexts/RoomToolboxContext';
+} from '../../../../components/Contextualbar';
+import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars';
+import { useRoomToolbox } from '../../../../views/room/contexts/RoomToolboxContext';
import Item from './Item';
import WrapCannedResponse from './WrapCannedResponse';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.stories.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.stories.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/Item.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
similarity index 82%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
index 25108d0954186..6fd0ee420dbf7 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
@@ -3,12 +3,12 @@ import { useSetModal, useRouter } from '@rocket.chat/ui-contexts';
import type { MouseEvent } from 'react';
import React, { memo, useCallback, useMemo, useState } from 'react';
-import { useRecordList } from '../../../../../../client/hooks/lists/useRecordList';
-import { useIsRoomOverMacLimit } from '../../../../../../client/hooks/omnichannel/useIsRoomOverMacLimit';
-import { AsyncStatePhase } from '../../../../../../client/lib/asyncState';
-import { useChat } from '../../../../../../client/views/room/contexts/ChatContext';
-import { useRoom } from '../../../../../../client/views/room/contexts/RoomContext';
-import { useRoomToolbox } from '../../../../../../client/views/room/contexts/RoomToolboxContext';
+import { useRecordList } from '../../../../hooks/lists/useRecordList';
+import { useIsRoomOverMacLimit } from '../../../../hooks/omnichannel/useIsRoomOverMacLimit';
+import { AsyncStatePhase } from '../../../../lib/asyncState';
+import { useChat } from '../../../../views/room/contexts/ChatContext';
+import { useRoom } from '../../../../views/room/contexts/RoomContext';
+import { useRoomToolbox } from '../../../../views/room/contexts/RoomToolboxContext';
import { useCannedResponseFilterOptions } from '../../../hooks/useCannedResponseFilterOptions';
import { useCannedResponseList } from '../../../hooks/useCannedResponseList';
import CreateCannedResponse from '../../modals/CreateCannedResponse';
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.stories.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx b/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
similarity index 97%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
index 15b65e6b42e39..9776564264cc5 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
@@ -4,7 +4,7 @@ import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.ch
import React, { memo, useCallback } from 'react';
import { FormProvider, useForm } from 'react-hook-form';
-import GenericModal from '../../../../../../client/components/GenericModal';
+import GenericModal from '../../../../components/GenericModal';
import CannedResponseForm from '../../components/cannedResponseForm';
const getInitialData = (
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/modals/CreateCannedResponse/index.tsx b/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/index.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/modals/CreateCannedResponse/index.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/index.tsx
diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
rename to apps/meteor/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
index 2d0f5f36ab28a..aa23533b3e72e 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
@@ -3,7 +3,7 @@ import { useSetModal, useToastMessageDispatch, useRouter, useMethod, useTranslat
import { useQueryClient } from '@tanstack/react-query';
import React from 'react';
-import GenericModal from '../../../../client/components/GenericModal';
+import GenericModal from '../../components/GenericModal';
export const useRemoveCannedResponse = () => {
const t = useTranslation();
diff --git a/apps/meteor/ee/client/omnichannel/components/RoomActivityIcon/index.tsx b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
similarity index 86%
rename from apps/meteor/ee/client/omnichannel/components/RoomActivityIcon/index.tsx
rename to apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
index 5db68f559fdb4..749f40d28a604 100644
--- a/apps/meteor/ee/client/omnichannel/components/RoomActivityIcon/index.tsx
+++ b/apps/meteor/client/omnichannel/components/RoomActivityIcon/index.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';
-import { useIsRoomOverMacLimit } from '../../../../../client/hooks/omnichannel/useIsRoomOverMacLimit';
+import { useIsRoomOverMacLimit } from '../../../hooks/omnichannel/useIsRoomOverMacLimit';
type RoomActivityIconProps = {
room: IOmnichannelRoom;
diff --git a/apps/meteor/ee/client/omnichannel/hooks/useCannedResponseFilterOptions.ts b/apps/meteor/client/omnichannel/hooks/useCannedResponseFilterOptions.ts
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/hooks/useCannedResponseFilterOptions.ts
rename to apps/meteor/client/omnichannel/hooks/useCannedResponseFilterOptions.ts
diff --git a/apps/meteor/ee/client/omnichannel/hooks/useCannedResponseList.ts b/apps/meteor/client/omnichannel/hooks/useCannedResponseList.ts
similarity index 88%
rename from apps/meteor/ee/client/omnichannel/hooks/useCannedResponseList.ts
rename to apps/meteor/client/omnichannel/hooks/useCannedResponseList.ts
index 4f4e60e0f30a7..6e02f302e3e19 100644
--- a/apps/meteor/ee/client/omnichannel/hooks/useCannedResponseList.ts
+++ b/apps/meteor/client/omnichannel/hooks/useCannedResponseList.ts
@@ -1,9 +1,9 @@
import { useEndpoint } from '@rocket.chat/ui-contexts';
import { useCallback, useEffect, useState } from 'react';
-import { useScrollableRecordList } from '../../../../client/hooks/lists/useScrollableRecordList';
-import { useComponentDidUpdate } from '../../../../client/hooks/useComponentDidUpdate';
-import { CannedResponseList } from '../../../../client/lib/lists/CannedResponseList';
+import { useScrollableRecordList } from '../../hooks/lists/useScrollableRecordList';
+import { useComponentDidUpdate } from '../../hooks/useComponentDidUpdate';
+import { CannedResponseList } from '../../lib/lists/CannedResponseList';
export const useCannedResponseList = (
options: any,
diff --git a/apps/meteor/client/omnichannel/hooks/useOmnichannelPriorities.ts b/apps/meteor/client/omnichannel/hooks/useOmnichannelPriorities.ts
new file mode 100644
index 0000000000000..9552a750e55b5
--- /dev/null
+++ b/apps/meteor/client/omnichannel/hooks/useOmnichannelPriorities.ts
@@ -0,0 +1,3 @@
+import { useOmnichannel } from '../../hooks/omnichannel/useOmnichannel';
+
+export const useOmnichannelPriorities = () => useOmnichannel().livechatPriorities;
diff --git a/apps/meteor/ee/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
similarity index 97%
rename from apps/meteor/ee/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
rename to apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
index ebfa9bf08a0be..2a99f6f1fada9 100644
--- a/apps/meteor/ee/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
+++ b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
@@ -6,7 +6,7 @@ import { useQueryClient } from '@tanstack/react-query';
import type { ComponentProps } from 'react';
import React, { useCallback, useMemo } from 'react';
-import { dispatchToastMessage } from '../../../../client/lib/toast';
+import { dispatchToastMessage } from '../../lib/toast';
import { PriorityIcon } from '../priorities/PriorityIcon';
import { useOmnichannelPriorities } from './useOmnichannelPriorities';
diff --git a/apps/meteor/ee/client/omnichannel/hooks/useScopeDict.ts b/apps/meteor/client/omnichannel/hooks/useScopeDict.ts
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/hooks/useScopeDict.ts
rename to apps/meteor/client/omnichannel/hooks/useScopeDict.ts
diff --git a/apps/meteor/ee/client/omnichannel/index.ts b/apps/meteor/client/omnichannel/index.ts
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/index.ts
rename to apps/meteor/client/omnichannel/index.ts
diff --git a/apps/meteor/ee/client/omnichannel/monitors/MonitorsPage.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
similarity index 82%
rename from apps/meteor/ee/client/omnichannel/monitors/MonitorsPage.tsx
rename to apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
index 4574f74bb2b71..dffbde494e7a2 100644
--- a/apps/meteor/ee/client/omnichannel/monitors/MonitorsPage.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
@@ -1,7 +1,7 @@
import { useTranslation } from '@rocket.chat/ui-contexts';
import React from 'react';
-import { Page, PageHeader, PageContent } from '../../../../client/components/Page';
+import { Page, PageHeader, PageContent } from '../../components/Page';
import MonitorsTable from './MonitorsTable';
const MonitorsPage = () => {
diff --git a/apps/meteor/ee/client/omnichannel/monitors/MonitorsPageContainer.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx
similarity index 72%
rename from apps/meteor/ee/client/omnichannel/monitors/MonitorsPageContainer.tsx
rename to apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx
index ce27ae47ae8c7..b86f8a1ced2cb 100644
--- a/apps/meteor/ee/client/omnichannel/monitors/MonitorsPageContainer.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx
@@ -1,8 +1,8 @@
import React from 'react';
-import PageSkeleton from '../../../../client/components/PageSkeleton';
-import NotAuthorizedPage from '../../../../client/views/notAuthorized/NotAuthorizedPage';
+import PageSkeleton from '../../components/PageSkeleton';
import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
import MonitorsPage from './MonitorsPage';
const MonitorsPageContainer = () => {
diff --git a/apps/meteor/ee/client/omnichannel/monitors/MonitorsTable.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
similarity index 91%
rename from apps/meteor/ee/client/omnichannel/monitors/MonitorsTable.tsx
rename to apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
index 6a99ae93340d9..a67057b9add16 100644
--- a/apps/meteor/ee/client/omnichannel/monitors/MonitorsTable.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
@@ -17,9 +17,9 @@ import { useTranslation, useToastMessageDispatch, useMethod, useEndpoint, useSet
import { useMutation, useQuery, hashQueryKey } from '@tanstack/react-query';
import React, { useMemo, useState } from 'react';
-import FilterByText from '../../../../client/components/FilterByText';
-import GenericModal from '../../../../client/components/GenericModal';
-import GenericNoResults from '../../../../client/components/GenericNoResults';
+import FilterByText from '../../components/FilterByText';
+import GenericModal from '../../components/GenericModal';
+import GenericNoResults from '../../components/GenericNoResults';
import {
GenericTable,
GenericTableBody,
@@ -28,11 +28,11 @@ import {
GenericTableHeaderCell,
GenericTableLoadingTable,
GenericTableRow,
-} from '../../../../client/components/GenericTable';
-import { usePagination } from '../../../../client/components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../client/components/GenericTable/hooks/useSort';
-import UserAutoComplete from '../../../../client/components/UserAutoComplete';
-import { queryClient } from '../../../../client/lib/queryClient';
+} from '../../components/GenericTable';
+import { usePagination } from '../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../components/GenericTable/hooks/useSort';
+import UserAutoComplete from '../../components/UserAutoComplete';
+import { queryClient } from '../../lib/queryClient';
const MonitorsTable = () => {
const t = useTranslation();
diff --git a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesPage.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx
similarity index 97%
rename from apps/meteor/ee/client/omnichannel/priorities/PrioritiesPage.tsx
rename to apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx
index 8b87d0f811e34..fe694c1de8515 100644
--- a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesPage.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx
@@ -5,7 +5,7 @@ import { useQueryClient } from '@tanstack/react-query';
import type { ReactElement } from 'react';
import React, { useMemo, useState } from 'react';
-import { Page, PageHeader, PageContent } from '../../../../client/components/Page';
+import { Page, PageHeader, PageContent } from '../../components/Page';
import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities';
import { PrioritiesResetModal } from './PrioritiesResetModal';
import { PrioritiesTable } from './PrioritiesTable';
diff --git a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesResetModal.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
similarity index 89%
rename from apps/meteor/ee/client/omnichannel/priorities/PrioritiesResetModal.tsx
rename to apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
index 0fdbd34f66aa3..a85dd72c868d6 100644
--- a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesResetModal.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesResetModal.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';
-import GenericModal from '../../../../client/components/GenericModal';
+import GenericModal from '../../components/GenericModal';
type PrioritiesResetModalProps = {
onReset: () => Promise;
diff --git a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesRoute.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx
similarity index 86%
rename from apps/meteor/ee/client/omnichannel/priorities/PrioritiesRoute.tsx
rename to apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx
index 7a7f6cafdb17e..fd3b73a3f4a5e 100644
--- a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesRoute.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx
@@ -2,7 +2,7 @@ import { usePermission, useRouteParameter } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';
-import NotAuthorizedPage from '../../../../client/views/notAuthorized/NotAuthorizedPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
import { PrioritiesPage } from './PrioritiesPage';
const PrioritiesRoute = (): ReactElement => {
diff --git a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesTable.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
similarity index 93%
rename from apps/meteor/ee/client/omnichannel/priorities/PrioritiesTable.tsx
rename to apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
index 84c3051b6aea1..7e5368d7a0a55 100644
--- a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesTable.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';
-import GenericNoResults from '../../../../client/components/GenericNoResults';
+import GenericNoResults from '../../components/GenericNoResults';
import {
GenericTable,
GenericTableHeaderCell,
@@ -12,7 +12,7 @@ import {
GenericTableHeader,
GenericTableBody,
GenericTableLoadingTable,
-} from '../../../../client/components/GenericTable';
+} from '../../components/GenericTable';
import { PriorityIcon } from './PriorityIcon';
type PrioritiesTableProps = {
diff --git a/apps/meteor/ee/client/omnichannel/priorities/PriorityEditForm.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
similarity index 96%
rename from apps/meteor/ee/client/omnichannel/priorities/PriorityEditForm.tsx
rename to apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
index c39916369f5dc..d67f637a2b4e1 100644
--- a/apps/meteor/ee/client/omnichannel/priorities/PriorityEditForm.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
@@ -7,7 +7,7 @@ import type { ReactElement } from 'react';
import React, { useState } from 'react';
import { Controller, useForm } from 'react-hook-form';
-import StringSettingInput from '../../../../client/views/admin/settings/inputs/StringSettingInput';
+import StringSettingInput from '../../views/admin/settings/inputs/StringSettingInput';
export type PriorityFormData = { name: string; reset: boolean };
@@ -81,6 +81,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
render={({ field: { value, onChange } }): ReactElement => (
void }) => {
const t = useTranslation();
diff --git a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaEdit.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
similarity index 97%
rename from apps/meteor/ee/client/omnichannel/slaPolicies/SlaEdit.tsx
rename to apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
index 83f2c4a36e72d..0b4ab02791da9 100644
--- a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaEdit.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
@@ -6,7 +6,7 @@ import type { ReactElement } from 'react';
import React from 'react';
import { useController, useForm } from 'react-hook-form';
-import { ContextualbarScrollableContent } from '../../../../client/components/Contextualbar';
+import { ContextualbarScrollableContent } from '../../components/Contextualbar';
type SlaEditProps = {
isNew?: boolean;
diff --git a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaEditWithData.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx
similarity index 92%
rename from apps/meteor/ee/client/omnichannel/slaPolicies/SlaEditWithData.tsx
rename to apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx
index 8a86255fa86b4..079e663f19c4b 100644
--- a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx
@@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query';
import type { ReactElement } from 'react';
import React from 'react';
-import { FormSkeleton } from '../../../../client/components/Skeleton';
+import { FormSkeleton } from '../../components/Skeleton';
import SlaEdit from './SlaEdit';
type SlaEditProps = {
diff --git a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaNew.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaNew.tsx
similarity index 100%
rename from apps/meteor/ee/client/omnichannel/slaPolicies/SlaNew.tsx
rename to apps/meteor/client/omnichannel/slaPolicies/SlaNew.tsx
diff --git a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaPage.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx
similarity index 93%
rename from apps/meteor/ee/client/omnichannel/slaPolicies/SlaPage.tsx
rename to apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx
index cda40b7418680..7cbca605b712b 100644
--- a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaPage.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx
@@ -9,8 +9,8 @@ import {
ContextualbarHeader,
ContextualbarClose,
ContextualbarDialog,
-} from '../../../../client/components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../../client/components/Page';
+} from '../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../components/Page';
import SlaEditWithData from './SlaEditWithData';
import SlaNew from './SlaNew';
import SlaTable from './SlaTable';
diff --git a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaRoute.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx
similarity index 77%
rename from apps/meteor/ee/client/omnichannel/slaPolicies/SlaRoute.tsx
rename to apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx
index 792fae8946d93..081c33fe3260f 100644
--- a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaRoute.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx
@@ -1,7 +1,7 @@
import { usePermission } from '@rocket.chat/ui-contexts';
import React from 'react';
-import NotAuthorizedPage from '../../../../client/views/notAuthorized/NotAuthorizedPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
import SlaPage from './SlaPage';
const SlaRoute = () => {
diff --git a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaTable.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx
similarity index 91%
rename from apps/meteor/ee/client/omnichannel/slaPolicies/SlaTable.tsx
rename to apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx
index 0a07f7468f014..d550118a5017d 100644
--- a/apps/meteor/ee/client/omnichannel/slaPolicies/SlaTable.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx
@@ -5,8 +5,8 @@ import { useQuery, hashQueryKey } from '@tanstack/react-query';
import type { MutableRefObject } from 'react';
import React, { useMemo, useState, useEffect } from 'react';
-import FilterByText from '../../../../client/components/FilterByText';
-import GenericNoResults from '../../../../client/components/GenericNoResults/GenericNoResults';
+import FilterByText from '../../components/FilterByText';
+import GenericNoResults from '../../components/GenericNoResults/GenericNoResults';
import {
GenericTable,
GenericTableHeaderCell,
@@ -15,9 +15,9 @@ import {
GenericTableBody,
GenericTableRow,
GenericTableCell,
-} from '../../../../client/components/GenericTable';
-import { usePagination } from '../../../../client/components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../client/components/GenericTable/hooks/useSort';
+} from '../../components/GenericTable';
+import { usePagination } from '../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../components/GenericTable/hooks/useSort';
import RemoveSlaButton from './RemoveSlaButton';
const SlaTable = ({ reload }: { reload: MutableRefObject<() => void> }) => {
diff --git a/apps/meteor/ee/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
similarity index 92%
rename from apps/meteor/ee/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
rename to apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
index f0baca991e2e6..9f0a210868686 100644
--- a/apps/meteor/ee/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
+++ b/apps/meteor/client/omnichannel/tags/AutoCompleteTagsMultiple.tsx
@@ -4,8 +4,8 @@ import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React, { memo, useMemo, useState } from 'react';
-import { useRecordList } from '../../../../client/hooks/lists/useRecordList';
-import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
+import { useRecordList } from '../../hooks/lists/useRecordList';
+import { AsyncStatePhase } from '../../hooks/useAsyncState';
import { useTagsList } from '../../hooks/useTagsList';
type AutoCompleteTagsMultipleProps = {
diff --git a/apps/meteor/ee/client/omnichannel/tags/TagEdit.tsx b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
similarity index 96%
rename from apps/meteor/ee/client/omnichannel/tags/TagEdit.tsx
rename to apps/meteor/client/omnichannel/tags/TagEdit.tsx
index cd423c60b4bff..767b56e916751 100644
--- a/apps/meteor/ee/client/omnichannel/tags/TagEdit.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
@@ -6,7 +6,7 @@ import { useQueryClient } from '@tanstack/react-query';
import React from 'react';
import { useForm, Controller } from 'react-hook-form';
-import AutoCompleteDepartmentMultiple from '../../../../client/components/AutoCompleteDepartmentMultiple';
+import AutoCompleteDepartmentMultiple from '../../components/AutoCompleteDepartmentMultiple';
import {
ContextualbarScrollableContent,
ContextualbarFooter,
@@ -14,7 +14,7 @@ import {
Contextualbar,
ContextualbarHeader,
ContextualbarClose,
-} from '../../../../client/components/Contextualbar';
+} from '../../components/Contextualbar';
import { useRemoveTag } from './useRemoveTag';
type TagEditPayload = {
diff --git a/apps/meteor/ee/client/omnichannel/tags/TagEditWithData.tsx b/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx
similarity index 92%
rename from apps/meteor/ee/client/omnichannel/tags/TagEditWithData.tsx
rename to apps/meteor/client/omnichannel/tags/TagEditWithData.tsx
index 95a902055ed60..ae9a3259af4ad 100644
--- a/apps/meteor/ee/client/omnichannel/tags/TagEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx
@@ -4,7 +4,7 @@ import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import React from 'react';
-import { ContextualbarSkeleton } from '../../../../client/components/Contextualbar';
+import { ContextualbarSkeleton } from '../../components/Contextualbar';
import TagEdit from './TagEdit';
import TagEditWithDepartmentData from './TagEditWithDepartmentData';
diff --git a/apps/meteor/ee/client/omnichannel/tags/TagEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx
similarity index 92%
rename from apps/meteor/ee/client/omnichannel/tags/TagEditWithDepartmentData.tsx
rename to apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx
index 4a65c31263c2f..ce4707417d1e9 100644
--- a/apps/meteor/ee/client/omnichannel/tags/TagEditWithDepartmentData.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx
@@ -4,7 +4,7 @@ import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import React from 'react';
-import { ContextualbarSkeleton } from '../../../../client/components/Contextualbar';
+import { ContextualbarSkeleton } from '../../components/Contextualbar';
import TagEdit from './TagEdit';
const TagEditWithDepartmentData = ({ tagData }: { tagData: ILivechatTag }) => {
diff --git a/apps/meteor/ee/client/omnichannel/tags/TagsPage.tsx b/apps/meteor/client/omnichannel/tags/TagsPage.tsx
similarity index 85%
rename from apps/meteor/ee/client/omnichannel/tags/TagsPage.tsx
rename to apps/meteor/client/omnichannel/tags/TagsPage.tsx
index 63934c95e945b..add1c64531d9e 100644
--- a/apps/meteor/ee/client/omnichannel/tags/TagsPage.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagsPage.tsx
@@ -2,8 +2,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage';
import { useRouter, useTranslation, useRouteParameter } from '@rocket.chat/ui-contexts';
import React from 'react';
-import { ContextualbarDialog } from '../../../../client/components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../../client/components/Page';
+import { ContextualbarDialog } from '../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../components/Page';
import TagEdit from './TagEdit';
import TagEditWithData from './TagEditWithData';
import TagsTable from './TagsTable';
diff --git a/apps/meteor/ee/client/omnichannel/tags/TagsRoute.tsx b/apps/meteor/client/omnichannel/tags/TagsRoute.tsx
similarity index 77%
rename from apps/meteor/ee/client/omnichannel/tags/TagsRoute.tsx
rename to apps/meteor/client/omnichannel/tags/TagsRoute.tsx
index 4860b0aeab542..11f3e4348a0bb 100644
--- a/apps/meteor/ee/client/omnichannel/tags/TagsRoute.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagsRoute.tsx
@@ -1,7 +1,7 @@
import { usePermission } from '@rocket.chat/ui-contexts';
import React from 'react';
-import NotAuthorizedPage from '../../../../client/views/notAuthorized/NotAuthorizedPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
import TagsPage from './TagsPage';
const TagsRoute = () => {
diff --git a/apps/meteor/ee/client/omnichannel/tags/TagsTable.tsx b/apps/meteor/client/omnichannel/tags/TagsTable.tsx
similarity index 91%
rename from apps/meteor/ee/client/omnichannel/tags/TagsTable.tsx
rename to apps/meteor/client/omnichannel/tags/TagsTable.tsx
index ce89fe2d764b6..3b9757134bedd 100644
--- a/apps/meteor/ee/client/omnichannel/tags/TagsTable.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagsTable.tsx
@@ -4,8 +4,8 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts
import { useQuery, hashQueryKey } from '@tanstack/react-query';
import React, { useMemo, useState } from 'react';
-import FilterByText from '../../../../client/components/FilterByText';
-import GenericNoResults from '../../../../client/components/GenericNoResults';
+import FilterByText from '../../components/FilterByText';
+import GenericNoResults from '../../components/GenericNoResults';
import {
GenericTable,
GenericTableRow,
@@ -14,9 +14,9 @@ import {
GenericTableHeaderCell,
GenericTableBody,
GenericTableLoadingRow,
-} from '../../../../client/components/GenericTable';
-import { usePagination } from '../../../../client/components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../client/components/GenericTable/hooks/useSort';
+} from '../../components/GenericTable';
+import { usePagination } from '../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../components/GenericTable/hooks/useSort';
import { useRemoveTag } from './useRemoveTag';
const TagsTable = () => {
diff --git a/apps/meteor/ee/client/omnichannel/tags/useRemoveTag.tsx b/apps/meteor/client/omnichannel/tags/useRemoveTag.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/tags/useRemoveTag.tsx
rename to apps/meteor/client/omnichannel/tags/useRemoveTag.tsx
index d1a5c60968907..31c3a910c7ea8 100644
--- a/apps/meteor/ee/client/omnichannel/tags/useRemoveTag.tsx
+++ b/apps/meteor/client/omnichannel/tags/useRemoveTag.tsx
@@ -3,7 +3,7 @@ import { useSetModal, useToastMessageDispatch, useRouter, useMethod, useTranslat
import { useQueryClient } from '@tanstack/react-query';
import React from 'react';
-import GenericModal from '../../../../client/components/GenericModal';
+import GenericModal from '../../components/GenericModal';
export const useRemoveTag = () => {
const t = useTranslation();
diff --git a/apps/meteor/ee/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
similarity index 96%
rename from apps/meteor/ee/client/omnichannel/units/UnitEdit.tsx
rename to apps/meteor/client/omnichannel/units/UnitEdit.tsx
index b618d2eac89e3..e4bc1c0efb505 100644
--- a/apps/meteor/ee/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -27,11 +27,11 @@ import {
Contextualbar,
ContextualbarHeader,
ContextualbarClose,
-} from '../../../../client/components/Contextualbar';
-import { useRecordList } from '../../../../client/hooks/lists/useRecordList';
-import { AsyncStatePhase } from '../../../../client/hooks/useAsyncState';
-import { useDepartmentsByUnitsList } from '../../../../client/views/hooks/useDepartmentsByUnitsList';
-import { useMonitorsList } from '../../../../client/views/hooks/useMonitorsList';
+} from '../../components/Contextualbar';
+import { useRecordList } from '../../hooks/lists/useRecordList';
+import { AsyncStatePhase } from '../../hooks/useAsyncState';
+import { useDepartmentsByUnitsList } from '../../views/hooks/useDepartmentsByUnitsList';
+import { useMonitorsList } from '../../views/hooks/useMonitorsList';
import { useRemoveUnit } from './useRemoveUnit';
type UnitEditProps = {
diff --git a/apps/meteor/ee/client/omnichannel/units/UnitEditWithData.tsx b/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx
similarity index 95%
rename from apps/meteor/ee/client/omnichannel/units/UnitEditWithData.tsx
rename to apps/meteor/client/omnichannel/units/UnitEditWithData.tsx
index 6f30453f62dc3..127c81c30032f 100644
--- a/apps/meteor/ee/client/omnichannel/units/UnitEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx
@@ -4,7 +4,7 @@ import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import React from 'react';
-import { ContextualbarSkeleton } from '../../../../client/components/Contextualbar';
+import { ContextualbarSkeleton } from '../../components/Contextualbar';
import UnitEdit from './UnitEdit';
const UnitEditWithData = ({ unitId }: { unitId: IOmnichannelBusinessUnit['_id'] }) => {
diff --git a/apps/meteor/ee/client/omnichannel/units/UnitsPage.tsx b/apps/meteor/client/omnichannel/units/UnitsPage.tsx
similarity index 86%
rename from apps/meteor/ee/client/omnichannel/units/UnitsPage.tsx
rename to apps/meteor/client/omnichannel/units/UnitsPage.tsx
index b3d900830e2f4..190c22991fb53 100644
--- a/apps/meteor/ee/client/omnichannel/units/UnitsPage.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitsPage.tsx
@@ -2,8 +2,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage';
import { useTranslation, useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
import React from 'react';
-import { ContextualbarDialog } from '../../../../client/components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../../client/components/Page';
+import { ContextualbarDialog } from '../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../components/Page';
import UnitEdit from './UnitEdit';
import UnitEditWithData from './UnitEditWithData';
import UnitsTable from './UnitsTable';
diff --git a/apps/meteor/ee/client/omnichannel/units/UnitsRoute.tsx b/apps/meteor/client/omnichannel/units/UnitsRoute.tsx
similarity index 84%
rename from apps/meteor/ee/client/omnichannel/units/UnitsRoute.tsx
rename to apps/meteor/client/omnichannel/units/UnitsRoute.tsx
index 9afa82c171be1..9490fd2d2048e 100644
--- a/apps/meteor/ee/client/omnichannel/units/UnitsRoute.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitsRoute.tsx
@@ -1,8 +1,8 @@
import { usePermission } from '@rocket.chat/ui-contexts';
import React from 'react';
-import NotAuthorizedPage from '../../../../client/views/notAuthorized/NotAuthorizedPage';
import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
import UnitsPage from './UnitsPage';
const UnitsRoute = () => {
diff --git a/apps/meteor/ee/client/omnichannel/units/UnitsTable.tsx b/apps/meteor/client/omnichannel/units/UnitsTable.tsx
similarity index 91%
rename from apps/meteor/ee/client/omnichannel/units/UnitsTable.tsx
rename to apps/meteor/client/omnichannel/units/UnitsTable.tsx
index c88fb4ce4c677..fe95bc90d8a20 100644
--- a/apps/meteor/ee/client/omnichannel/units/UnitsTable.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitsTable.tsx
@@ -4,8 +4,8 @@ import { useEndpoint, useRouter, useTranslation } from '@rocket.chat/ui-contexts
import { useQuery, hashQueryKey } from '@tanstack/react-query';
import React, { useMemo, useState } from 'react';
-import FilterByText from '../../../../client/components/FilterByText';
-import GenericNoResults from '../../../../client/components/GenericNoResults/GenericNoResults';
+import FilterByText from '../../components/FilterByText';
+import GenericNoResults from '../../components/GenericNoResults/GenericNoResults';
import {
GenericTable,
GenericTableHeader,
@@ -14,9 +14,9 @@ import {
GenericTableCell,
GenericTableLoadingRow,
GenericTableRow,
-} from '../../../../client/components/GenericTable';
-import { usePagination } from '../../../../client/components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../client/components/GenericTable/hooks/useSort';
+} from '../../components/GenericTable';
+import { usePagination } from '../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../components/GenericTable/hooks/useSort';
import { useRemoveUnit } from './useRemoveUnit';
const UnitsTable = () => {
diff --git a/apps/meteor/ee/client/omnichannel/units/useRemoveUnit.tsx b/apps/meteor/client/omnichannel/units/useRemoveUnit.tsx
similarity index 94%
rename from apps/meteor/ee/client/omnichannel/units/useRemoveUnit.tsx
rename to apps/meteor/client/omnichannel/units/useRemoveUnit.tsx
index 61910dc37bc41..48eca28eb833f 100644
--- a/apps/meteor/ee/client/omnichannel/units/useRemoveUnit.tsx
+++ b/apps/meteor/client/omnichannel/units/useRemoveUnit.tsx
@@ -3,7 +3,7 @@ import { useSetModal, useToastMessageDispatch, useMethod, useTranslation, useRou
import { useQueryClient } from '@tanstack/react-query';
import React from 'react';
-import GenericModal from '../../../../client/components/GenericModal';
+import GenericModal from '../../components/GenericModal';
export const useRemoveUnit = () => {
const t = useTranslation();
diff --git a/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts b/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts
new file mode 100644
index 0000000000000..8210fe22eec53
--- /dev/null
+++ b/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts
@@ -0,0 +1,39 @@
+import type { App } from '@rocket.chat/core-typings';
+import type { UseQueryResult } from '@tanstack/react-query';
+
+import { createFakeApp } from '../../../tests/mocks/data';
+import { createFakeAppInstalledMarketplace, createFakeAppPrivate } from '../../../tests/mocks/data/marketplace';
+import { storeQueryFunction } from './storeQueryFunction';
+
+describe(`when an app installed from the Marketplace, but has since been unpublished`, () => {
+ it(`should still be present in the installed app data provided`, () => {
+ const marketplaceMockQuery = {
+ data: [createFakeApp({ id: 'marketplace-1' }), createFakeAppInstalledMarketplace({ id: 'marketplace-2' })],
+ isFetched: true,
+ } as unknown as UseQueryResult;
+
+ const instanceMockQuery = {
+ data: [
+ marketplaceMockQuery.data?.[1],
+ createFakeAppInstalledMarketplace({ id: 'marketplace-3' }), // This app has been installed via Marketplace but has been unpublished since
+ createFakeAppPrivate({ id: 'private-1' }),
+ ],
+ isFetched: true,
+ } as unknown as UseQueryResult;
+
+ const [marketplaceList, installedList, privateList] = storeQueryFunction(marketplaceMockQuery, instanceMockQuery);
+
+ expect(marketplaceList.find((app) => app.id === 'marketplace-1')).toBeTruthy();
+ expect(marketplaceList.find((app) => app.id === 'marketplace-2')).toBeTruthy();
+ expect(marketplaceList.find((app) => app.id === 'marketplace-3')).toBeUndefined();
+ expect(marketplaceList).toHaveLength(2);
+
+ expect(installedList.find((app) => app.id === 'marketplace-1')).toBeUndefined();
+ expect(installedList.find((app) => app.id === 'marketplace-2')).toBeTruthy();
+ expect(installedList.find((app) => app.id === 'marketplace-3')).toBeTruthy();
+ expect(installedList).toHaveLength(2);
+
+ expect(privateList.find((app) => app.id === 'private-1')).toBeTruthy();
+ expect(privateList).toHaveLength(1);
+ });
+});
diff --git a/apps/meteor/client/providers/AppsProvider.tsx b/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx
similarity index 58%
rename from apps/meteor/client/providers/AppsProvider.tsx
rename to apps/meteor/client/providers/AppsProvider/AppsProvider.tsx
index e521a05cafdcb..cf1d4d671d94b 100644
--- a/apps/meteor/client/providers/AppsProvider.tsx
+++ b/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx
@@ -4,16 +4,15 @@ import { useQuery, useQueryClient } from '@tanstack/react-query';
import type { ReactNode } from 'react';
import React, { useEffect } from 'react';
-import { AppClientOrchestratorInstance } from '../../ee/client/apps/orchestrator';
-import { AppsContext } from '../contexts/AppsContext';
-import { useIsEnterprise } from '../hooks/useIsEnterprise';
-import { useInvalidateLicense } from '../hooks/useLicense';
-import type { AsyncState } from '../lib/asyncState';
-import { AsyncStatePhase } from '../lib/asyncState';
-import { useInvalidateAppsCountQueryCallback } from '../views/marketplace/hooks/useAppsCountQuery';
-import type { App } from '../views/marketplace/types';
-
-const sortByName = (apps: App[]): App[] => apps.sort((a, b) => (a.name.toLowerCase() > b.name.toLowerCase() ? 1 : -1));
+import { AppClientOrchestratorInstance } from '../../apps/orchestrator';
+import { AppsContext } from '../../contexts/AppsContext';
+import { useIsEnterprise } from '../../hooks/useIsEnterprise';
+import { useInvalidateLicense } from '../../hooks/useLicense';
+import type { AsyncState } from '../../lib/asyncState';
+import { AsyncStatePhase } from '../../lib/asyncState';
+import { useInvalidateAppsCountQueryCallback } from '../../views/marketplace/hooks/useAppsCountQuery';
+import type { App } from '../../views/marketplace/types';
+import { storeQueryFunction } from './storeQueryFunction';
const getAppState = (
loading: boolean,
@@ -96,60 +95,10 @@ const AppsProvider = ({ children }: AppsProviderProps) => {
},
);
- const store = useQuery(
- ['marketplace', 'apps-stored', instance.data, marketplace.data],
- () => {
- if (!marketplace.isFetched && !instance.isFetched) {
- throw new Error('Apps not loaded');
- }
-
- const marketplaceApps: App[] = [];
- const installedApps: App[] = [];
- const privateApps: App[] = [];
- const clonedData = [...(instance.data || [])];
-
- sortByName(marketplace.data || []).forEach((app) => {
- const appIndex = clonedData.findIndex(({ id }) => id === app.id);
- const [installedApp] = appIndex > -1 ? clonedData.splice(appIndex, 1) : [];
-
- const record = {
- ...app,
- ...(installedApp && {
- private: installedApp.private,
- installed: true,
- status: installedApp.status,
- version: installedApp.version,
- licenseValidation: installedApp.licenseValidation,
- migrated: installedApp.migrated,
- }),
- bundledIn: app.bundledIn,
- marketplaceVersion: app.version,
- };
-
- if (installedApp) {
- if (installedApp.private) {
- privateApps.push(record);
- } else {
- installedApps.push(record);
- }
- }
-
- marketplaceApps.push(record);
- });
-
- sortByName(clonedData).forEach((app) => {
- if (app.private) {
- privateApps.push(app);
- }
- });
-
- return [marketplaceApps, installedApps, privateApps];
- },
- {
- enabled: marketplace.isFetched && instance.isFetched,
- keepPreviousData: true,
- },
- );
+ const store = useQuery(['marketplace', 'apps-stored', instance.data, marketplace.data], () => storeQueryFunction(marketplace, instance), {
+ enabled: marketplace.isFetched && instance.isFetched,
+ keepPreviousData: true,
+ });
const [marketplaceAppsData, installedAppsData, privateAppsData] = store.data || [];
const { isLoading } = store;
diff --git a/apps/meteor/client/providers/AppsProvider/index.ts b/apps/meteor/client/providers/AppsProvider/index.ts
new file mode 100644
index 0000000000000..94ae81e87e4cb
--- /dev/null
+++ b/apps/meteor/client/providers/AppsProvider/index.ts
@@ -0,0 +1,3 @@
+import AppsProvider from './AppsProvider';
+
+export default AppsProvider;
diff --git a/apps/meteor/client/providers/AppsProvider/storeQueryFunction.ts b/apps/meteor/client/providers/AppsProvider/storeQueryFunction.ts
new file mode 100644
index 0000000000000..a7c9d21f4df6c
--- /dev/null
+++ b/apps/meteor/client/providers/AppsProvider/storeQueryFunction.ts
@@ -0,0 +1,64 @@
+import { type UseQueryResult } from '@tanstack/react-query';
+
+import type { App } from '../../views/marketplace/types';
+
+const sortByName = (apps: App[]): App[] => apps.sort((a, b) => (a.name.toLowerCase() > b.name.toLowerCase() ? 1 : -1));
+
+/**
+ * Aggregates result data from marketplace request and instance installed into their appropriate lists
+ *
+ * Exporting for better testing
+ */
+export function storeQueryFunction(
+ marketplace: UseQueryResult,
+ instance: UseQueryResult,
+): [App[], App[], App[]] {
+ if (!marketplace.isFetched && !instance.isFetched) {
+ throw new Error('Apps not loaded');
+ }
+
+ const marketplaceApps: App[] = [];
+ const installedApps: App[] = [];
+ const privateApps: App[] = [];
+ const clonedData = [...(instance.data || [])];
+
+ sortByName(marketplace.data || []).forEach((app) => {
+ const appIndex = clonedData.findIndex(({ id }) => id === app.id);
+ const [installedApp] = appIndex > -1 ? clonedData.splice(appIndex, 1) : [];
+
+ const record = {
+ ...app,
+ ...(installedApp && {
+ private: installedApp.private,
+ installed: true,
+ status: installedApp.status,
+ version: installedApp.version,
+ licenseValidation: installedApp.licenseValidation,
+ migrated: installedApp.migrated,
+ }),
+ bundledIn: app.bundledIn,
+ marketplaceVersion: app.version,
+ };
+
+ if (installedApp) {
+ if (installedApp.private) {
+ privateApps.push(record);
+ } else {
+ installedApps.push(record);
+ }
+ }
+
+ marketplaceApps.push(record);
+ });
+
+ sortByName(clonedData).forEach((app) => {
+ if (app.private) {
+ privateApps.push(app);
+ return;
+ }
+
+ installedApps.push(app);
+ });
+
+ return [marketplaceApps, installedApps, privateApps];
+}
diff --git a/apps/meteor/client/providers/CallProvider/CallProvider.tsx b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
index 0ede8072d8bc6..38b7c12791cd2 100644
--- a/apps/meteor/client/providers/CallProvider/CallProvider.tsx
+++ b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
@@ -28,14 +28,14 @@ import React, { useMemo, useRef, useCallback, useEffect, useState } from 'react'
import { createPortal } from 'react-dom';
import type { OutgoingByeRequest } from 'sip.js/lib/core';
-import { isOutboundClient, useVoipClient } from '../../../ee/client/hooks/useVoipClient';
-import { WrapUpCallModal } from '../../../ee/client/voip/components/modals/WrapUpCallModal';
import type { CallContextValue } from '../../contexts/CallContext';
import { CallContext, useIsVoipEnterprise } from '../../contexts/CallContext';
import { useDialModal } from '../../hooks/useDialModal';
+import { isOutboundClient, useVoipClient } from '../../hooks/useVoipClient';
import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
import type { QueueAggregator } from '../../lib/voip/QueueAggregator';
import { parseOutboundPhoneNumber } from '../../lib/voip/parseOutboundPhoneNumber';
+import { WrapUpCallModal } from '../../voip/components/modals/WrapUpCallModal';
import { useVoipSounds } from './hooks/useVoipSounds';
type NetworkState = 'online' | 'offline';
diff --git a/apps/meteor/client/providers/EmojiPickerProvider/useUpdateCustomEmoji.ts b/apps/meteor/client/providers/EmojiPickerProvider/useUpdateCustomEmoji.ts
index a0a0946006dbb..67d9f5bd20780 100644
--- a/apps/meteor/client/providers/EmojiPickerProvider/useUpdateCustomEmoji.ts
+++ b/apps/meteor/client/providers/EmojiPickerProvider/useUpdateCustomEmoji.ts
@@ -1,11 +1,16 @@
-import { useStream } from '@rocket.chat/ui-contexts';
+import { useStream, useUserId } from '@rocket.chat/ui-contexts';
import { useEffect } from 'react';
import { updateEmojiCustom, deleteEmojiCustom } from '../../../app/emoji-custom/client/lib/emojiCustom';
export const useUpdateCustomEmoji = () => {
const notify = useStream('notify-logged');
+ const uid = useUserId();
useEffect(() => {
+ if (!uid) {
+ return;
+ }
+
const unsubUpdate = notify('updateEmojiCustom', (data) => updateEmojiCustom(data.emojiData));
const unsubDelete = notify('deleteEmojiCustom', (data) => deleteEmojiCustom(data.emojiData));
@@ -13,5 +18,5 @@ export const useUpdateCustomEmoji = () => {
unsubUpdate();
unsubDelete();
};
- }, [notify]);
+ }, [notify, uid]);
};
diff --git a/apps/meteor/client/providers/OmnichannelProvider.tsx b/apps/meteor/client/providers/OmnichannelProvider.tsx
index 47ccb3d39c880..881275e2fc2bb 100644
--- a/apps/meteor/client/providers/OmnichannelProvider.tsx
+++ b/apps/meteor/client/providers/OmnichannelProvider.tsx
@@ -14,10 +14,10 @@ import { LivechatInquiry } from '../../app/livechat/client/collections/LivechatI
import { initializeLivechatInquiryStream } from '../../app/livechat/client/lib/stream/queueManager';
import { getOmniChatSortQuery } from '../../app/livechat/lib/inquiries';
import { KonchatNotification } from '../../app/ui/client/lib/KonchatNotification';
-import { useHasLicenseModule } from '../../ee/client/hooks/useHasLicenseModule';
import { ClientLogger } from '../../lib/ClientLogger';
import type { OmnichannelContextValue } from '../contexts/OmnichannelContext';
import { OmnichannelContext } from '../contexts/OmnichannelContext';
+import { useHasLicenseModule } from '../hooks/useHasLicenseModule';
import { useReactiveValue } from '../hooks/useReactiveValue';
import { useShouldPreventAction } from '../hooks/useShouldPreventAction';
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
index 2f31d282a63b7..0c0ef00b5ac08 100644
--- a/apps/meteor/client/providers/TranslationProvider.tsx
+++ b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -22,7 +22,7 @@ import {
defaultTranslationNamespace,
extractTranslationNamespaces,
} from '../../app/utils/lib/i18n';
-import { AppClientOrchestratorInstance } from '../../ee/client/apps/orchestrator';
+import { AppClientOrchestratorInstance } from '../apps/orchestrator';
import { isRTLScriptLanguage } from '../lib/utils/isRTLScriptLanguage';
i18n.use(I18NextHttpBackend).use(initReactI18next);
diff --git a/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts b/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts
index e86fe9951a264..db7a7d548f9e5 100644
--- a/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts
+++ b/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts
@@ -1,4 +1,4 @@
-import { useStream } from '@rocket.chat/ui-contexts';
+import { useStream, useUserId } from '@rocket.chat/ui-contexts';
import { useEffect } from 'react';
import { ChatMessage } from '../../../../app/models/client';
@@ -6,7 +6,11 @@ import { ChatMessage } from '../../../../app/models/client';
export const useDeleteUser = () => {
const notify = useStream('notify-logged');
+ const uid = useUserId();
useEffect(() => {
+ if (!uid) {
+ return;
+ }
return notify('Users:Deleted', ({ userId, messageErasureType, replaceByUser }) => {
if (messageErasureType === 'Unlink' && replaceByUser) {
return ChatMessage.update(
@@ -28,5 +32,5 @@ export const useDeleteUser = () => {
'u._id': userId,
});
});
- }, [notify]);
+ }, [notify, uid]);
};
diff --git a/apps/meteor/client/providers/UserProvider/hooks/useUpdateAvatar.ts b/apps/meteor/client/providers/UserProvider/hooks/useUpdateAvatar.ts
index 292880e23da8c..0be90cd608b88 100644
--- a/apps/meteor/client/providers/UserProvider/hooks/useUpdateAvatar.ts
+++ b/apps/meteor/client/providers/UserProvider/hooks/useUpdateAvatar.ts
@@ -1,15 +1,19 @@
-import { useStream } from '@rocket.chat/ui-contexts';
+import { useUserId, useStream } from '@rocket.chat/ui-contexts';
import { Meteor } from 'meteor/meteor';
import { useEffect } from 'react';
export const useUpdateAvatar = () => {
const notify = useStream('notify-logged');
+ const uid = useUserId();
useEffect(() => {
+ if (!uid) {
+ return;
+ }
return notify('updateAvatar', (data) => {
if ('username' in data) {
const { username, etag } = data;
username && Meteor.users.update({ username }, { $set: { avatarETag: etag } });
}
});
- }, [notify]);
+ }, [notify, uid]);
};
diff --git a/apps/meteor/client/serviceWorker.ts b/apps/meteor/client/serviceWorker.ts
new file mode 100644
index 0000000000000..7d98747e59f78
--- /dev/null
+++ b/apps/meteor/client/serviceWorker.ts
@@ -0,0 +1,40 @@
+const KEY = 'sw_last_reload';
+const RELOAD_WINDOW = 1000 * 10;
+
+function reload() {
+ const lastReload = localStorage.getItem(KEY);
+
+ if (lastReload) {
+ const last = Date.parse(lastReload);
+
+ if (!isNaN(last)) {
+ const elapsed = Date.now() - last;
+
+ if (elapsed < RELOAD_WINDOW) {
+ return;
+ }
+ }
+ }
+
+ localStorage.setItem(KEY, new Date().toISOString());
+ console.log('service worker: reloading to activate');
+ window.location.reload();
+}
+
+if ('serviceWorker' in navigator) {
+ navigator.serviceWorker
+ .register('/enc.js', {
+ scope: '/',
+ })
+ .then((reg) => {
+ if (reg.active) {
+ console.log('service worker: installed');
+ if (!navigator.serviceWorker.controller) {
+ reload();
+ }
+ }
+ })
+ .catch((err) => {
+ console.log(`registration failed: ${err}`);
+ });
+}
diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
index 4c51b8a3615b8..f9ec077e9e430 100644
--- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -6,9 +6,9 @@ import { useLayout } from '@rocket.chat/ui-contexts';
import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
import React, { memo, useMemo } from 'react';
-import { useOmnichannelPriorities } from '../../../ee/client/omnichannel/hooks/useOmnichannelPriorities';
import { RoomIcon } from '../../components/RoomIcon';
import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
+import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannelPriorities';
import RoomMenu from '../RoomMenu';
import { OmnichannelBadges } from '../badges/OmnichannelBadges';
import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
diff --git a/apps/meteor/client/sidebar/RoomMenu.tsx b/apps/meteor/client/sidebar/RoomMenu.tsx
index da9908b3ed5f7..8df55bd5d3594 100644
--- a/apps/meteor/client/sidebar/RoomMenu.tsx
+++ b/apps/meteor/client/sidebar/RoomMenu.tsx
@@ -18,11 +18,11 @@ import React, { memo, useMemo } from 'react';
import { LegacyRoomManager } from '../../app/ui-utils/client';
import { UiTextContext } from '../../definition/IRoomTypeConfig';
-import { useOmnichannelPrioritiesMenu } from '../../ee/client/omnichannel/hooks/useOmnichannelPrioritiesMenu';
import { GenericModalDoNotAskAgain } from '../components/GenericModal';
import WarningModal from '../components/WarningModal';
import { useDontAskAgain } from '../hooks/useDontAskAgain';
import { roomCoordinator } from '../lib/rooms/roomCoordinator';
+import { useOmnichannelPrioritiesMenu } from '../omnichannel/hooks/useOmnichannelPrioritiesMenu';
const fields: Fields = {
f: true,
diff --git a/apps/meteor/client/sidebar/badges/OmnichannelBadges.tsx b/apps/meteor/client/sidebar/badges/OmnichannelBadges.tsx
index 32fff81d7bb38..9f2580b74b773 100644
--- a/apps/meteor/client/sidebar/badges/OmnichannelBadges.tsx
+++ b/apps/meteor/client/sidebar/badges/OmnichannelBadges.tsx
@@ -2,9 +2,9 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
import { isOmnichannelRoom } from '@rocket.chat/core-typings';
import React from 'react';
-import { RoomActivityIcon } from '../../../ee/client/omnichannel/components/RoomActivityIcon';
-import { useOmnichannelPriorities } from '../../../ee/client/omnichannel/hooks/useOmnichannelPriorities';
-import { PriorityIcon } from '../../../ee/client/omnichannel/priorities/PriorityIcon';
+import { RoomActivityIcon } from '../../omnichannel/components/RoomActivityIcon';
+import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannelPriorities';
+import { PriorityIcon } from '../../omnichannel/priorities/PriorityIcon';
export const OmnichannelBadges = ({ room }: { room: ISubscription & IRoom }) => {
const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
index 7ecc7b8ab96d9..fbf987fa78af2 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
@@ -5,7 +5,7 @@ import { useThemeMode } from '@rocket.chat/ui-theming/src/hooks/useThemeMode';
import type { ReactElement } from 'react';
import React from 'react';
-import { SidebarFooterWatermark } from '../../../ee/client/sidebar/footer/SidebarFooterWatermark';
+import { SidebarFooterWatermark } from './SidebarFooterWatermark';
const SidebarFooterDefault = (): ReactElement => {
const [, , theme] = useThemeMode();
diff --git a/apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
similarity index 91%
rename from apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
rename to apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
index 88b872ed46a31..bf7736b5899a4 100644
--- a/apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';
-import { useLicense, useLicenseName } from '../../../../client/hooks/useLicense';
+import { useLicense, useLicenseName } from '../../hooks/useLicense';
export const SidebarFooterWatermark = (): ReactElement | null => {
const t = useTranslation();
diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
index 0b5ef3418e01a..119476ecd89a1 100644
--- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
@@ -6,8 +6,8 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement, MouseEvent, ReactNode } from 'react';
import React from 'react';
-import type { VoipFooterMenuOptions } from '../../../../ee/client/hooks/useVoipFooterMenu';
import type { CallActionsType } from '../../../contexts/CallContext';
+import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel';
type VoipFooterPropsType = {
diff --git a/apps/meteor/client/sidebar/footer/voip/index.tsx b/apps/meteor/client/sidebar/footer/voip/index.tsx
index 9ae7d91c7c2b8..9f353628c982a 100644
--- a/apps/meteor/client/sidebar/footer/voip/index.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/index.tsx
@@ -3,7 +3,6 @@ import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React, { useCallback, useState } from 'react';
-import { useVoipFooterMenu } from '../../../../ee/client/hooks/useVoipFooterMenu';
import {
useCallActions,
useCallCreateRoom,
@@ -14,6 +13,7 @@ import {
useQueueCounter,
useQueueName,
} from '../../../contexts/CallContext';
+import { useVoipFooterMenu } from '../../../hooks/useVoipFooterMenu';
import SidebarFooterDefault from '../SidebarFooterDefault';
import { VoipFooter as VoipFooterComponent } from './VoipFooter';
diff --git a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
index 5738798f194e7..c45d300dc4c7d 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
@@ -27,8 +27,8 @@ import type { ComponentProps, ReactElement } from 'react';
import React, { useEffect, useMemo } from 'react';
import { useForm, Controller } from 'react-hook-form';
-import { useHasLicenseModule } from '../../../../ee/client/hooks/useHasLicenseModule';
import UserAutoCompleteMultipleFederated from '../../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
+import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
import { goToRoomById } from '../../../lib/utils/goToRoomById';
import { useEncryptedRoomDescription } from '../hooks/useEncryptedRoomDescription';
@@ -66,7 +66,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
const namesValidation = useSetting('UTF8_Channel_Names_Validation');
const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
const federationEnabled = useSetting('Federation_Matrix_enabled') || false;
- const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms');
+ const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms') && e2eEnabled;
const canCreateChannel = usePermission('create-c');
const canCreatePrivateChannel = usePermission('create-p');
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
index f506255806bfd..8e26407113478 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
@@ -1,7 +1,7 @@
import { useTranslation, useRoute, usePermission } from '@rocket.chat/ui-contexts';
-import { useHasLicenseModule } from '../../../../../ee/client/hooks/useHasLicenseModule';
import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
+import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
/**
* @deprecated Feature preview
diff --git a/apps/meteor/ee/client/startup/audit.tsx b/apps/meteor/client/startup/audit.tsx
similarity index 79%
rename from apps/meteor/ee/client/startup/audit.tsx
rename to apps/meteor/client/startup/audit.tsx
index 0f1e8b59ec255..99dfff9db3c1a 100644
--- a/apps/meteor/ee/client/startup/audit.tsx
+++ b/apps/meteor/client/startup/audit.tsx
@@ -1,11 +1,11 @@
import React, { lazy } from 'react';
-import { hasAllPermission } from '../../../app/authorization/client';
-import { appLayout } from '../../../client/lib/appLayout';
-import { router } from '../../../client/providers/RouterProvider';
-import NotAuthorizedPage from '../../../client/views/notAuthorized/NotAuthorizedPage';
-import MainLayout from '../../../client/views/root/MainLayout';
+import { hasAllPermission } from '../../app/authorization/client';
+import { appLayout } from '../lib/appLayout';
import { onToggledFeature } from '../lib/onToggledFeature';
+import { router } from '../providers/RouterProvider';
+import NotAuthorizedPage from '../views/notAuthorized/NotAuthorizedPage';
+import MainLayout from '../views/root/MainLayout';
const AuditPage = lazy(() => import('../views/audit/AuditPage'));
const AuditLogPage = lazy(() => import('../views/audit/AuditLogPage'));
diff --git a/apps/meteor/ee/client/startup/deviceManagement.ts b/apps/meteor/client/startup/deviceManagement.ts
similarity index 93%
rename from apps/meteor/ee/client/startup/deviceManagement.ts
rename to apps/meteor/client/startup/deviceManagement.ts
index 3c22aa14384bf..f34a9796c304b 100644
--- a/apps/meteor/ee/client/startup/deviceManagement.ts
+++ b/apps/meteor/client/startup/deviceManagement.ts
@@ -1,7 +1,7 @@
import { lazy } from 'react';
-import { registerAccountRoute, registerAccountSidebarItem, unregisterSidebarItem } from '../../../client/views/account';
import { onToggledFeature } from '../lib/onToggledFeature';
+import { registerAccountRoute, registerAccountSidebarItem, unregisterSidebarItem } from '../views/account';
declare module '@rocket.chat/ui-contexts' {
interface IRouterPaths {
diff --git a/apps/meteor/client/startup/e2e.ts b/apps/meteor/client/startup/e2e.ts
index f9cf156f8d8b3..de615e8f45deb 100644
--- a/apps/meteor/client/startup/e2e.ts
+++ b/apps/meteor/client/startup/e2e.ts
@@ -1,11 +1,12 @@
-import type { AtLeast, IMessage, ISubscription } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
+import { isE2EEPinnedMessage } from '@rocket.chat/core-typings';
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
+import { E2EEState } from '../../app/e2e/client/E2EEState';
import { e2e } from '../../app/e2e/client/rocketchat.e2e';
-import { Subscriptions, ChatRoom } from '../../app/models/client';
+import { ChatRoom } from '../../app/models/client';
import { settings } from '../../app/settings/client';
-import { sdk } from '../../app/utils/client/lib/SDKClient';
import { onClientBeforeSendMessage } from '../lib/onClientBeforeSendMessage';
import { onClientMessageReceived } from '../lib/onClientMessageReceived';
import { isLayoutEmbedded } from '../lib/utils/isLayoutEmbedded';
@@ -15,10 +16,12 @@ import { router } from '../providers/RouterProvider';
Meteor.startup(() => {
Tracker.autorun(() => {
if (!Meteor.userId()) {
+ e2e.log('Not logged in');
return;
}
if (!window.crypto) {
+ e2e.error('No crypto support');
return;
}
@@ -27,102 +30,48 @@ Meteor.startup(() => {
const adminEmbedded = isLayoutEmbedded() && router.getLocationPathname().startsWith('/admin');
if (enabled && !adminEmbedded) {
+ e2e.log('E2E enabled starting client');
e2e.startClient();
- e2e.enabled.set(true);
} else {
- e2e.enabled.set(false);
+ e2e.log('E2E disabled');
+ e2e.setState(E2EEState.DISABLED);
e2e.closeAlert();
}
});
- let observable: Meteor.LiveQueryHandle | null = null;
let offClientMessageReceived: undefined | (() => void);
let offClientBeforeSendMessage: undefined | (() => void);
- let unsubNotifyUser: undefined | (() => void);
+ let listenersAttached = false;
+
Tracker.autorun(() => {
if (!e2e.isReady()) {
+ e2e.log('Not ready');
offClientMessageReceived?.();
- unsubNotifyUser?.();
- unsubNotifyUser = undefined;
- observable?.stop();
offClientBeforeSendMessage?.();
+ listenersAttached = false;
return;
}
- unsubNotifyUser = sdk.stream('notify-user', [`${Meteor.userId()}/e2ekeyRequest`], async (roomId, keyId): Promise => {
- const e2eRoom = await e2e.getInstanceByRoomId(roomId);
- if (!e2eRoom) {
- return;
- }
-
- e2eRoom.provideKeyToUser(keyId);
- }).stop;
-
- observable = Subscriptions.find().observe({
- changed: async (sub: ISubscription) => {
- setTimeout(async () => {
- if (!sub.encrypted && !sub.E2EKey) {
- e2e.removeInstanceByRoomId(sub.rid);
- return;
- }
-
- const e2eRoom = await e2e.getInstanceByRoomId(sub.rid);
- if (!e2eRoom) {
- return;
- }
-
- if (sub.E2ESuggestedKey) {
- if (await e2eRoom.importGroupKey(sub.E2ESuggestedKey)) {
- e2e.acceptSuggestedKey(sub.rid);
- } else {
- console.warn('Invalid E2ESuggestedKey, rejecting', sub.E2ESuggestedKey);
- e2e.rejectSuggestedKey(sub.rid);
- }
- }
-
- sub.encrypted ? e2eRoom.resume() : e2eRoom.pause();
-
- // Cover private groups and direct messages
- if (!e2eRoom.isSupportedRoomType(sub.t)) {
- e2eRoom.disable();
- return;
- }
-
- if (sub.E2EKey && e2eRoom.isWaitingKeys()) {
- e2eRoom.keyReceived();
- return;
- }
-
- if (!e2eRoom.isReady()) {
- return;
- }
-
- e2eRoom.decryptSubscription();
- }, 0);
- },
- added: async (sub: ISubscription) => {
- setTimeout(async () => {
- if (!sub.encrypted && !sub.E2EKey) {
- return;
- }
- return e2e.getInstanceByRoomId(sub.rid);
- }, 0);
- },
- removed: (sub: ISubscription) => {
- e2e.removeInstanceByRoomId(sub.rid);
- },
- });
+ if (listenersAttached) {
+ e2e.log('Listeners already attached');
+ return;
+ }
offClientMessageReceived = onClientMessageReceived.use(async (msg: IMessage) => {
const e2eRoom = await e2e.getInstanceByRoomId(msg.rid);
if (!e2eRoom?.shouldConvertReceivedMessages()) {
return msg;
}
+
+ if (isE2EEPinnedMessage(msg)) {
+ return e2e.decryptPinnedMessage(msg);
+ }
+
return e2e.decryptMessage(msg);
});
// Encrypt messages before sending
- offClientBeforeSendMessage = onClientBeforeSendMessage.use(async (message: AtLeast) => {
+ offClientBeforeSendMessage = onClientBeforeSendMessage.use(async (message) => {
const e2eRoom = await e2e.getInstanceByRoomId(message.rid);
if (!e2eRoom) {
@@ -140,12 +89,10 @@ Meteor.startup(() => {
}
// Should encrypt this message.
- const msg = await e2eRoom.encrypt(message);
-
- message.msg = msg;
- message.t = 'e2e';
- message.e2e = 'pending';
- return message;
+ return e2eRoom.encryptMessage(message);
});
+
+ listenersAttached = true;
+ e2e.log('Listeners attached', listenersAttached);
});
});
diff --git a/apps/meteor/client/startup/index.ts b/apps/meteor/client/startup/index.ts
index bf6814617e4af..e2264d7954153 100644
--- a/apps/meteor/client/startup/index.ts
+++ b/apps/meteor/client/startup/index.ts
@@ -3,9 +3,11 @@ import './absoluteUrl';
import './actionButtons';
import './afterLogoutCleanUp';
import './appRoot';
+import './audit';
import './callbacks';
import './collections';
import './customOAuth';
+import './deviceManagement';
import './e2e';
import './forceLogout';
import './iframeCommands';
@@ -16,6 +18,7 @@ import './messageObserve';
import './messageTypes';
import './notifications';
import './otr';
+import './readReceipt';
import './reloadRoomAfterLogin';
import './roles';
import './rootUrlChange';
diff --git a/apps/meteor/client/startup/messageTypes.ts b/apps/meteor/client/startup/messageTypes.ts
index 65ad6dabae236..481ab49568a2d 100644
--- a/apps/meteor/client/startup/messageTypes.ts
+++ b/apps/meteor/client/startup/messageTypes.ts
@@ -61,4 +61,10 @@ Meteor.startup(() => {
system: true,
message: 'Pinned_a_message',
});
+
+ MessageTypes.registerType({
+ id: 'message_pinned_e2e',
+ system: true,
+ message: 'Pinned_a_message',
+ });
});
diff --git a/apps/meteor/client/startup/notifications/konchatNotifications.ts b/apps/meteor/client/startup/notifications/konchatNotifications.ts
index cd16d4264479d..3d5f26cae5472 100644
--- a/apps/meteor/client/startup/notifications/konchatNotifications.ts
+++ b/apps/meteor/client/startup/notifications/konchatNotifications.ts
@@ -72,6 +72,7 @@ Meteor.startup(() => {
Tracker.autorun(() => {
if (!Meteor.userId() || !settings.get('Outlook_Calendar_Enabled')) {
sdk.stop('notify-user', `${Meteor.userId()}/calendar`);
+ return;
}
sdk.stream('notify-user', [`${Meteor.userId()}/calendar`], notifyUserCalendar);
diff --git a/apps/meteor/ee/client/startup/readReceipt.ts b/apps/meteor/client/startup/readReceipt.ts
similarity index 70%
rename from apps/meteor/ee/client/startup/readReceipt.ts
rename to apps/meteor/client/startup/readReceipt.ts
index 6cd7c4835d462..36eb50b6bcbd0 100644
--- a/apps/meteor/ee/client/startup/readReceipt.ts
+++ b/apps/meteor/client/startup/readReceipt.ts
@@ -1,11 +1,11 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
-import { settings } from '../../../app/settings/client';
-import { MessageAction } from '../../../app/ui-utils/client';
-import { imperativeModal } from '../../../client/lib/imperativeModal';
-import { messageArgs } from '../../../client/lib/utils/messageArgs';
-import ReadReceiptsModal from '../../../client/views/room/modals/ReadReceiptsModal';
+import { settings } from '../../app/settings/client';
+import { MessageAction } from '../../app/ui-utils/client';
+import { imperativeModal } from '../lib/imperativeModal';
+import { messageArgs } from '../lib/utils/messageArgs';
+import ReadReceiptsModal from '../views/room/modals/ReadReceiptsModal';
Meteor.startup(() => {
Tracker.autorun(() => {
diff --git a/apps/meteor/client/ui.ts b/apps/meteor/client/ui.ts
index 5dd438129c9aa..6c7971a8cca08 100644
--- a/apps/meteor/client/ui.ts
+++ b/apps/meteor/client/ui.ts
@@ -1,12 +1,11 @@
-import { useOnHoldChatQuickAction } from '../ee/client/hooks/quickActions/useOnHoldChatQuickAction';
-import { useCallsRoomAction } from '../ee/client/hooks/roomActions/useCallsRoomAction';
-import { useCannedResponsesRoomAction } from '../ee/client/hooks/roomActions/useCannedResponsesRoomAction';
-import { useGameCenterRoomAction } from '../ee/client/hooks/roomActions/useGameCenterRoomAction';
import { useChatForwardQuickAction } from './hooks/quickActions/useChatForwardQuickAction';
import { useCloseChatQuickAction } from './hooks/quickActions/useCloseChatQuickAction';
import { useMoveQueueQuickAction } from './hooks/quickActions/useMoveQueueQuickAction';
+import { useOnHoldChatQuickAction } from './hooks/quickActions/useOnHoldChatQuickAction';
import { useTranscriptQuickAction } from './hooks/quickActions/useTranscriptQuickAction';
import { useAutotranslateRoomAction } from './hooks/roomActions/useAutotranslateRoomAction';
+import { useCallsRoomAction } from './hooks/roomActions/useCallsRoomAction';
+import { useCannedResponsesRoomAction } from './hooks/roomActions/useCannedResponsesRoomAction';
import { useChannelSettingsRoomAction } from './hooks/roomActions/useChannelSettingsRoomAction';
import { useCleanHistoryRoomAction } from './hooks/roomActions/useCleanHistoryRoomAction';
import { useContactChatHistoryRoomAction } from './hooks/roomActions/useContactChatHistoryRoomAction';
@@ -14,6 +13,7 @@ import { useContactProfileRoomAction } from './hooks/roomActions/useContactProfi
import { useDiscussionsRoomAction } from './hooks/roomActions/useDiscussionsRoomAction';
import { useE2EERoomAction } from './hooks/roomActions/useE2EERoomAction';
import { useExportMessagesRoomAction } from './hooks/roomActions/useExportMessagesRoomAction';
+import { useGameCenterRoomAction } from './hooks/roomActions/useGameCenterRoomAction';
import { useKeyboardShortcutListRoomAction } from './hooks/roomActions/useKeyboardShortcutListRoomAction';
import { useMembersListRoomAction } from './hooks/roomActions/useMembersListRoomAction';
import { useMentionsRoomAction } from './hooks/roomActions/useMentionsRoomAction';
@@ -78,3 +78,5 @@ export const quickActionHooks = [
useCloseChatQuickAction,
useOnHoldChatQuickAction,
] satisfies (() => QuickActionsActionConfig | undefined)[];
+
+export const roomActionHooksForE2EESetup = [useChannelSettingsRoomAction, useMembersListRoomAction, useE2EERoomAction];
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
similarity index 85%
rename from apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
rename to apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
index 13722be69c694..30979e2a81d82 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';
-import { Page, PageHeader, PageContent } from '../../../../../client/components/Page';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
import DeviceManagementAccountTable from './DeviceManagementAccountTable';
const DeviceManagementAccountPage = (): ReactElement => {
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
similarity index 89%
rename from apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
rename to apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
index 616b941de2a8a..e2532d0c6623c 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
@@ -4,10 +4,10 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';
-import { GenericTableCell, GenericTableRow } from '../../../../../../client/components/GenericTable';
-import { useFormatDateAndTime } from '../../../../../../client/hooks/useFormatDateAndTime';
+import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable';
import DeviceIcon from '../../../../components/deviceManagement/DeviceIcon';
import { useDeviceLogout } from '../../../../hooks/useDeviceLogout';
+import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
type DevicesRowProps = {
_id: string;
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
similarity index 87%
rename from apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
rename to apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
index c6e32b0268188..5039521fa6226 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
@@ -3,11 +3,11 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React, { useMemo } from 'react';
-import { GenericTableHeaderCell } from '../../../../../../client/components/GenericTable';
-import { usePagination } from '../../../../../../client/components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../../../client/components/GenericTable/hooks/useSort';
-import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
+import { GenericTableHeaderCell } from '../../../../components/GenericTable';
+import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../../../components/GenericTable/hooks/useSort';
import DeviceManagementTable from '../../../../components/deviceManagement/DeviceManagementTable';
+import { useEndpointData } from '../../../../hooks/useEndpointData';
import DeviceManagementAccountRow from './DeviceManagementAccountRow';
const sortMapping = {
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/index.ts b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/index.ts
similarity index 100%
rename from apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/index.ts
rename to apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/index.ts
diff --git a/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx b/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx
index 8cf34b6a56d40..11bf6634a0e9d 100644
--- a/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx
+++ b/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx
@@ -4,7 +4,7 @@ import { useTranslation, usePermission } from '@rocket.chat/ui-contexts';
import React from 'react';
import { useFormContext } from 'react-hook-form';
-import { useHasLicenseModule } from '../../../../ee/client/hooks/useHasLicenseModule';
+import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
const PreferencesConversationTranscript = () => {
const t = useTranslation();
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
similarity index 84%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
index 4360803188925..317a9f5190306 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
@@ -2,8 +2,8 @@ import { useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React, { useRef } from 'react';
-import { ContextualbarDialog } from '../../../../../client/components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../../../client/components/Page';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
import DeviceManagementAdminTable from './DeviceManagementAdminTable';
import DeviceManagementInfo from './DeviceManagementInfo';
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
similarity index 78%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
index c250728988ec0..e7624ffd956ec 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
@@ -2,12 +2,12 @@ import { usePermission, useRouter, useSetModal, useCurrentModal, useTranslation
import type { ReactElement } from 'react';
import React, { useEffect } from 'react';
-import { getURL } from '../../../../../app/utils/client/getURL';
-import GenericUpsellModal from '../../../../../client/components/GenericUpsellModal';
-import { useUpsellActions } from '../../../../../client/components/GenericUpsellModal/hooks';
-import PageSkeleton from '../../../../../client/components/PageSkeleton';
-import NotAuthorizedPage from '../../../../../client/views/notAuthorized/NotAuthorizedPage';
+import { getURL } from '../../../../app/utils/client/getURL';
+import GenericUpsellModal from '../../../components/GenericUpsellModal';
+import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
+import PageSkeleton from '../../../components/PageSkeleton';
import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
import DeviceManagementAdminPage from './DeviceManagementAdminPage';
const DeviceManagementAdminRoute = (): ReactElement => {
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
similarity index 93%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
index e3ac5680ed2e8..5420be9536015 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
@@ -4,10 +4,10 @@ import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
import type { KeyboardEvent, ReactElement } from 'react';
import React, { useCallback } from 'react';
-import { GenericTableRow, GenericTableCell } from '../../../../../../client/components/GenericTable';
-import { useFormatDateAndTime } from '../../../../../../client/hooks/useFormatDateAndTime';
+import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
import DeviceIcon from '../../../../components/deviceManagement/DeviceIcon';
import { useDeviceLogout } from '../../../../hooks/useDeviceLogout';
+import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
type DeviceRowProps = {
_id: string;
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
similarity index 89%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
index e9ac8be7da9fa..026f1cb0de30b 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -4,12 +4,12 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement, MutableRefObject } from 'react';
import React, { useState, useMemo, useEffect } from 'react';
-import FilterByText from '../../../../../../client/components/FilterByText';
-import { GenericTableHeaderCell } from '../../../../../../client/components/GenericTable';
-import { usePagination } from '../../../../../../client/components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../../../client/components/GenericTable/hooks/useSort';
-import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
+import FilterByText from '../../../../components/FilterByText';
+import { GenericTableHeaderCell } from '../../../../components/GenericTable';
+import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../../../components/GenericTable/hooks/useSort';
import DeviceManagementTable from '../../../../components/deviceManagement/DeviceManagementTable';
+import { useEndpointData } from '../../../../hooks/useEndpointData';
import DeviceManagementAdminRow from './DeviceManagementAdminRow';
const sortMapping = {
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/index.ts b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/index.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/index.ts
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/index.ts
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
similarity index 91%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
index 7820ee8349605..240e61e5878d4 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
@@ -12,11 +12,11 @@ import {
ContextualbarScrollableContent,
ContextualbarFooter,
ContextualbarTitle,
-} from '../../../../../../client/components/Contextualbar';
-import InfoPanel from '../../../../../../client/components/InfoPanel';
-import { useFormatDateAndTime } from '../../../../../../client/hooks/useFormatDateAndTime';
-import { usePresence } from '../../../../../../client/hooks/usePresence';
+} from '../../../../components/Contextualbar';
+import InfoPanel from '../../../../components/InfoPanel';
import { useDeviceLogout } from '../../../../hooks/useDeviceLogout';
+import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
+import { usePresence } from '../../../../hooks/usePresence';
type DeviceManagementInfoProps = DeviceManagementPopulatedSession & {
onReload: () => void;
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
similarity index 89%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
index d5e59ea027560..5f78269fca573 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
@@ -11,9 +11,9 @@ import {
ContextualbarClose,
ContextualbarContent,
ContextualbarTitle,
-} from '../../../../../../client/components/Contextualbar';
-import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
-import { AsyncStatePhase } from '../../../../../../client/lib/asyncState';
+} from '../../../../components/Contextualbar';
+import { useEndpointData } from '../../../../hooks/useEndpointData';
+import { AsyncStatePhase } from '../../../../lib/asyncState';
import DeviceManagementInfo from './DeviceManagementInfo';
const convertSessionFromAPI = ({
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/index.ts b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/index.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/index.ts
rename to apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/index.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCard.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardErrorBoundary.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardCardFilter.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.stories.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
similarity index 98%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
index de40e04dcfcac..78f1585f0f4bc 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React, { useCallback, useMemo, useState } from 'react';
-import { Page, PageHeader, PageScrollableContent } from '../../../../../client/components/Page';
+import { Page, PageHeader, PageScrollableContent } from '../../../components/Page';
import ChannelsTab from './channels/ChannelsTab';
import MessagesTab from './messages/MessagesTab';
import UsersTab from './users/UsersTab';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
similarity index 85%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
index fd42d428824dd..17f6713220f99 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
@@ -10,12 +10,12 @@ import {
import type { ReactElement } from 'react';
import React, { useEffect } from 'react';
-import { getURL } from '../../../../../app/utils/client/getURL';
-import GenericUpsellModal from '../../../../../client/components/GenericUpsellModal';
-import { useUpsellActions } from '../../../../../client/components/GenericUpsellModal/hooks';
-import PageSkeleton from '../../../../../client/components/PageSkeleton';
-import NotAuthorizedPage from '../../../../../client/views/notAuthorized/NotAuthorizedPage';
+import { getURL } from '../../../../app/utils/client/getURL';
+import GenericUpsellModal from '../../../components/GenericUpsellModal';
+import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
+import PageSkeleton from '../../../components/PageSkeleton';
import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
import EngagementDashboardPage from './EngagementDashboardPage';
const isValidTab = (tab: string | undefined): tab is 'users' | 'messages' | 'channels' =>
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
similarity index 98%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
index f901f11d3954d..a92b2c6d32952 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsOverview.tsx
@@ -4,10 +4,10 @@ import moment from 'moment';
import type { ReactElement } from 'react';
import React, { useMemo, useState } from 'react';
-import Growth from '../../../../../../client/components/dataView/Growth';
import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
import { usePeriodSelectorState } from '../../../../components/dashboards/usePeriodSelectorState';
+import Growth from '../../../../components/dataView/Growth';
import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
import { useChannelsList } from './useChannelsList';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsTab.stories.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts b/apps/meteor/client/views/admin/engagementDashboard/channels/useChannelsList.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts
rename to apps/meteor/client/views/admin/engagementDashboard/channels/useChannelsList.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx b/apps/meteor/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/dataView/LegendSymbol.stories.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx b/apps/meteor/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/dataView/LegendSymbol.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/dataView/colors.ts b/apps/meteor/client/views/admin/engagementDashboard/dataView/colors.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/dataView/colors.ts
rename to apps/meteor/client/views/admin/engagementDashboard/dataView/colors.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
similarity index 98%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
index aa12bf2a3d1ce..7cf46ebc476ac 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesSentSection.tsx
@@ -6,11 +6,11 @@ import moment from 'moment';
import type { ReactElement } from 'react';
import React, { useMemo } from 'react';
-import CounterSet from '../../../../../../client/components/dataView/CounterSet';
import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
import { usePeriodLabel } from '../../../../components/dashboards/usePeriodLabel';
import { usePeriodSelectorState } from '../../../../components/dashboards/usePeriodSelectorState';
+import CounterSet from '../../../../components/dataView/CounterSet';
import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
import { useMessagesSent } from './useMessagesSent';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.stories.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/messages/MessagesTab.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
rename to apps/meteor/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
rename to apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts b/apps/meteor/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
rename to apps/meteor/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
similarity index 98%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
index 80af96d8f6691..80359837b6276 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
@@ -6,9 +6,9 @@ import moment from 'moment';
import type { ReactElement } from 'react';
import React, { useMemo } from 'react';
-import CounterSet from '../../../../../../client/components/dataView/CounterSet';
-import { useFormatDate } from '../../../../../../client/hooks/useFormatDate';
import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
+import CounterSet from '../../../../components/dataView/CounterSet';
+import { useFormatDate } from '../../../../hooks/useFormatDate';
import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
import LegendSymbol from '../dataView/LegendSymbol';
import { useActiveUsers } from './useActiveUsers';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/BusiestChatTimesSection.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForDays.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForDays.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/ContentForDays.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForHours.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/ContentForHours.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/ContentForHours.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
similarity index 97%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
index 1941b4fea718e..36f9c3de2cc27 100644
--- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/NewUsersSection.tsx
@@ -7,12 +7,12 @@ import moment from 'moment';
import type { ReactElement } from 'react';
import React, { useMemo } from 'react';
-import CounterSet from '../../../../../../client/components/dataView/CounterSet';
-import { useFormatDate } from '../../../../../../client/hooks/useFormatDate';
import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
import { usePeriodLabel } from '../../../../components/dashboards/usePeriodLabel';
import { usePeriodSelectorState } from '../../../../components/dashboards/usePeriodSelectorState';
+import CounterSet from '../../../../components/dataView/CounterSet';
+import { useFormatDate } from '../../../../hooks/useFormatDate';
import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
import { useNewUsers } from './useNewUsers';
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.stories.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersTab.tsx
rename to apps/meteor/client/views/admin/engagementDashboard/users/UsersTab.tsx
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useActiveUsers.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts
rename to apps/meteor/client/views/admin/engagementDashboard/users/useActiveUsers.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts
rename to apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts
rename to apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
rename to apps/meteor/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts
similarity index 100%
rename from apps/meteor/ee/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts
rename to apps/meteor/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts
diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
index 206458e09c9bc..e2942f384c9d9 100644
--- a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
+++ b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
@@ -107,7 +107,7 @@ const IntegrationsTable = ({ type }: { type?: string }) => {
)}
{isSuccess && data && data.integrations.length > 0 && (
<>
-
+
{headers}
{isSuccess &&
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
index 6de7cdda16751..805d89c54c37f 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
@@ -85,16 +85,6 @@ const ModerationConsoleTable: FC = () => {
>
{t('User')}
,
-
-
- {t('Moderation_Reported_message')}
- ,
{t('Room')}
,
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
index 56419c61223c7..65bf7069e074e 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
@@ -13,7 +13,7 @@ export type ModerationConsoleRowProps = {
};
const ModerationConsoleTableRow = ({ report, onClick, isDesktopOrLarger }: ModerationConsoleRowProps): JSX.Element => {
- const { userId: _id, rooms, name, count, message, username, ts } = report;
+ const { userId: _id, rooms, name, count, username, ts } = report;
const roomNames = rooms.map((room) => {
if (room.t === 'd') {
@@ -31,7 +31,6 @@ const ModerationConsoleTableRow = ({ report, onClick, isDesktopOrLarger }: Moder
- {message}
{concatenatedRoomNames}
{formatDateAndTime(ts)}
{count}
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
index 51a2be0872764..afca74f7528cb 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
@@ -1,5 +1,5 @@
-import type { IMessage, MessageReport } from '@rocket.chat/core-typings';
-import { isE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage, MessageReport, MessageAttachment } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
import { Message, MessageName, MessageToolbarItem, MessageToolbarWrapper, MessageUsername } from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
@@ -47,6 +47,10 @@ const ContextMessage = ({
const displayName = useUserDisplayName({ name, username });
+ const quotes = message?.attachments?.filter(isQuoteAttachment) || [];
+
+ const attachments = message?.attachments?.filter((attachment: MessageAttachment) => !isQuoteAttachment(attachment)) || [];
+
return (
<>
{formatDate(message._updatedAt)}
@@ -65,6 +69,7 @@ const ContextMessage = ({
{room.name || room.fname || 'DM'}
+ {!!quotes?.length &&
({ defaultValues: { users: [] } });
const { _id, name, description } = role;
- const router = useRoute('admin-permissions');
- const addUser = useEndpoint('POST', '/v1/roles.addUserToRole');
+ const router = useRouter();
+ const addUserToRoleEndpoint = useEndpoint('POST', '/v1/roles.addUserToRole');
- const rid = getValues('rid');
+ const { rid } = watch();
+ const roomFieldId = useUniqueId();
+ const usersFieldId = useUniqueId();
- const handleReturn = useMutableCallback(() => {
- router.push({
- context: 'edit',
- _id,
- });
- });
-
- const handleAdd = useMutableCallback(async ({ users, rid }: UsersInRolePayload) => {
+ const handleAdd = useEffectEvent(async ({ users, rid }: UsersInRolePayload) => {
try {
await Promise.all(
users.map(async (user) => {
if (user) {
- await addUser({ roleName: _id, username: user, roomId: rid });
+ await addUserToRoleEndpoint({ roleName: _id, username: user, roomId: rid });
}
}),
);
dispatchToastMessage({ type: 'success', message: t('Users_added') });
- reload.current();
- reset();
+ queryClient.invalidateQueries(['getUsersInRole']);
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
}
@@ -63,7 +57,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
-
+
@@ -71,40 +65,68 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
{role.scope !== 'Users' && (
- {t('Choose_a_room')}
+ {t('Choose_a_room')}
(
-
+ {errors.rid && (
+
+ {errors.rid.message}
+
+ )}
)}
- {t('Add_users')}
+ {t('Add_users')}
(
-
+ {errors.users && (
+
+
+ {errors.users.message}
+
+
+ )}
- {(role.scope === 'Users' || rid) && (
- {t('Select_a_room')} }
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
index ab8c5926f97f2..ed7fdd93d79c9 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
@@ -1,79 +1,107 @@
-import type { IRole, IRoom, IUserInRole } from '@rocket.chat/core-typings';
+import type { IRole, IRoom } from '@rocket.chat/core-typings';
import { Pagination } from '@rocket.chat/fuselage';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useSetModal, useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
import type { ReactElement } from 'react';
-import React from 'react';
+import React, { useMemo } from 'react';
+import GenericError from '../../../../../components/GenericError';
import GenericModal from '../../../../../components/GenericModal';
import GenericNoResults from '../../../../../components/GenericNoResults';
-import { GenericTable, GenericTableHeader, GenericTableHeaderCell, GenericTableBody } from '../../../../../components/GenericTable';
-import type { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
+import {
+ GenericTable,
+ GenericTableHeader,
+ GenericTableHeaderCell,
+ GenericTableBody,
+ GenericTableLoadingTable,
+} from '../../../../../components/GenericTable';
+import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
import UsersInRoleTableRow from './UsersInRoleTableRow';
type UsersInRoleTableProps = {
- users: IUserInRole[];
- reload: () => void;
roleName: IRole['name'];
roleId: IRole['_id'];
description: IRole['description'];
- total: number;
rid?: IRoom['_id'];
- paginationData: ReturnType;
};
-// TODO: Missing error state
-const UsersInRoleTable = ({
- users,
- reload,
- roleName,
- roleId,
- description,
- total,
- rid,
- paginationData,
-}: UsersInRoleTableProps): ReactElement => {
+const UsersInRoleTable = ({ rid, roleId, roleName, description }: UsersInRoleTableProps): ReactElement => {
const t = useTranslation();
const setModal = useSetModal();
const dispatchToastMessage = useToastMessageDispatch();
- const removeUser = useEndpoint('POST', '/v1/roles.removeUserFromRole');
- const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = paginationData;
+ const queryClient = useQueryClient();
- const closeModal = (): void => setModal();
+ const getUsersInRoleEndpoint = useEndpoint('GET', '/v1/roles.getUsersInRole');
+ const removeUserFromRoleEndpoint = useEndpoint('POST', '/v1/roles.removeUserFromRole');
- const handleRemove = useMutableCallback((username) => {
- const remove = async (): Promise => {
+ const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
+
+ const query = useMemo(
+ () => ({
+ role: roleId,
+ ...(rid && { roomId: rid }),
+ ...(itemsPerPage && { count: itemsPerPage }),
+ ...(current && { offset: current }),
+ }),
+ [itemsPerPage, current, rid, roleId],
+ );
+
+ const { data, isLoading, isSuccess, refetch, isError } = useQuery(['getUsersInRole', roleId, query], async () =>
+ getUsersInRoleEndpoint(query),
+ );
+
+ const users =
+ data?.users?.map((user) => ({
+ ...user,
+ createdAt: new Date(user.createdAt),
+ _updatedAt: new Date(user._updatedAt),
+ })) || [];
+
+ const handleRemove = useEffectEvent((username) => {
+ const remove = async () => {
try {
- await removeUser({ roleId, username, scope: rid });
+ await removeUserFromRoleEndpoint({ roleId, username, scope: rid });
dispatchToastMessage({ type: 'success', message: t('User_removed') });
- } catch (error: unknown) {
+ queryClient.invalidateQueries(['getUsersInRole']);
+ } catch (error) {
dispatchToastMessage({ type: 'error', message: error });
} finally {
- closeModal();
- reload();
+ setModal(null);
}
};
setModal(
-
+ setModal(null)} confirmText={t('Delete')}>
{t('The_user_s_will_be_removed_from_role_s', username, description || roleName)}
,
);
});
+ const headers = (
+ <>
+ {t('Name')}
+ {t('Email')}
+
+ {headers}
+
+
+
+ )}
+ {isSuccess && users?.length > 0 && (
<>
-
- {t('Name')}
- {t('Email')}
-
+ {headers}
- {users.map((user) => (
+ {users?.map((user) => (
@@ -82,13 +110,15 @@ const UsersInRoleTable = ({
divider
current={current}
itemsPerPage={itemsPerPage}
- count={total}
+ count={users.length || 0}
onSetItemsPerPage={onSetItemsPerPage}
onSetCurrent={onSetCurrent}
{...paginationProps}
/>
)}
+ {users?.length === 0 &&
-
-
- {name || username}
-
- {name && (
-
- {' '}
- {`@${username}`}{' '}
-
- )}
+
+ {name || username}
+ {name && (
+
+ {`@${username}`}
+
+ )}
{email}
-
- {/* FIXME: Replace to IconButton */}
-
+
+
);
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableWithData.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableWithData.tsx
deleted file mode 100644
index a7fe837b6e72a..0000000000000
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTableWithData.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import type { IRole, IRoom, IUserInRole } from '@rocket.chat/core-typings';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
-import type { ReactElement, MutableRefObject } from 'react';
-import React, { useEffect, useMemo } from 'react';
-
-import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
-import UsersInRoleTable from './UsersInRoleTable';
-
-type UsersInRoleTableWithDataProps = {
- rid?: IRoom['_id'];
- roleId: IRole['_id'];
- roleName: IRole['name'];
- description: IRole['description'];
- reloadRef: MutableRefObject<() => void>;
-};
-
-const UsersInRoleTableWithData = ({
- rid,
- roleId,
- roleName,
- description,
- reloadRef,
-}: UsersInRoleTableWithDataProps): ReactElement | null => {
- const { itemsPerPage, current, ...paginationData } = usePagination();
- const t = useTranslation();
-
- const query = useMemo(
- () => ({
- role: roleId,
- ...(rid && { roomId: rid }),
- ...(itemsPerPage && { count: itemsPerPage }),
- ...(current && { offset: current }),
- }),
- [itemsPerPage, current, rid, roleId],
- );
-
- const getUsersInRole = useEndpoint('GET', '/v1/roles.getUsersInRole');
-
- const dispatchToastMessage = useToastMessageDispatch();
-
- const { refetch, ...result } = useQuery(
- ['roles', roleId, 'users', query],
- async () => {
- const { users } = await getUsersInRole(query);
-
- if (users.length === 0) {
- throw new Error(t('No_results_found'));
- }
- return users;
- },
- {
- onError: (error) => {
- dispatchToastMessage({ type: 'error', message: error });
- },
- },
- );
-
- useEffect(() => {
- reloadRef.current = refetch;
- }, [refetch, reloadRef]);
-
- if (result.isLoading || result.error || !result.data) {
- return null;
- }
-
- const users: IUserInRole[] = result.data.map((user) => ({
- ...user,
- createdAt: new Date(user.createdAt),
- _updatedAt: new Date(user._updatedAt),
- }));
-
- return (
- ([]);
+ const roomTypeFilterStructure = useMemo(() => {
+ return initialRoomTypeFilterStructure.map((option) => ({
+ ...option,
+ checked: roomTypeSelectedOptions.some((selectedOption) => selectedOption.id === option.id),
+ }));
+ }, [roomTypeSelectedOptions]);
+
const handleSearchTextChange = useCallback(
(event) => {
const text = event.currentTarget.value;
@@ -88,7 +95,7 @@ const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch
import('../../../ee/client/views/admin/engagementDashboard/EngagementDashboardRoute')),
+ component: lazy(() => import('./engagementDashboard/EngagementDashboardRoute')),
});
registerAdminRoute('/device-management/:context?/:id?', {
name: 'device-management',
- component: lazy(() => import('../../../ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute')),
+ component: lazy(() => import('./deviceManagement/DeviceManagementAdminRoute')),
});
registerAdminRoute('/subscription', {
diff --git a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
index d0b5c10e2c80a..5d08909d69501 100644
--- a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
+++ b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
@@ -20,6 +20,7 @@ import RoomPickSettingInput from './inputs/RoomPickSettingInput';
import SelectSettingInput from './inputs/SelectSettingInput';
import SelectTimezoneSettingInput from './inputs/SelectTimezoneSettingInput';
import StringSettingInput from './inputs/StringSettingInput';
+import TimespanSettingInput from './inputs/TimespanSettingInput';
// @todo: the props are loosely typed because `Setting` needs to typecheck them.
const inputsByType: Record> = {
@@ -39,6 +40,7 @@ const inputsByType: Record> = {
roomPick: RoomPickSettingInput,
timezone: SelectTimezoneSettingInput,
lookup: LookupSettingInput,
+ timespan: TimespanSettingInput,
date: GenericSettingInput, // @todo: implement
group: GenericSettingInput, // @todo: implement
};
@@ -46,6 +48,7 @@ const inputsByType: Record> = {
type MemoizedSettingProps = {
_id?: string;
type: ISettingBase['type'];
+ packageValue: ISettingBase['packageValue'];
hint?: ReactNode;
callout?: ReactNode;
value?: SettingValue;
diff --git a/apps/meteor/client/views/admin/settings/Setting.stories.tsx b/apps/meteor/client/views/admin/settings/Setting.stories.tsx
index e80db37d821e5..18ff3801dbc96 100644
--- a/apps/meteor/client/views/admin/settings/Setting.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting.stories.tsx
@@ -42,17 +42,17 @@ WithCallout.args = {
export const types = () => (
-
);
diff --git a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
index 9ebde75e73166..14ba6f27b4c53 100644
--- a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
@@ -35,7 +35,7 @@ function AssetSettingInput({ _id, label, value, asset, required, disabled, fileC
dispatchToastMessage({ type: 'info', message: t('Uploading_file') });
const fileData = new FormData();
- fileData.append('asset', blob, asset);
+ fileData.append('asset', blob, blob.name);
fileData.append('assetName', asset);
try {
diff --git a/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx b/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx
index ce6d2dfd60000..3f61417e4fa68 100644
--- a/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx
@@ -39,7 +39,9 @@ const CodeMirrorBox = ({ label, children }: { label: ReactNode; children: ReactE
{label}
)}
- {children}
+
+ {children}
+
- {filesOnly && excludePinned &&
{t('RetentionPolicy_RoomWarning_FilesOnly', { time })}
} - {filesOnly && !excludePinned &&{t('RetentionPolicy_RoomWarning_UnpinnedFilesOnly', { time })}
} - {!filesOnly && excludePinned &&{t('RetentionPolicy_RoomWarning', { time })}
} - {!filesOnly && !excludePinned &&{t('RetentionPolicy_RoomWarning_Unpinned', { time })}
} +{message}