Skip to content

fix: Remove requestTagBeforeClosing dependency from chatClosingTags #37822

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
kodiakhq merged 10 commits into from
Dec 19, 2025
Merged

fix: Remove requestTagBeforeClosing dependency from chatClosingTags #37822

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
32acd93
chore: adds improvements to requestTagBeforeClosing business logic
lucas-a-pelegrino Dec 15, 2025
69c738a
tests: updates e2e tests with new form behavior
lucas-a-pelegrino Dec 16, 2025
ca60722
docs: adds .changeset
lucas-a-pelegrino Dec 16, 2025
6ad6e21
chore: unlinks setting from input
lucas-a-pelegrino Dec 18, 2025
37efc29
chore: improves tag alignment below tags input
lucas-a-pelegrino Dec 18, 2025
c74f047
chore: removes required from tags input
lucas-a-pelegrino Dec 18, 2025
72abb5a
chore: update changeset
dougfabris Dec 18, 2025
5a3eb1f
test: fix e2e test
dougfabris Dec 18, 2025
26a643e
Merge branch 'develop' into bugfix/SUP-918
kodiakhq[bot] Dec 19, 2025
5a25ea0
Merge branch 'develop' into bugfix/SUP-918
kodiakhq[bot] Dec 19, 2025
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
5 changes: 5 additions & 0 deletions .changeset/real-grapes-itch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes an issue where it‘s not being possible to configure department's `chatClosingTags` without enabling `requestTagBeforeClosingTag`
2 changes: 1 addition & 1 deletion apps/meteor/client/views/omnichannel/departments/DepartmentTags.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const DepartmentTags = ({ error, value: tags, onChange, ...props }: DepartmentTa
</Button>
</FieldRow>
{tags?.length > 0 && (
<FieldRow>
<FieldRow justifyContent='flex-start'>
{tags.map((tag, i) => (
<Chip key={i} onClick={handleTagChipClick(tag)} mie={8}>
{tag}
Expand Down
50 changes: 21 additions & 29 deletions apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,9 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
register,
control,
handleSubmit,
watch,
formState: { errors, isValid, isDirty, isSubmitting },
} = useForm<EditDepartmentFormData>({ mode: 'onChange', defaultValues: initialValues });

const requestTagBeforeClosingChat = watch('requestTagBeforeClosingChat');

const [fallbackFilter, setFallbackFilter] = useState<string>('');
const [isUnitRequired, setUnitRequired] = useState(false);

Expand Down Expand Up @@ -414,33 +411,28 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
</FieldRow>
</Field>

{requestTagBeforeClosingChat && (
<Field>
<FieldLabel htmlFor={chatClosingTagsField} required>
{t('Conversation_closing_tags')}
</FieldLabel>
<Controller
control={control}
name='chatClosingTags'
rules={{ required: t('Required_field', 'tags') }}
render={({ field: { value, onChange } }) => (
<DepartmentTags
id={chatClosingTagsField}
value={value}
onChange={onChange}
error={errors.chatClosingTags?.message as string}
aria-describedby={`${chatClosingTagsField}-hint ${chatClosingTagsField}-error`}
/>
)}
/>
<FieldHint id={`${chatClosingTagsField}-hint`}>{t('Conversation_closing_tags_description')}</FieldHint>
{errors.chatClosingTags && (
<FieldError aria-live='assertive' id={`${chatClosingTagsField}-error`}>
{errors.chatClosingTags?.message}
</FieldError>
<Field>
<FieldLabel htmlFor={chatClosingTagsField}>{t('Conversation_closing_tags')}</FieldLabel>
<Controller
control={control}
name='chatClosingTags'
render={({ field: { value, onChange } }) => (
<DepartmentTags
id={chatClosingTagsField}
value={value}
onChange={onChange}
error={errors.chatClosingTags?.message as string}
aria-describedby={`${chatClosingTagsField}-hint ${chatClosingTagsField}-error`}
/>
)}
</Field>
)}
/>
<FieldHint id={`${chatClosingTagsField}-hint`}>{t('Conversation_closing_tags_description')}</FieldHint>
{errors.chatClosingTags && (
<FieldError aria-live='assertive' id={`${chatClosingTagsField}-error`}>
{errors.chatClosingTags?.message}
</FieldError>
)}
</Field>

<Field>
<FieldRow>
Expand Down
14 changes: 9 additions & 5 deletions apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,13 @@ test.describe('OC - Manage Departments', () => {
await expect(poOmnichannelDepartments.toggleRequestTags).toBeVisible();
});

await test.step('expect have no add tag to department', async () => {
await expect(poOmnichannelDepartments.inputTags).not.toBeVisible();
await expect(poOmnichannelDepartments.btnTagsAdd).not.toBeVisible();
await test.step('expect tag input to be visible but disabled', async () => {
await expect(poOmnichannelDepartments.inputTags).toBeVisible();
await expect(poOmnichannelDepartments.btnTagsAdd).toBeVisible();

await expect(poOmnichannelDepartments.inputTags).toBeDisabled();
await expect(poOmnichannelDepartments.btnTagsAdd).toBeDisabled();

await poOmnichannelDepartments.btnBack.click();
});
});
Expand All @@ -244,8 +248,8 @@ test.describe('OC - Manage Departments', () => {

await test.step('expect clicking on toggle button to enable tags', async () => {
await poOmnichannelDepartments.toggleRequestTags.click();
await expect(poOmnichannelDepartments.inputTags).toBeVisible();
await expect(poOmnichannelDepartments.btnTagsAdd).toBeVisible();

await expect(poOmnichannelDepartments.inputTags).toBeEnabled();
});

await test.step('expect to have add and remove one tag properly tags', async () => {
Expand Down
Loading