RocketChat#817 [FIX] Правки | Исправлена форма отправки письма

Author: Scarvis

app/manual-mail-sender/client/views/MailForm.js

@@ -1,4 +1,4 @@
-import { Box, Button, ButtonGroup, Chip, Field, InputBox, Margins, Scrollable, TextInput } from '@rocket.chat/fuselage';
+import { Box, Button, ButtonGroup, Chip, Field, InputBox, Margins, TextAreaInput, TextInput } from '@rocket.chat/fuselage';
 import React, { Component, useMemo, useState, useEffect, useCallback } from 'react';
 import 'react-dropdown-tree-select/dist/styles.css'
 import '../../public/stylesheets/mail-sender.css'
@@ -42,7 +42,7 @@ class DropdownTreeSelectContainer extends Component {
 	render() {
 		const { data, ...rest } = this.props;
 		return (
-			<DropdownTreeSelect data={this.state.data} contentClassName='date-picker' {...rest} />
+			<DropdownTreeSelect data={this.state.data} className='date-picker' dropdownClassName='date-picker' {...rest} />
 		);
 	}
 }
@@ -163,7 +163,7 @@ function MailForm({ recipients, mailSubject, mailBody, defaultEmails }) {
 	return <>
 		<Field mbe='x8'>
 			<Field.Label>{t('Email_receivers')} <span style={ { color: 'red' } }>*</span></Field.Label>
-			<Field.Row>
+			<Field>
 				<DropdownTreeSelectContainer
 					className='tree-select'
 					data={recipients}
@@ -175,7 +175,8 @@ function MailForm({ recipients, mailSubject, mailBody, defaultEmails }) {
 						}
 					}
 				/>
-			</Field.Row>
+				<TextAreaInput backgroundColor={'var(--tertiary-background-color)'} row='1' style={{ whiteSpace: 'normal' }} flexGrow={1} value={email} readOnly placeholder={t('Email')}/>
+			</Field>
 		</Field>
 		<Field mbe='x8'>
 			<Field.Label>{t('Email_subject')} <span style={ { color: 'red' } }>*</span></Field.Label>

app/manual-mail-sender/client/views/index.js

@@ -61,8 +61,8 @@ export function MailSenderPage() {
 	const [params, setParams] = useState({ text: '' });
 	const [sort, setSort] = useState(['name', 'asc']);
 
-	const debouncedParams = useDebouncedValue(params, 50);
-	const debouncedSort = useDebouncedValue(sort, 50);
+	const debouncedParams = useDebouncedValue(params, 500);
+	const debouncedSort = useDebouncedValue(sort, 500);
 	const query = useQuery(debouncedParams, debouncedSort);
 	const workingGroupsQuery = useWorkingGroupsQuery(debouncedParams, debouncedSort);
 
@@ -104,7 +104,7 @@ function MailSender({ workingGroupsData, usersData }) {
 		const recipients = [{
 			label: 'Все пользователи',
 			value: 'all_users',
-			children: workingGroups.map((workingGroup) => {
+			children: workingGroups.filter((workingGroup) => workingGroup.type !== 'subject').map((workingGroup) => {
 				return {
 					label: workingGroup.title,
 					value: workingGroup._id,
@@ -151,7 +151,7 @@ function MailSenderWithCouncil({ workingGroupsData, usersData, debouncedParams,
 					return {
 						label: workingGroup.title,
 						value: workingGroup._id,
-						children: users.filter((user) => user.workingGroup === workingGroup.title).map((value) => {
+						children: users.filter((user) => user.workingGroup === workingGroup.title && workingGroup.type !== 'subject').map((value) => {
 							return {
 								label: [value.surname, value.name, value.patronymic].join(' '),
 								value: value.emails ? value.emails[0].address : '',
@@ -180,7 +180,7 @@ function MailSenderWithCouncil({ workingGroupsData, usersData, debouncedParams,
 			};
 
 			recipients[0].children.push(child);
-			const mailSubject = ['Council', 'От', formatDateAndTime(councilData.d)].join(' ');
+			const mailSubject = [t('Council'), 'От', formatDateAndTime(councilData.d)].join(' ');
 
 			setDefaultEmails(emails);
 			setMailSubject(mailSubject);
@@ -233,7 +233,7 @@ function MailSenderWithErrand({ workingGroupsData, usersData, debouncedParams, d
 					return {
 						label: workingGroup.title,
 						value: workingGroup._id,
-						children: users.filter((user) => user.workingGroup === workingGroup.title).map((value) => {
+						children: users.filter((user) => user.workingGroup === workingGroup.title && workingGroup.type !== 'subject').map((value) => {
 							return {
 								label: [value.surname, value.name, value.patronymic].join(' '),
 								value: value.emails ? value.emails[0].address : '',