Skip to content

Commit 08b586d

Browse files
test: Reorg omnichannel admin page objects (#37972)
Co-authored-by: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
1 parent 3458078 commit 08b586d

File tree

170 files changed

+2362
-2615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+2362
-2615
lines changed

apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusRow.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,7 @@ const CustomUserStatusRow = ({ status, onClick }: CustomUserStatusRowProps): Rea
1717
const { t } = useTranslation();
1818

1919
return (
20-
<GenericTableRow
21-
key={_id}
22-
onKeyDown={(): void => onClick(_id)}
23-
onClick={(): void => onClick(_id)}
24-
tabIndex={0}
25-
role='link'
26-
action
27-
qa-user-id={_id}
28-
>
20+
<GenericTableRow key={_id} onKeyDown={() => onClick(_id)} onClick={() => onClick(_id)} tabIndex={0} action>
2921
<GenericTableCell fontScale='p2' color='default' style={style}>
3022
<MarkdownText content={name} parseEmoji={true} variant='inline' />
3123
</GenericTableCell>

apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,7 @@ const AgentEdit = ({ agentData, agentDepartments }: AgentEditProps) => {
164164
name='status'
165165
control={control}
166166
render={({ field }) => (
167-
<Select
168-
id={statusField}
169-
data-qa-id='agent-edit-status'
170-
{...field}
171-
options={statusOptions}
172-
placeholder={t('Select_an_option')}
173-
/>
167+
<Select id={statusField} {...field} options={statusOptions} placeholder={t('Select_an_option')} />
174168
)}
175169
/>
176170
</FieldRow>
@@ -185,7 +179,7 @@ const AgentEdit = ({ agentData, agentDepartments }: AgentEditProps) => {
185179
<Button type='reset' disabled={!isDirty} onClick={() => reset()}>
186180
{t('Reset')}
187181
</Button>
188-
<Button form={formId} primary type='submit' data-qa-id='agent-edit-save' disabled={!isDirty}>
182+
<Button form={formId} primary type='submit' disabled={!isDirty}>
189183
{t('Save')}
190184
</Button>
191185
</ButtonGroup>

apps/meteor/client/views/omnichannel/agents/AgentInfoAction.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type AgentInfoActionProps = {
99
} & Omit<HTMLAttributes<HTMLElement>, 'is'>;
1010

1111
const AgentInfoAction = ({ icon, label, ...props }: AgentInfoActionProps) => (
12-
<Button icon={icon} data-qa={`agent-info-action-${label?.toLowerCase()}`} title={label} {...props}>
12+
<Button icon={icon} title={label} {...props}>
1313
{label}
1414
</Button>
1515
);

apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ const AgentsTable = () => {
9696
)}
9797
{isSuccess && data?.users.length > 0 && (
9898
<>
99-
<GenericTable aria-busy={isLoading} data-qa-id='agents-table'>
99+
<GenericTable aria-label={t('Agents')} aria-busy={isLoading}>
100100
<GenericTableHeader>{headers}</GenericTableHeader>
101-
<GenericTableBody data-qa='GenericTableAgentInfoBody'>
101+
<GenericTableBody>
102102
{data?.users.map((user) => <AgentsTableRow key={user._id} user={user} mediaQuery={mediaQuery} />)}
103103
</GenericTableBody>
104104
</GenericTable>

apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTableRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const AgentsTableRow = ({
2727
const handleDelete = useRemoveAgent(_id);
2828

2929
return (
30-
<GenericTableRow data-qa-id={username} action onClick={() => router.navigate(`/omnichannel/agents/info/${_id}`)}>
30+
<GenericTableRow action onClick={() => router.navigate(`/omnichannel/agents/info/${_id}`)}>
3131
<GenericTableCell>
3232
<Box display='flex' alignItems='center'>
3333
{username && <UserAvatar size={mediaQuery ? 'x28' : 'x40'} title={username} username={username} etag={avatarETag} />}

apps/meteor/client/views/omnichannel/agents/hooks/useRemoveAgent.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,7 @@ export const useRemoveAgent = (uid: ILivechatAgent['_id']) => {
3030
}
3131
};
3232

33-
setModal(
34-
<GenericModal
35-
data-qa-id='remove-agent-modal'
36-
variant='danger'
37-
onConfirm={onDeleteAgent}
38-
onCancel={() => setModal()}
39-
confirmText={t('Delete')}
40-
/>,
41-
);
33+
setModal(<GenericModal variant='danger' onConfirm={onDeleteAgent} onCancel={() => setModal()} confirmText={t('Delete')} />);
4234
});
4335

4436
return handleDelete;

apps/meteor/client/views/omnichannel/businessHours/BusinessHoursRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const BusinessHoursRow = ({ _id, name, timezone, workHours, active, type }: Seri
2727
const openDays = useMemo(() => workHours.filter(({ open }) => !!open).map(({ day }) => day), [workHours]);
2828

2929
return (
30-
<GenericTableRow key={_id} role='link' action tabIndex={0} onClick={handleClick} onKeyDown={handleKeyDown}>
30+
<GenericTableRow key={_id} action tabIndex={0} onClick={handleClick} onKeyDown={handleKeyDown}>
3131
<GenericTableCell withTruncatedText>{name || t('Default')}</GenericTableCell>
3232
<GenericTableCell withTruncatedText>{t(timezone.name as TranslationKey)}</GenericTableCell>
3333
<GenericTableCell withTruncatedText>{openDays.join(', ')}</GenericTableCell>

apps/meteor/client/views/omnichannel/businessHours/BusinessHoursTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const BusinessHoursTable = () => {
6565
{isSuccess && data?.businessHours.length === 0 && <GenericNoResults />}
6666
{isSuccess && data?.businessHours.length > 0 && (
6767
<>
68-
<GenericTable>
68+
<GenericTable aria-label={t('Business_Hours')}>
6969
<GenericTableHeader>{headers}</GenericTableHeader>
7070
<GenericTableBody>
7171
{data?.businessHours.map((businessHour) => <BusinessHoursRow key={businessHour._id} {...businessHour} />)}

apps/meteor/client/views/omnichannel/cannedResponses/modals/CannedResponsesTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const CannedResponsesTable = () => {
152152
<GenericTableHeader>{headers}</GenericTableHeader>
153153
<GenericTableBody>
154154
{data?.cannedResponses.map(({ _id, shortcut, scope, createdBy, _createdAt, tags = [] }) => (
155-
<GenericTableRow key={_id} tabIndex={0} role='link' onClick={onRowClick(_id, scope)} action qa-user-id={_id}>
155+
<GenericTableRow key={_id} tabIndex={0} role='link' onClick={onRowClick(_id, scope)} action>
156156
<GenericTableCell withTruncatedText>{shortcut}</GenericTableCell>
157157
<GenericTableCell withTruncatedText>{defaultOptions[scope as Scope]}</GenericTableCell>
158158
<GenericTableCell withTruncatedText>

apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ const CustomFieldsPage = () => {
2121
<Page flexDirection='row'>
2222
<Page>
2323
<PageHeader title={t('Custom_Fields')}>
24-
<Button data-qa-id='CustomFieldPageBtnNew' onClick={() => router.navigate('/omnichannel/customfields/new')}>
25-
{t('Create_custom_field')}
26-
</Button>
24+
<Button onClick={() => router.navigate('/omnichannel/customfields/new')}>{t('Create_custom_field')}</Button>
2725
</PageHeader>
2826
<PageContent>
2927
<CustomFieldsTable />

0 commit comments

Comments
 (0)