Skip to content

[FIX] When closing chats a comment is always required #21947

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
tiagoevanp merged 1 commit into from
May 4, 2021
Merged

[FIX] When closing chats a comment is always required #21947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 8 deletions client/components/Omnichannel/modals/CloseChatModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Field, Button, TextInput, Icon, ButtonGroup, Modal, Box } from '@rocket
import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
import React, { useCallback, useState, useMemo, useEffect } from 'react';

import { useSetting } from '../../../contexts/SettingsContext';
import { useTranslation } from '../../../contexts/TranslationContext';
import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
import { useForm } from '../../../hooks/useForm';
Expand All @@ -14,6 +15,8 @@ const CloseChatModal = ({ department = {}, onCancel, onConfirm }) => {

const { values, handlers } = useForm({ comment: '', tags: [] });

const commentRequired = useSetting('Livechat_request_comment_when_closing_conversation');

const { comment, tags } = values;
const { handleComment, handleTags } = handlers;
const [commentError, setCommentError] = useState('');
Expand All @@ -25,14 +28,14 @@ const CloseChatModal = ({ department = {}, onCancel, onConfirm }) => {
}, [comment, onConfirm, tags]);

useComponentDidUpdate(() => {
setCommentError(!comment ? t('The_field_is_required', t('Comment')) : '');
}, [t, comment]);
setCommentError(!comment && commentRequired ? t('The_field_is_required', t('Comment')) : '');
}, [commentRequired, comment, t]);

const canConfirm = useMemo(() => (!tagRequired ? !!comment : !!comment && tags.length > 0), [
comment,
tagRequired,
tags,
]);
const canConfirm = useMemo(() => {
const canConfirmTag = !tagError && (tagRequired ? tags.length > 0 : true);
const canConfirmComment = !commentError && (commentRequired ? !!comment : true);
return canConfirmTag && canConfirmComment;
}, [comment, commentError, commentRequired, tagError, tagRequired, tags.length]);

useEffect(() => {
department?.requestTagBeforeClosingChat && setTagRequired(true);
Expand All @@ -53,7 +56,7 @@ const CloseChatModal = ({ department = {}, onCancel, onConfirm }) => {
<Modal.Content fontScale='p1'>
<Box color='neutral-600'>{t('Close_room_description')}</Box>
<Field marginBlock='x15'>
<Field.Label>{t('Comment')}*</Field.Label>
<Field.Label required={commentRequired}>{t('Comment')}</Field.Label>
<Field.Row>
<TextInput
ref={inputRef}
Expand Down