Skip to content

Commit

Permalink
test(all): some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bricks666
Bricks666 committed Sep 22, 2024
1 parent 9f91b15 commit 1b7efff
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 91 deletions.
83 changes: 39 additions & 44 deletions src/features/activities/activities-filters/__snapshots__/filters.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`features/activities/activities-filters/filters > should render buttons
<body>
<div>
<button
aria-controls=":r1:"
aria-controls=":r0:"
aria-expanded="false"
aria-haspopup="true"
aria-label="actions.filter_activities.title"
Expand Down Expand Up @@ -40,7 +40,7 @@ exports[`features/activities/activities-filters/filters > should render form in
aria-hidden="true"
>
<button
aria-controls=":r4:"
aria-controls=":r2:"
aria-expanded="true"
aria-haspopup="true"
aria-label="actions.filter_activities.title"
Expand All @@ -66,8 +66,9 @@ exports[`features/activities/activities-filters/filters > should render form in
</button>
</div>
<div
aria-label="actions.filter_activities.title"
class="MuiPopover-root MuiModal-root css-1o2t9a7-MuiModal-root-MuiPopover-root"
id=":r4:"
id=":r2:"
role="presentation"
>
<div
Expand All @@ -84,14 +85,8 @@ exports[`features/activities/activities-filters/filters > should render form in
style="opacity: 1; transform: scale(1, 1); transition: opacity 0ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,transform 0ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; top: 16px; left: 16px; transform-origin: -16px -16px;"
tabindex="-1"
>
<p
class="MuiTypography-root MuiTypography-body1 visibility-hidden css-ahj2mt-MuiTypography-root"
id=":r3:"
>
actions.filter_activities.title
</p>
<form
aria-labelledby=":r3:"
aria-label="actions.filter_activities.title"
class="_form_b70bb9"
>
<div
Expand All @@ -103,8 +98,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1p1nhed-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="false"
for=":r6:"
id=":r6:-label"
for=":r4:"
id=":r4:-label"
>
actions.filter_activities.fields.action
</label>
Expand All @@ -118,7 +113,7 @@ exports[`features/activities/activities-filters/filters > should render form in
autocapitalize="none"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-1mv6xrr-MuiInputBase-input-MuiOutlinedInput-input"
id=":r6:"
id=":r4:"
name="action"
role="combobox"
spellcheck="false"
Expand Down Expand Up @@ -175,8 +170,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1p1nhed-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="false"
for=":r8:"
id=":r8:-label"
for=":r6:"
id=":r6:-label"
>
actions.filter_activities.fields.spheres
</label>
Expand All @@ -190,7 +185,7 @@ exports[`features/activities/activities-filters/filters > should render form in
autocapitalize="none"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-1mv6xrr-MuiInputBase-input-MuiOutlinedInput-input"
id=":r8:"
id=":r6:"
name="spheres"
role="combobox"
spellcheck="false"
Expand Down Expand Up @@ -247,8 +242,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1p1nhed-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="false"
for=":ra:"
id=":ra:-label"
for=":r8:"
id=":r8:-label"
>
actions.filter_activities.fields.users
</label>
Expand All @@ -262,7 +257,7 @@ exports[`features/activities/activities-filters/filters > should render form in
autocapitalize="none"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-1mv6xrr-MuiInputBase-input-MuiOutlinedInput-input"
id=":ra:"
id=":r8:"
name="activists"
role="combobox"
spellcheck="false"
Expand Down Expand Up @@ -316,8 +311,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiFormLabel-filled MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1im7hqj-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="true"
for=":rd:"
id=":rd:-label"
for=":rb:"
id=":rb:-label"
>
fields.create_after
</label>
Expand All @@ -329,7 +324,7 @@ exports[`features/activities/activities-filters/filters > should render form in
aria-label="Choose date"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input Mui-readOnly MuiInputBase-readOnly css-1gjhcy5-MuiInputBase-input-MuiOutlinedInput-input"
id=":rd:"
id=":rb:"
inputmode="text"
name="after"
placeholder="MM/DD/YYYY"
Expand Down Expand Up @@ -357,8 +352,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiFormLabel-filled MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1im7hqj-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="true"
for=":rg:"
id=":rg:-label"
for=":re:"
id=":re:-label"
>
fields.create_before
</label>
Expand All @@ -370,7 +365,7 @@ exports[`features/activities/activities-filters/filters > should render form in
aria-label="Choose date"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input Mui-readOnly MuiInputBase-readOnly css-1gjhcy5-MuiInputBase-input-MuiOutlinedInput-input"
id=":rg:"
id=":re:"
inputmode="text"
name="before"
placeholder="MM/DD/YYYY"
Expand Down Expand Up @@ -431,7 +426,7 @@ exports[`features/activities/activities-filters/filters > should render form in
aria-hidden="true"
>
<button
aria-controls=":rj:"
aria-controls=":rg:"
aria-expanded="true"
aria-haspopup="true"
aria-label="actions.filter_activities.title"
Expand All @@ -458,7 +453,7 @@ exports[`features/activities/activities-filters/filters > should render form in
</div>
<div
class="MuiDialog-root MuiModal-root css-1p9gn7o-MuiModal-root-MuiDialog-root"
id=":rj:"
id=":rg:"
role="presentation"
>
<div
Expand All @@ -477,7 +472,7 @@ exports[`features/activities/activities-filters/filters > should render form in
tabindex="-1"
>
<div
aria-labelledby=":rl:"
aria-labelledby=":ri:"
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiDialog-paperFullScreen css-e9vkov-MuiPaper-root-MuiDialog-paper"
role="dialog"
>
Expand Down Expand Up @@ -511,7 +506,7 @@ exports[`features/activities/activities-filters/filters > should render form in
class="MuiDialogContent-root _content_62745c css-ypiqx9-MuiDialogContent-root"
>
<form
aria-labelledby=":ri:"
aria-label="actions.filter_activities.title"
class="_form_b70bb9"
>
<div
Expand All @@ -523,8 +518,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1p1nhed-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="false"
for=":rm:"
id=":rm:-label"
for=":rj:"
id=":rj:-label"
>
actions.filter_activities.fields.action
</label>
Expand All @@ -538,7 +533,7 @@ exports[`features/activities/activities-filters/filters > should render form in
autocapitalize="none"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-1mv6xrr-MuiInputBase-input-MuiOutlinedInput-input"
id=":rm:"
id=":rj:"
name="action"
role="combobox"
spellcheck="false"
Expand Down Expand Up @@ -595,8 +590,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1p1nhed-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="false"
for=":ro:"
id=":ro:-label"
for=":rl:"
id=":rl:-label"
>
actions.filter_activities.fields.spheres
</label>
Expand All @@ -610,7 +605,7 @@ exports[`features/activities/activities-filters/filters > should render form in
autocapitalize="none"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-1mv6xrr-MuiInputBase-input-MuiOutlinedInput-input"
id=":ro:"
id=":rl:"
name="spheres"
role="combobox"
spellcheck="false"
Expand Down Expand Up @@ -667,8 +662,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1p1nhed-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="false"
for=":rq:"
id=":rq:-label"
for=":rn:"
id=":rn:-label"
>
actions.filter_activities.fields.users
</label>
Expand All @@ -682,7 +677,7 @@ exports[`features/activities/activities-filters/filters > should render form in
autocapitalize="none"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedEnd MuiAutocomplete-input MuiAutocomplete-inputFocused css-1mv6xrr-MuiInputBase-input-MuiOutlinedInput-input"
id=":rq:"
id=":rn:"
name="activists"
role="combobox"
spellcheck="false"
Expand Down Expand Up @@ -736,8 +731,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiFormLabel-filled MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1im7hqj-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="true"
for=":rt:"
id=":rt:-label"
for=":rq:"
id=":rq:-label"
>
fields.create_after
</label>
Expand All @@ -749,7 +744,7 @@ exports[`features/activities/activities-filters/filters > should render form in
aria-label="Choose date"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input Mui-readOnly MuiInputBase-readOnly css-1gjhcy5-MuiInputBase-input-MuiOutlinedInput-input"
id=":rt:"
id=":rq:"
inputmode="text"
name="after"
placeholder="MM/DD/YYYY"
Expand Down Expand Up @@ -777,8 +772,8 @@ exports[`features/activities/activities-filters/filters > should render form in
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiFormLabel-filled MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined css-1im7hqj-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="true"
for=":r10:"
id=":r10:-label"
for=":rt:"
id=":rt:-label"
>
fields.create_before
</label>
Expand All @@ -790,7 +785,7 @@ exports[`features/activities/activities-filters/filters > should render form in
aria-label="Choose date"
autocomplete="off"
class="MuiInputBase-input MuiOutlinedInput-input Mui-readOnly MuiInputBase-readOnly css-1gjhcy5-MuiInputBase-input-MuiOutlinedInput-input"
id=":r10:"
id=":rt:"
inputmode="text"
name="before"
placeholder="MM/DD/YYYY"
Expand Down
16 changes: 8 additions & 8 deletions src/features/activities/activities-filters/filters.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ export const ActivitiesFilters: React.FC<ActivitiesFiltersProps> = (props) => {
toggleOff();
};

const titleText = t('actions.filter_activities.title');
const submitText = t('actions.filter_activities.actions.submit');
const resetText = t('actions.filter_activities.actions.reset');
const titleT = t('actions.filter_activities.title');
const submitT = t('actions.filter_activities.actions.submit');
const resetT = t('actions.filter_activities.actions.reset');

const buttons = (
<>
Expand All @@ -50,14 +50,14 @@ export const ActivitiesFilters: React.FC<ActivitiesFiltersProps> = (props) => {
type='reset'
variant='text'
color='primary'>
{resetText}
{resetT}
</Button>
<Button
className={styles.submit}
onClick={onSubmit}
type='submit'
variant='contained'>
{submitText}
{submitT}
</Button>
</>
);
Expand All @@ -67,14 +67,14 @@ export const ActivitiesFilters: React.FC<ActivitiesFiltersProps> = (props) => {
open={open}
onOpen={toggleOn}
onClose={toggleOff}
title={titleText}
title={titleT}
icon={<TuneIcon />}
slots={{ actions: buttons, }}>
{({ isPopup, titleId, }) => (
{({ isPopup, }) => (
<form
className={cn(styles.form, className)}
onSubmit={onSubmit}
aria-labelledby={titleId}>
aria-label={titleT}>
<Action />
<Spheres />
<Users />
Expand Down
Loading

0 comments on commit 1b7efff

Please sign in to comment.