From 972f4fbb41893551e5011718c1f7d8ef1288fde0 Mon Sep 17 00:00:00 2001
From: soupette <cyril@strapi.io>
Date: Thu, 21 Oct 2021 12:23:46 +0200
Subject: [PATCH] Use display name in CM

Signed-off-by: soupette <cyril@strapi.io>
---
 .../lib/fixtures/collectionTypes/address.js          |  2 +-
 .../pages/App/utils/generateModelsLinks.js           |  2 +-
 .../App/utils/tests/generateModelsLinks.test.js      | 12 ++++++------
 .../src/content-manager/pages/ListView/index.js      |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/admin-test-utils/lib/fixtures/collectionTypes/address.js b/packages/admin-test-utils/lib/fixtures/collectionTypes/address.js
index 6454dc69d3..4d78d806a1 100644
--- a/packages/admin-test-utils/lib/fixtures/collectionTypes/address.js
+++ b/packages/admin-test-utils/lib/fixtures/collectionTypes/address.js
@@ -401,7 +401,7 @@ const addressCT = {
   isDisplayed: true,
   apiID: 'address',
   kind: 'collectionType',
-  info: { name: 'address', description: '', label: 'Addresses' },
+  info: { displayName: 'addresse', name: 'address', description: '', label: 'Addresses' },
   options: {
     draftAndPublish: true,
     increments: true,
diff --git a/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js b/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js
index a31025d8d8..b36dee0fa6 100644
--- a/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js
+++ b/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js
@@ -33,7 +33,7 @@ const generateLinks = (links, type, configurations = []) => {
         permissions,
         search,
         kind: link.kind,
-        title: link.info.label,
+        title: link.info.displayName,
         to: `/content-manager/${link.kind}/${link.uid}`,
         uid: link.uid,
         // Used for the list item key in the helper plugin
diff --git a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js
index 180995026f..a160f7551c 100644
--- a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js
+++ b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js
@@ -23,7 +23,7 @@ describe('ADMIN | LeftMenu | utils', () => {
           kind: 'collectionType',
           uid: 'api::address.address',
           info: {
-            label: 'Addresses',
+            displayName: 'Addresses',
           },
         },
         {
@@ -31,7 +31,7 @@ describe('ADMIN | LeftMenu | utils', () => {
           kind: 'collectionType',
           uid: 'api::test.test',
           info: {
-            label: 'Test',
+            displayName: 'Test',
           },
         },
         {
@@ -39,7 +39,7 @@ describe('ADMIN | LeftMenu | utils', () => {
           kind: 'singleType',
           uid: 'api::test1.test1',
           info: {
-            label: 'Test 1',
+            displayName: 'Test 1',
           },
         },
       ];
@@ -97,7 +97,7 @@ describe('ADMIN | LeftMenu | utils', () => {
           kind: 'collectionType',
           uid: 'api::address.address',
           info: {
-            label: 'Addresses',
+            displayName: 'Addresses',
           },
         },
         {
@@ -105,7 +105,7 @@ describe('ADMIN | LeftMenu | utils', () => {
           kind: 'collectionType',
           uid: 'api::test.test',
           info: {
-            label: 'Test',
+            displayName: 'Test',
           },
         },
         {
@@ -113,7 +113,7 @@ describe('ADMIN | LeftMenu | utils', () => {
           kind: 'singleType',
           uid: 'api::test1.test1',
           info: {
-            label: 'Test 1',
+            displayName: 'Test 1',
           },
         },
       ];
diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
index 2b7e06644b..f61badfc24 100644
--- a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
+++ b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
@@ -223,8 +223,8 @@ function ListView({
     defaultMessage: 'Content',
   });
   const headerLayoutTitle = formatMessage({
-    id: contentType.info.label,
-    defaultMessage: contentType.info.label || defaultHeaderLayoutTitle,
+    id: contentType.info.displayName,
+    defaultMessage: contentType.info.displayName || defaultHeaderLayoutTitle,
   });
 
   const subtitle = canRead
@@ -324,7 +324,7 @@ ListView.propTypes = {
     contentType: PropTypes.shape({
       attributes: PropTypes.object.isRequired,
       metadatas: PropTypes.object.isRequired,
-      info: PropTypes.shape({ label: PropTypes.string.isRequired }).isRequired,
+      info: PropTypes.shape({ displayName: PropTypes.string.isRequired }).isRequired,
       layouts: PropTypes.shape({
         list: PropTypes.array.isRequired,
         editRelations: PropTypes.array,