From 2e4a0d0bb810cd62ab5ef9a5d3d2dddf8bcc84f1 Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Tue, 8 Dec 2020 16:31:27 +0100
Subject: [PATCH] Fix filters

Signed-off-by: soupette <cyril.lpz@gmail.com>
---
 .../admin/src/containers/ListView/Filter.js                 | 6 ++++--
 .../admin/src/containers/ListView/index.js                  | 1 +
 .../hooks/useFetchContentTypeLayout/utils/formatLayouts.js  | 2 --
 .../utils/tests/formatLayouts.test.js                       | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/Filter.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/Filter.js
index 53fa1c52be..8b4ecffba9 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/Filter.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/Filter.js
@@ -10,6 +10,7 @@ function Filter({
   filterName,
   filters,
   index,
+  metadatas,
   name,
   value,
   toggleFilterPickerState,
@@ -55,8 +56,8 @@ function Filter({
       toggleFilterPickerState();
     }
 
-    setQuery(formatFiltersToQuery(updatedFilters));
-  }, [filters, index, isFilterPickerOpen, setQuery, toggleFilterPickerState]);
+    setQuery(formatFiltersToQuery(updatedFilters, metadatas));
+  }, [filters, index, isFilterPickerOpen, metadatas, setQuery, toggleFilterPickerState]);
 
   return <FilterButton onClick={handleClick} label={label} type={type} />;
 }
@@ -72,6 +73,7 @@ Filter.propTypes = {
   filters: PropTypes.array.isRequired,
   index: PropTypes.number.isRequired,
   isFilterPickerOpen: PropTypes.bool.isRequired,
+  metadatas: PropTypes.object.isRequired,
   name: PropTypes.string,
   setQuery: PropTypes.func.isRequired,
   toggleFilterPickerState: PropTypes.func.isRequired,
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js
index f7d0db673f..90d4618da1 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js
@@ -407,6 +407,7 @@ function ListView({
                             filters={filters}
                             index={key}
                             key={key}
+                            metadatas={metadatas}
                             name={name}
                             toggleFilterPickerState={toggleFilterPickerState}
                             isFilterPickerOpen={isFilterPickerOpen}
diff --git a/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js b/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js
index 9c77b00a44..f3ce5ab9b0 100644
--- a/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js
+++ b/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js
@@ -215,9 +215,7 @@ export {
   formatEditRelationsLayoutWithMetas,
   formatLayoutWithMetas,
   formatListLayoutWithMetas,
-  // formatMetadatasRelations,
   generateRelationQueryInfos,
   generateRelationQueryInfosForComponents,
-  // getMainField,
   getDisplayedModels,
 };
diff --git a/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js b/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js
index 7fd812248d..3ac3462035 100644
--- a/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js
+++ b/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js
@@ -20,7 +20,6 @@ const addressSchema = {
   metadatas: {
     categories: {
       edit: {
-        // mainField: 'name',
         mainField: {
           name: 'name',
           type: 'string',