Skip to content

Commit 6012729

Browse files
ahmed-n-abdeltwabahmed-n-abdeltwab
authored
Merge branch 'develop' into feat/openapi-oauth-apps-create
2 parents bddf677 + 14f5b99 commit 6012729

File tree

11 files changed

+28
-149
lines changed

11 files changed

+28
-149
lines changed

‎apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import {
2121
ModalContent,
2222
} from '@rocket.chat/fuselage';
2323
import { GenericModal } from '@rocket.chat/ui-client';
24-
import { usePermission, useSetting, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
24+
import { usePermission, useSetting, useUserPreference, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
2525
import { useCallback, useState, useEffect, useMemo } from 'react';
2626
import { useForm } from 'react-hook-form';
27+
import { useTranslation } from 'react-i18next';
2728

2829
import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
29-
import { dispatchToastMessage } from '../../../lib/toast';
3030
import Tags from '../Tags';
3131

3232
type CloseChatModalFormData = {
@@ -50,7 +50,8 @@ type CloseChatModalProps = {
5050
};
5151

5252
const CloseChatModal = ({ department, visitorEmail, onCancel, onConfirm }: CloseChatModalProps) => {
53-
const t = useTranslation();
53+
const { t } = useTranslation();
54+
const dispatchToastMessage = useToastMessageDispatch();
5455

5556
const {
5657
formState: { errors },
@@ -147,7 +148,7 @@ const CloseChatModal = ({ department, visitorEmail, onCancel, onConfirm }: Close
147148
}
148149
setValue('subject', subject || customSubject || t('Transcript_of_your_livechat_conversation'));
149150
}
150-
}, [transcriptEmail, setValue, visitorEmail, subject, t, customSubject]);
151+
}, [transcriptEmail, setValue, visitorEmail, subject, t, customSubject, dispatchToastMessage]);
151152

