RocketChat#821 [EDIT] Правки форма отправки документов

sibdigital · Feb 17, 2021 · 2b3e724 · 2b3e724
1 parent 026089d
commit 2b3e724
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/app/working-group-requests/client/views/Answers.js b/app/working-group-requests/client/views/Answers.js
@@ -58,7 +58,7 @@ function AnswersWithData({ answers, mail, onClick, onChange }) {
 		const organization = sender.organization ?? '';
 		return <Table.Row onClick={onClick(answer)} onMouseEnter={() => onMouseEnter(answer)} style={{ borderLeft: unread ? '1px solid #4fb0fc' : '' }} tabIndex={0} role='link' action>
 			<Table.Cell fontScale='p1' color='default'>{organization}</Table.Cell>
-			<Table.Cell fontScale='p1' color='default'>{commentary}</Table.Cell>
+			<Table.Cell fontScale='p1' color='default' style={{ wordBreak: 'break-all' }}>{commentary}</Table.Cell>
 			{ mediaQuery && <Table.Cell fontScale='p1' color='default'>{phone}</Table.Cell>}
 			{ mediaQuery && <Table.Cell fontScale='p1' color='default'>{email}</Table.Cell>}
 			{ mediaQuery && <Table.Cell fontScale='p1' color='default'><Box withTruncatedText>{formatDate(ts)}</Box></Table.Cell>}

diff --git a/...s/client/views/formForSendingDocuments/steps/WorkingGroupRequestAnswerFileDownloadStep.js b/...s/client/views/formForSendingDocuments/steps/WorkingGroupRequestAnswerFileDownloadStep.js
@@ -21,10 +21,10 @@ import { Pager } from '../../../../../../client/views/setupWizard/Pager';
 import { Step } from '../../../../../../client/views/setupWizard/Step';
 import { useInvitePageContext } from '../InvitePageState';
 import { StepHeader } from '../../../../../../client/views/setupWizard/StepHeader';
-import { filesValidation, fileUploadToWorkingGroupRequestAnswer } from '../../../../../ui/client/lib/fileUpload';
+import { filesValidation } from '../../../../../ui/client/lib/fileUpload';
 import GenericTable, { Th } from '../../../../../../client/components/GenericTable';
+import { useUserId } from '../../../../../../client/contexts/UserContext';
 import './reactTooltip.css';
-import { useUserId } from '/client/contexts/UserContext';
 
 registerLocale('ru', ru);
 require('react-datepicker/dist/react-datepicker.css');
@@ -786,7 +786,7 @@ function WorkingGroupRequestAnswerFileDownloadStep({ step, title, active, workin
 						<Field>
 							<Field.Label>{t('Commentary')}</Field.Label>
 							<Field.Row>
-								<TextAreaInput rows='3' style={{ whiteSpace: 'normal' }} value={newData.commentary.value} flexGrow={1} onChange={handleChange('commentary')} />
+								<TextAreaInput rows='6' style={{ whiteSpace: 'normal' }} value={newData.commentary.value} flexGrow={1} onChange={handleChange('commentary')} />
 							</Field.Row>
 						</Field>
 						<Field mbe='x8'>

diff --git a/...roup-requests/client/views/formForSendingDocuments/steps/WorkingGroupRequestAnswerStep.js b/...roup-requests/client/views/formForSendingDocuments/steps/WorkingGroupRequestAnswerStep.js
@@ -10,7 +10,7 @@ import { useInvitePageContext } from '../InvitePageState';
 import { StepHeader } from '../../../../../../client/views/setupWizard/StepHeader';
 import { constructPersonFullFIO } from '../../../../../utils/client/methods/constructPersonFIO';
 import { fileUploadToWorkingGroupRequestAnswer } from '../../../../../ui/client/lib/fileUpload';
-import { useMethod } from '/client/contexts/ServerContext';
+import { useMethod } from '../../../../../../client/contexts/ServerContext';
 
 function WorkingGroupRequestAnswerStep({ step, title, active, setContactInfo, userInfo, fileDownloadInfo }) {
 	const { goToPreviousStep, goToNextStep, goToFinalStep } = useInvitePageContext();

diff --git a/app/working-group-requests/client/views/index.js b/app/working-group-requests/client/views/index.js
@@ -15,6 +15,7 @@ const sortDir = (sortDir) => (sortDir === 'asc' ? 1 : -1);
 
 export const useQuery = ({ itemsPerPage, current }, [column, direction], cache) => useMemo(() => ({
 	query: JSON.stringify({ _id: { $regex: '', $options: 'i' } }),
+	sort: JSON.stringify({ ts: sortDir(direction) }),
 	...itemsPerPage && { count: itemsPerPage },
 	...current && { offset: current },
 }), [itemsPerPage, current, column, direction, cache]);