From 566de24d881ca15c6b92f15468500dd405087bab Mon Sep 17 00:00:00 2001
From: soupette <cyril@strapi.io>
Date: Wed, 15 Sep 2021 14:32:50 +0200
Subject: [PATCH] Fix react-intl in table head

Signed-off-by: soupette <cyril@strapi.io>
---
 .../src/content-manager/pages/ListView/FieldPicker/index.js  | 5 ++++-
 .../lib/src/components/DynamicTable/TableHead/index.js       | 2 +-
 .../lib/src/components/FilterListURLQuery/AttributeTag.js    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js
index 02b07293bb..a404c171bc 100644
--- a/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js
+++ b/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js
@@ -54,7 +54,10 @@ const FieldPicker = ({ layout }) => {
       {allAllowedHeaders.map(header => {
         return (
           <Option key={header.name} value={header.name}>
-            {formatMessage(header.intlLabel)}
+            {formatMessage({
+              id: header.intlLabel.id || header.name,
+              defaultMessage: header.intlLabel.defaultMessage || header.name,
+            })}
           </Option>
         );
       })}
diff --git a/packages/core/helper-plugin/lib/src/components/DynamicTable/TableHead/index.js b/packages/core/helper-plugin/lib/src/components/DynamicTable/TableHead/index.js
index 77ad1e2ed1..3cd34dc6a1 100644
--- a/packages/core/helper-plugin/lib/src/components/DynamicTable/TableHead/index.js
+++ b/packages/core/helper-plugin/lib/src/components/DynamicTable/TableHead/index.js
@@ -52,7 +52,7 @@ const TableHead = ({
             { id: 'components.TableHeader.sort', defaultMessage: 'Sort on {label}' },
             { label }
           );
-          const intlLabel = formatMessage({ id: label, defaultMessage: label });
+          const intlLabel = formatMessage({ id: label || name, defaultMessage: label || name });
 
           const handleClickSort = (shouldAllowClick = true) => {
             if (isSortable && shouldAllowClick) {
diff --git a/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/AttributeTag.js b/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/AttributeTag.js
index c4fdd83ac3..5cbb94b7cd 100644
--- a/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/AttributeTag.js
+++ b/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/AttributeTag.js
@@ -45,7 +45,7 @@ const AttributeTag = ({ attribute, filter, onClick, operator, value }) => {
   return (
     <Box padding={1} onClick={handleClick}>
       <Tag icon={<Close />}>
-        {attribute.metadatas.label}&nbsp;
+        {attribute.metadatas.label || attribute.name}&nbsp;
         {formatMessage({
           id: `components.FilterOptions.FILTER_TYPES.${operator}`,
           defaultMessage: operator,