Skip to content

[FIX] Remove requirements to tag description and department #19169

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 1 commit into from
Oct 13, 2020
Merged

[FIX] Remove requirements to tag description and department #19169

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
14 changes: 7 additions & 7 deletions ee/client/omnichannel/tags/EditTag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function TagEdit({ data, tagId, isNew, availableDepartments, reload, ...p

const options = useMemo(() => (availableDepartments && availableDepartments.departments ? availableDepartments.departments.map(({ _id, name }) => [_id, name || _id]) : []), [availableDepartments]);

const { values, handlers, hasUnsavedChanges } = useForm({ name: tag.name, description: tag.description, departments: tag.departments });
const { values, handlers, hasUnsavedChanges } = useForm({ name: tag.name, description: tag.description, departments: tag.departments && tag.departments[0] === '' ? [] : tag.departments });

const {
handleName,
Expand All @@ -68,8 +68,6 @@ export function TagEdit({ data, tagId, isNew, availableDepartments, reload, ...p
} = values;

const nameError = useMemo(() => (!name || name.length === 0 ? t('The_field_is_required', 'name') : undefined), [name, t]);
const descriptionError = useMemo(() => (!description || description.length === 0 ? t('The_field_is_required', 'description') : undefined), [description, t]);
const departmentError = useMemo(() => (!departments || departments.length === 0 ? t('The_field_is_required', 'departments') : undefined), [departments, t]);

const saveTag = useMethod('livechat:saveTag');

Expand All @@ -79,7 +77,7 @@ export function TagEdit({ data, tagId, isNew, availableDepartments, reload, ...p
reload();
});

const canSave = useMemo(() => !nameError && !descriptionError && !departmentError, [nameError, descriptionError, departmentError]);
const canSave = useMemo(() => !nameError, [nameError]);

const handleSave = useMutableCallback(async () => {
const tagData = { name, description };
Expand All @@ -88,8 +86,10 @@ export function TagEdit({ data, tagId, isNew, availableDepartments, reload, ...p
return dispatchToastMessage({ type: 'error', message: t('The_field_is_required') });
}

const finalDepartments = departments || [''];

try {
await saveTag(tagId, tagData, departments);
await saveTag(tagId, tagData, finalDepartments);
dispatchToastMessage({ type: 'success', message: t('saved') });
reload();
tagsRoute.push({});
Expand All @@ -108,13 +108,13 @@ export function TagEdit({ data, tagId, isNew, availableDepartments, reload, ...p
<Field>
<Field.Label>{t('Description')}</Field.Label>
<Field.Row>
<TextInput flexGrow={1} value={description} onChange={handleDescription} error={hasUnsavedChanges && descriptionError} />
<TextInput flexGrow={1} value={description} onChange={handleDescription} />
</Field.Row>
</Field>
<Field>
<Field.Label>{t('Departments')}</Field.Label>
<Field.Row>
<MultiSelect options={options} value={departments} error={hasUnsavedChanges && departmentError} maxWidth='100%' placeholder={t('Select_an_option')} onChange={handleDepartments} flexGrow={1}/>
<MultiSelect options={options} value={departments} maxWidth='100%' placeholder={t('Select_an_option')} onChange={handleDepartments} flexGrow={1}/>
</Field.Row>
</Field>

Expand Down