Skip to content

[FIX] Multi Select isn't working in Export Messages #21236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 3 commits into from
Mar 22, 2021
Merged

[FIX] Multi Select isn't working in Export Messages #21236

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45feb32
fix: multi-select in export messages
PriyaBihani Mar 22, 2021
6af0d45
Merge branch 'develop' into multiSelect-exportMessages
PriyaBihani Mar 22, 2021
428381f
Fix: linting
PriyaBihani Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions client/views/room/contextualBar/ExportMessages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import { css } from '@rocket.chat/css-in-js';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';

import VerticalBar from '../../../../components/VerticalBar';
import { UserAutoComplete } from '../../../../components/AutoComplete';
import { useTranslation } from '../../../../contexts/TranslationContext';
import { useForm } from '../../../../hooks/useForm';
import { useUserRoom } from '../../hooks/useUserRoom';
import { useEndpoint } from '../../../../contexts/ServerContext';
import { roomTypes, isEmail } from '../../../../../app/utils/client';
import { useToastMessageDispatch } from '../../../../contexts/ToastMessagesContext';
import { useTabBarClose } from '../../providers/ToolboxProvider';
import UserAutoCompleteMultiple from '../../../../../ee/client/audit/UserAutoCompleteMultiple';

const clickable = css`
cursor: pointer;
Expand Down Expand Up @@ -114,7 +114,7 @@ const MailExportForm = ({ onCancel, rid }) => {
const { values, handlers } = useForm({
dateFrom: '',
dateTo: '',
toUsers: '',
toUsers: [],
additionalEmails: '',
subject: t('Mail_Messages_Subject', roomName),
});
Expand Down Expand Up @@ -165,6 +165,16 @@ const MailExportForm = ({ onCancel, rid }) => {
handleSubject,
} = handlers;

const onChangeUsers = useMutableCallback((value, action) => {
if (!action) {
if (toUsers.includes(value)) {
return;
}
return handleToUsers([...toUsers, value]);
}
handleToUsers(toUsers.filter((current) => current !== value));
});

const roomsExport = useEndpoint('POST', 'rooms.export');

const handleSubmit = async () => {
Expand Down Expand Up @@ -216,7 +226,10 @@ const MailExportForm = ({ onCancel, rid }) => {
<Field>
<Field.Label>{t('To_users')}</Field.Label>
<Field.Row>
<UserAutoComplete value={toUsers} onChange={handleToUsers}/>
<UserAutoCompleteMultiple
value={toUsers}
onChange={onChangeUsers}
/>
</Field.Row>
</Field>
<Field>
Expand Down