152153
if (commentRequired || tagRequired || canSendTranscript) {
153154
return (

‎apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ import { act, renderHook, waitFor } from '@testing-library/react';
55
import { E2EEState } from '../../../app/e2e/client/E2EEState';
66
import { e2e } from '../../../app/e2e/client/rocketchat.e2e';
77
import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
8-
import { dispatchToastMessage } from '../../lib/toast';
98
import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
109
import { useE2EEState } from '../../views/room/hooks/useE2EEState';
1110
import { useOTR } from '../useOTR';
1211
import { useE2EERoomAction } from './useE2EERoomAction';
1312

13+
const dispatchToastMessage = jest.fn();
14+
1415
jest.mock('@rocket.chat/ui-contexts', () => ({
1516
useSetting: jest.fn(),
1617
usePermission: jest.fn(),
1718
useEndpoint: jest.fn(),
18-
}));
19-
20-
jest.mock('../../lib/toast', () => ({
21-
dispatchToastMessage: jest.fn(),
19+
useToastMessageDispatch: jest.fn(() => dispatchToastMessage),
2220
}));
2321

2422
jest.mock('@rocket.chat/ui-client', () => ({

‎apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import { isRoomFederated } from '@rocket.chat/core-typings';
22
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
33
import { imperativeModal } from '@rocket.chat/ui-client';
4-
import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
4+
import { useSetting, usePermission, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
55
import { useMemo } from 'react';
66
import { useTranslation } from 'react-i18next';
77

88
import { E2EEState } from '../../../app/e2e/client/E2EEState';
99
import { E2ERoomState } from '../../../app/e2e/client/E2ERoomState';
1010
import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
1111
import { getRoomTypeTranslation } from '../../lib/getRoomTypeTranslation';
12-
import { dispatchToastMessage } from '../../lib/toast';
1312
import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
1413
import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
1514
import { useE2EERoomState } from '../../views/room/hooks/useE2EERoomState';
@@ -31,6 +30,7 @@ export const useE2EERoomAction = () => {
3130
const permitted = (room.t === 'd' || (permittedToEditRoom && permittedToToggleEncryption)) && readyToEncrypt;
3231
const federated = isRoomFederated(room);
3332
const { t } = useTranslation();
33+
const dispatchToastMessage = useToastMessageDispatch();
3434
const { otrState } = useOTR();
3535

3636
const isE2EERoomNotReady = () => {

‎apps/meteor/client/hooks/useDialModal.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { useSetModal } from '@rocket.chat/ui-contexts';
1+
import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
22
import { Suspense, lazy, useCallback, useMemo } from 'react';
33
import { useTranslation } from 'react-i18next';
44

55
import { useIsVoipEnterprise } from '../contexts/CallContext';
6-
import { dispatchToastMessage } from '../lib/toast';
76

87
const DialPadModal = lazy(() => import('../voip/modal/DialPad/DialPadModal'));
98

@@ -19,8 +18,9 @@ type DialModalControls = {
1918

2019
export const useDialModal = (): DialModalControls => {
2120
const setModal = useSetModal();
22-
const isEnterprise = useIsVoipEnterprise();
2321
const { t } = useTranslation();
22+
const dispatchToastMessage = useToastMessageDispatch();
23+
const isEnterprise = useIsVoipEnterprise();
2424

2525
const closeDialModal = useCallback(() => setModal(null), [setModal]);
2626

@@ -39,7 +39,7 @@ export const useDialModal = (): DialModalControls => {
3939
</Suspense>,
4040
);
4141
},
42-
[setModal, isEnterprise, t, closeDialModal],
42+
[isEnterprise, setModal, closeDialModal, dispatchToastMessage, t],
4343
);
4444

4545
return useMemo(

‎apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import type { IRoom } from '@rocket.chat/core-typings';
22
import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
3-
import { useEndpoint } from '@rocket.chat/ui-contexts';
3+
import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
44
import { useQueryClient } from '@tanstack/react-query';
55
import { useMemo } from 'react';
66
import { useTranslation } from 'react-i18next';
77

88
import { useOmnichannelPriorities } from './useOmnichannelPriorities';
99
import { roomsQueryKeys } from '../../lib/queryKeys';
10-
import { dispatchToastMessage } from '../../lib/toast';
1110
import { PRIORITY_ICONS } from '../priorities/PriorityIcon';
1211

1312
export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
@@ -16,6 +15,7 @@ export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
1615
const updateRoomPriority = useEndpoint('POST', '/v1/livechat/room/:rid/priority', { rid });
1716
const removeRoomPriority = useEndpoint('DELETE', '/v1/livechat/room/:rid/priority', { rid });
1817
const { data: priorities } = useOmnichannelPriorities();
18+
const dispatchToastMessage = useToastMessageDispatch();
1919

2020
return useMemo(() => {
2121
const handlePriorityChange = (priorityId: string) => async () => {

‎apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
2-
import { useEndpoint, useLanguage } from '@rocket.chat/ui-contexts';
2+
import { useEndpoint, useLanguage, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
33
import { useQuery } from '@tanstack/react-query';
44
import type { ChangeEvent, ReactElement } from 'react';
55
import { useEffect, useState, memo } from 'react';
@@ -8,7 +8,6 @@ import { useTranslation } from 'react-i18next';
88
import AutoTranslate from './AutoTranslate';
99
import { useEndpointAction } from '../../../../hooks/useEndpointAction';
1010
import { miscQueryKeys } from '../../../../lib/queryKeys';
11-
import { dispatchToastMessage } from '../../../../lib/toast';
1211
import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
1312
import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
1413

@@ -32,6 +31,8 @@ const AutoTranslateWithData = (): ReactElement => {
3231

3332
const languagesDict = supportedLanguages ? Object.fromEntries(supportedLanguages.map((lang) => [lang.language, lang.name])) : {};
3433

34+
const dispatchToastMessage = useToastMessageDispatch();
35+
3536
const handleChangeLanguage = useEffectEvent((value: string) => {
3637
setCurrentLanguage(value);
3738

‎apps/meteor/client/views/room/modals/E2EEModals/ResetKeysE2EEModal.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Box, ModalFooterAnnotation, ModalIcon } from '@rocket.chat/fuselage';
22
import { ExternalLink, GenericModal } from '@rocket.chat/ui-client';
3+
import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
34
import type { ReactElement } from 'react';
45
import { Trans, useTranslation } from 'react-i18next';
56

6-
import { dispatchToastMessage } from '../../../../lib/toast';
77
import { useE2EEResetRoomKey } from '../../hooks/useE2EEResetRoomKey';
88

99
const E2EE_RESET_KEY_LINK = 'https://go.rocket.chat/i/e2ee-guide';
@@ -18,6 +18,8 @@ const ResetKeysE2EEModal = ({ roomType, roomId, onCancel }: ResetKeysE2EEModalPr
1818
const { t } = useTranslation();
1919
const resetRoomKeyMutation = useE2EEResetRoomKey();
2020

21+
const dispatchToastMessage = useToastMessageDispatch();
22+
2123
const handleResetRoomKey = () => {
2224
resetRoomKeyMutation.mutate(
2325
{ roomId },

‎apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { RegisterServerPage, RegisterOfflinePage } from '@rocket.chat/onboarding-ui';
2-
import { useEndpoint, useMethod } from '@rocket.chat/ui-contexts';
2+
import { useEndpoint, useMethod, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
33
import { useMutation, useQuery } from '@tanstack/react-query';
44
import type { ReactElement, ComponentProps } from 'react';
55
import { useState } from 'react';
66
import { I18nextProvider, useTranslation } from 'react-i18next';
77

88
import { useInvalidateLicense } from '../../../hooks/useLicense';
9-
import { dispatchToastMessage } from '../../../lib/toast';
109
import { useSetupWizardContext } from '../contexts/SetupWizardContext';
1110

1211
const SERVER_OPTIONS = {
@@ -53,6 +52,8 @@ const RegisterServerStep = (): ReactElement => {
5352
select: (data) => data.offline,
5453
});
5554

55+
const dispatchToastMessage = useToastMessageDispatch();
56+
5657
const { mutate } = useMutation({
5758
mutationKey: ['setupWizard/confirmOfflineRegistration'],
5859
mutationFn: async (token: string) => registerManually({ cloudBlob: token }),
@@ -79,13 +80,13 @@ const RegisterServerStep = (): ReactElement => {
7980
termsHref='https://rocket.chat/terms'
8081
policyHref='https://rocket.chat/privacy'
8182
clientKey={clientKey || ''}
82-
onCopySecurityCode={(): void => dispatchToastMessage({ type: 'success', message: t('Copied') })}
83-
onBackButtonClick={(): void => setServerOption(SERVER_OPTIONS.REGISTERED)}
83+
onCopySecurityCode={() => dispatchToastMessage({ type: 'success', message: t('Copied') })}
84+
onBackButtonClick={() => setServerOption(SERVER_OPTIONS.REGISTERED)}
8485
onSubmit={handleConfirmOffline}
8586
/>
8687
) : (
8788
<RegisterServerPage
88-
onClickRegisterOffline={(): void => setServerOption(SERVER_OPTIONS.OFFLINE)}
89+
onClickRegisterOffline={() => setServerOption(SERVER_OPTIONS.OFFLINE)}
8990
stepCount={maxSteps}
9091
onSubmit={handleRegister}
9192
currentStep={currentStep}

‎apps/meteor/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@
407407
"overlayscrollbars-react": "^0.5.6",
408408
"path": "^0.12.7",
409409
"path-to-regexp": "^6.3.0",
410-
"pdfjs-dist": "^4.2.67",
411410
"pino": "^8.21.0",
412411
"postis": "^2.2.0",
413412
"prom-client": "^14.2.0",

‎apps/meteor/public/pdf.worker.min.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)
⚡