draft

Author: botisSmile

front/e2e/src/helper/filter.ts

@@ -23,17 +23,6 @@ export type FilterValue<T extends FilterType> =
     ? [number, number]
     : never;
 
-// value: TFilters[Name] extends FilterType.BOOLEAN
-//   ? boolean
-//   : TFilters[Name] extends FilterType.TEXT
-//   ? string
-//   : TFilters[Name] extends FilterType.DROPDOWN
-//   ? string
-//   : TFilters[Name] extends FilterType.RANGE
-//   ? [number, number]
-//   : never
-
-
 export type FilterValues<TFilters extends Record<string, FilterType>> = {
   [K in keyof TFilters]?: FilterValue<TFilters[K]>;
 };
@@ -207,7 +196,7 @@ export class Filter<TFilters extends Record<string, FilterType>> {
     for (const name in filters) {
       const value = filters[name];
 
-      // If it's an array (only for DROPDOWN), iterate
+      // If it's an array (only for DROPDOWN), iterate.
       if (Array.isArray(value) && this.filters[name] !== FilterType.RANGE) {
         for (const item of value) {
           await this.removeFilter(name as keyof TFilters & string, item);

front/e2e/src/tests/pages/admin/merchandising/recommenders/recommenderType.spec.ts

@@ -73,19 +73,17 @@ test('Pages > Merchandising > Recommenders > Recommender Types', {tag: ['@premiu
 
   await test.step('Add some filters and remove them', async () => {
     const defaultRowCount = await grid.getCountLines()
+    const applicableFilters = {
+      [testIds.filter.name]: texts.filtersToApply.name,
+      [testIds.filter.code]: texts.filtersToApply.code,
+    }
 
     await test.step('Apply all filters available', async () => {
-      await filter.addFilters({
-        [testIds.filter.name]: texts.filtersToApply.name,
-        [testIds.filter.code]: texts.filtersToApply.code,
-      })
+      await filter.addFilters(applicableFilters)
     })
 
     await test.step('Remove applied filters one by one', async () => {
-      await filter.removeFilters({
-        [testIds.filter.name]: texts.filtersToApply.name,
-        [testIds.filter.code]: texts.filtersToApply.code,
-      })
+      await filter.removeFilters(applicableFilters)
     })
 
     await test.step('Apply a filter and compare the grid to see if it works', async () => {

front/e2e/src/tests/pages/admin/search/facets.spec.ts.orig

@@ -121,25 +121,20 @@ test('Pages > Search > Thésaurus', {tag: ['@premium']}, async ({page}) => {
 
   await test.step('Add some filters and remove them', async () => {
     const defaultRowCount = await grid.getCountLines()
+    const applicableFilters = {
+      [testIds.filter.name]: texts.filtersToApply.name,
+      [testIds.filter.type]: texts.filtersToApply.type,
+      [testIds.filter.terms]: texts.filtersToApply.terms,
+      [testIds.filter.isActive]: texts.filtersToApply.isActive,
+      [testIds.filter.context]: texts.filtersToApply.context,
+    }
 
     await test.step('Apply all filters available', async () => {
-      await filter.addFilters({
-        [testIds.filter.name]: texts.filtersToApply.name,
-        [testIds.filter.type]: texts.filtersToApply.type,
-        [testIds.filter.terms]: texts.filtersToApply.terms,
-        [testIds.filter.isActive]: texts.filtersToApply.isActive,
-        [testIds.filter.context]: texts.filtersToApply.context,
-      })
+      await filter.addFilters(applicableFilters)
     })
 
     await test.step('Remove applied filters one by one', async () => {
-      await filter.removeFilters({
-        [testIds.filter.name]: texts.filtersToApply.name,
-        [testIds.filter.type]: texts.filtersToApply.type,
-        [testIds.filter.terms]: texts.filtersToApply.terms,
-        [testIds.filter.isActive]: texts.filtersToApply.isActive,
-        [testIds.filter.context]: texts.filtersToApply.context,
-      })
+      await filter.removeFilters(applicableFilters)
     })
 
     await test.step('Apply a filter and compare the grid to see if it works', async () => {