# Pull Request Template ## Description Unconfirmed agents (pending email verification) were incorrectly appearing in the "assign agent" dropdown for macros and automations. This fix filters out unconfirmed agents from these dropdowns and adds backend validation to prevent assignment of unconfirmed agents. Fixes #13223 ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? **Backend tests:** ```bash docker compose run --rm rails bundle exec rspec spec/services/action_service_spec.rb ``` - Added tests for confirmed agent assignment (should succeed) - Added tests for unconfirmed agent assignment (should be skipped) **Frontend tests:** ```bash docker compose run --rm rails pnpm test app/javascript/dashboard/composables/spec/useMacros.spec.js ``` - Updated mocks to use `getVerifiedAgents` getter **Manual testing:** 1. Create an unconfirmed agent via platform 2. Navigate to Settings → Macros → New Macro → Add "Assign Agent" action 3. Verify unconfirmed agent does NOT appear in dropdown 4. Navigate to Settings → Automations → New Automation → Add "Assign Agent" action 5. Verify unconfirmed agent does NOT appear in dropdown ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Sojan Jose <sojan@pepalo.com>
181 lines
5.0 KiB
JavaScript
181 lines
5.0 KiB
JavaScript
import { describe, it, expect, vi } from 'vitest';
|
|
import { useMacros } from '../useMacros';
|
|
import { useStoreGetters } from 'dashboard/composables/store';
|
|
import { PRIORITY_CONDITION_VALUES } from 'dashboard/constants/automation';
|
|
|
|
vi.mock('dashboard/composables/store');
|
|
vi.mock('dashboard/helper/automationHelper.js');
|
|
vi.mock('vue-i18n', () => ({
|
|
useI18n: () => ({ t: key => key }),
|
|
}));
|
|
|
|
describe('useMacros', () => {
|
|
const mockLabels = [
|
|
{
|
|
id: 6,
|
|
title: 'sales',
|
|
description: 'sales team',
|
|
color: '#8EA20F',
|
|
show_on_sidebar: true,
|
|
},
|
|
{
|
|
id: 2,
|
|
title: 'billing',
|
|
description: 'billing',
|
|
color: '#4077DA',
|
|
show_on_sidebar: true,
|
|
},
|
|
{
|
|
id: 1,
|
|
title: 'snoozed',
|
|
description: 'Items marked for later',
|
|
color: '#D12F42',
|
|
show_on_sidebar: true,
|
|
},
|
|
{
|
|
id: 5,
|
|
title: 'mobile-app',
|
|
description: 'tech team',
|
|
color: '#2DB1CC',
|
|
show_on_sidebar: true,
|
|
},
|
|
{
|
|
id: 14,
|
|
title: 'human-resources-department-with-long-title',
|
|
description: 'Test',
|
|
color: '#FF6E09',
|
|
show_on_sidebar: true,
|
|
},
|
|
{
|
|
id: 22,
|
|
title: 'priority',
|
|
description: 'For important sales leads',
|
|
color: '#7E7CED',
|
|
show_on_sidebar: true,
|
|
},
|
|
];
|
|
const mockTeams = [
|
|
{
|
|
id: 1,
|
|
name: '⚙️ sales team',
|
|
description: 'This is our internal sales team',
|
|
allow_auto_assign: true,
|
|
account_id: 1,
|
|
is_member: true,
|
|
},
|
|
{
|
|
id: 2,
|
|
name: '🤷♂️ fayaz',
|
|
description: 'Test',
|
|
allow_auto_assign: true,
|
|
account_id: 1,
|
|
is_member: true,
|
|
},
|
|
{
|
|
id: 3,
|
|
name: '🇮🇳 apac sales',
|
|
description: 'Sales team for France Territory',
|
|
allow_auto_assign: true,
|
|
account_id: 1,
|
|
is_member: true,
|
|
},
|
|
];
|
|
const mockAgents = [
|
|
{
|
|
id: 1,
|
|
account_id: 1,
|
|
availability_status: 'offline',
|
|
auto_offline: true,
|
|
confirmed: true,
|
|
email: 'john@doe.com',
|
|
available_name: 'John Doe',
|
|
name: 'John Doe',
|
|
role: 'agent',
|
|
thumbnail: 'https://example.com/image.png',
|
|
},
|
|
{
|
|
id: 9,
|
|
account_id: 1,
|
|
availability_status: 'offline',
|
|
auto_offline: true,
|
|
confirmed: true,
|
|
email: 'clark@kent.com',
|
|
available_name: 'Clark Kent',
|
|
name: 'Clark Kent',
|
|
role: 'agent',
|
|
thumbnail: '',
|
|
},
|
|
];
|
|
|
|
beforeEach(() => {
|
|
useStoreGetters.mockReturnValue({
|
|
'labels/getLabels': { value: mockLabels },
|
|
'teams/getTeams': { value: mockTeams },
|
|
'agents/getVerifiedAgents': { value: mockAgents },
|
|
});
|
|
});
|
|
|
|
it('initializes computed properties correctly', () => {
|
|
const { getMacroDropdownValues } = useMacros();
|
|
expect(getMacroDropdownValues('add_label')).toHaveLength(mockLabels.length);
|
|
expect(getMacroDropdownValues('assign_team')).toHaveLength(
|
|
mockTeams.length
|
|
);
|
|
expect(getMacroDropdownValues('assign_agent')).toHaveLength(
|
|
mockAgents.length + 1
|
|
); // +1 for "Self"
|
|
});
|
|
|
|
it('returns teams for assign_team and send_email_to_team types', () => {
|
|
const { getMacroDropdownValues } = useMacros();
|
|
expect(getMacroDropdownValues('assign_team')).toEqual(mockTeams);
|
|
expect(getMacroDropdownValues('send_email_to_team')).toEqual(mockTeams);
|
|
});
|
|
|
|
it('returns agents with "Self" option for assign_agent type', () => {
|
|
const { getMacroDropdownValues } = useMacros();
|
|
const result = getMacroDropdownValues('assign_agent');
|
|
expect(result[0]).toEqual({ id: 'self', name: 'Self' });
|
|
expect(result.slice(1)).toEqual(mockAgents);
|
|
});
|
|
|
|
it('returns formatted labels for add_label and remove_label types', () => {
|
|
const { getMacroDropdownValues } = useMacros();
|
|
const expectedLabels = mockLabels.map(i => ({
|
|
id: i.title,
|
|
name: i.title,
|
|
}));
|
|
expect(getMacroDropdownValues('add_label')).toEqual(expectedLabels);
|
|
expect(getMacroDropdownValues('remove_label')).toEqual(expectedLabels);
|
|
});
|
|
|
|
it('returns PRIORITY_CONDITION_VALUES for change_priority type', () => {
|
|
const { getMacroDropdownValues } = useMacros();
|
|
const expectedPriority = PRIORITY_CONDITION_VALUES.map(item => ({
|
|
id: item.id,
|
|
name: `MACROS.PRIORITY_TYPES.${item.i18nKey}`,
|
|
}));
|
|
expect(getMacroDropdownValues('change_priority')).toEqual(expectedPriority);
|
|
});
|
|
|
|
it('returns an empty array for unknown types', () => {
|
|
const { getMacroDropdownValues } = useMacros();
|
|
expect(getMacroDropdownValues('unknown_type')).toEqual([]);
|
|
});
|
|
|
|
it('handles empty data correctly', () => {
|
|
useStoreGetters.mockReturnValue({
|
|
'labels/getLabels': { value: [] },
|
|
'teams/getTeams': { value: [] },
|
|
'agents/getVerifiedAgents': { value: [] },
|
|
});
|
|
|
|
const { getMacroDropdownValues } = useMacros();
|
|
expect(getMacroDropdownValues('add_label')).toEqual([]);
|
|
expect(getMacroDropdownValues('assign_team')).toEqual([]);
|
|
expect(getMacroDropdownValues('assign_agent')).toEqual([
|
|
{ id: 'self', name: 'Self' },
|
|
]);
|
|
});
|
|
});
|