From 2d2b721d58778dbe6ea973de553e926f89d2a39d Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Tue, 23 Aug 2022 13:21:45 +0200
Subject: [PATCH 1/7] DynamicTable: Fix RelationSingle test prop-types

---
 .../RelationSingle/tests/__snapshots__/index.test.js.snap       | 2 +-
 .../DynamicTable/CellContent/RelationSingle/tests/index.test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/__snapshots__/index.test.js.snap
index 89b16db8f0..ca40510459 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/__snapshots__/index.test.js.snap
@@ -31,7 +31,7 @@ exports[`DynamicTabe / Cellcontent / RelationSingle renders and matches the snap
   <span
     class="c0 c1"
   >
-    
+    1
   </span>
   <div
     class="c2"
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js
index a923e27a50..7551f0ff0c 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js
@@ -15,7 +15,7 @@ const DEFAULT_PROPS_FIXTURE = {
     },
   },
   value: {
-    count: 1,
+    name: 1,
   },
 };
 

From a228ad66bcb06381620c63aa71f41f7989108828 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Tue, 23 Aug 2022 13:39:32 +0200
Subject: [PATCH 2/7] AssetDialog: Fix prop-types

---
 packages/core/upload/admin/src/constants.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/core/upload/admin/src/constants.js b/packages/core/upload/admin/src/constants.js
index 50e661495b..c81204d302 100644
--- a/packages/core/upload/admin/src/constants.js
+++ b/packages/core/upload/admin/src/constants.js
@@ -77,7 +77,13 @@ export const AssetDefinition = PropTypes.shape({
 
 export const CrumbDefinition = PropTypes.shape({
   id: PropTypes.number,
-  label: PropTypes.string.isRequired,
+  label: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      defaultMessage: PropTypes.string.isRequired,
+    }),
+  ]).isRequired,
   href: PropTypes.string,
 });
 

From 1a91b52e7c3b779926c542831096caaca8abc2ed Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Tue, 23 Aug 2022 13:50:13 +0200
Subject: [PATCH 3/7] ML: Fix header prop-types

---
 packages/core/upload/admin/src/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/upload/admin/src/constants.js b/packages/core/upload/admin/src/constants.js
index c81204d302..e62cd61ea2 100644
--- a/packages/core/upload/admin/src/constants.js
+++ b/packages/core/upload/admin/src/constants.js
@@ -17,7 +17,7 @@ const ParentFolderDefinition = PropTypes.shape({
   createdAt: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   updatedAt: PropTypes.string.isRequired,
-  pathId: PropTypes.number.isRequired,
+  pathId: PropTypes.string.isRequired,
   path: PropTypes.string.isRequired,
 });
 
@@ -37,7 +37,7 @@ export const FolderDefinition = PropTypes.shape({
   parent: PropTypes.oneOfType([ParentFolderDefinition, PropTypes.number]),
   updatedAt: PropTypes.string.isRequired,
   updatedBy: PropTypes.shape(),
-  pathId: PropTypes.number.isRequired,
+  pathId: PropTypes.string.isRequired,
   path: PropTypes.string.isRequired,
 });
 

From 6da2461d3c52d9ca548771155f48eb80ddee608c Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Tue, 23 Aug 2022 13:52:09 +0200
Subject: [PATCH 4/7] BulkMoveButton: Fix prop-types

---
 packages/core/upload/admin/src/constants.js                   | 4 ++--
 packages/core/upload/admin/src/hooks/__mocks__/useFolder.js   | 4 ++--
 packages/core/upload/admin/src/pages/App/tests/Header.test.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/core/upload/admin/src/constants.js b/packages/core/upload/admin/src/constants.js
index e62cd61ea2..c81204d302 100644
--- a/packages/core/upload/admin/src/constants.js
+++ b/packages/core/upload/admin/src/constants.js
@@ -17,7 +17,7 @@ const ParentFolderDefinition = PropTypes.shape({
   createdAt: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   updatedAt: PropTypes.string.isRequired,
-  pathId: PropTypes.string.isRequired,
+  pathId: PropTypes.number.isRequired,
   path: PropTypes.string.isRequired,
 });
 
@@ -37,7 +37,7 @@ export const FolderDefinition = PropTypes.shape({
   parent: PropTypes.oneOfType([ParentFolderDefinition, PropTypes.number]),
   updatedAt: PropTypes.string.isRequired,
   updatedBy: PropTypes.shape(),
-  pathId: PropTypes.string.isRequired,
+  pathId: PropTypes.number.isRequired,
   path: PropTypes.string.isRequired,
 });
 
diff --git a/packages/core/upload/admin/src/hooks/__mocks__/useFolder.js b/packages/core/upload/admin/src/hooks/__mocks__/useFolder.js
index 2441856f70..382b612830 100644
--- a/packages/core/upload/admin/src/hooks/__mocks__/useFolder.js
+++ b/packages/core/upload/admin/src/hooks/__mocks__/useFolder.js
@@ -10,7 +10,7 @@ export const useFolder = jest.fn().mockReturnValue({
       count: 1,
     },
     path: '/1',
-    pathId: '1',
+    pathId: 1,
     updatedAt: '',
     parent: {
       id: 2,
@@ -23,7 +23,7 @@ export const useFolder = jest.fn().mockReturnValue({
         count: 1,
       },
       path: '/1',
-      pathId: '1',
+      pathId: 1,
       updatedAt: '',
     },
   },
diff --git a/packages/core/upload/admin/src/pages/App/tests/Header.test.js b/packages/core/upload/admin/src/pages/App/tests/Header.test.js
index fe118df648..323f14b5f6 100644
--- a/packages/core/upload/admin/src/pages/App/tests/Header.test.js
+++ b/packages/core/upload/admin/src/pages/App/tests/Header.test.js
@@ -24,7 +24,7 @@ const FIXTURE_FOLDER = {
     count: 1,
   },
   path: '/1',
-  pathId: '1',
+  pathId: 1,
   updatedAt: '',
   parent: {
     id: 2,
@@ -37,7 +37,7 @@ const FIXTURE_FOLDER = {
       count: 1,
     },
     path: '/1',
-    pathId: '1',
+    pathId: 1,
     updatedAt: '',
   },
 };

From fc3940fe19d6739472fd1df35457e50e522e9e76 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Tue, 23 Aug 2022 14:02:36 +0200
Subject: [PATCH 5/7] UseCasePage: Fix snapshot tests

---
 .../admin/admin/src/pages/UseCasePage/tests/index.test.js  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js b/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js
index e88175542f..6dcd02398c 100644
--- a/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js
@@ -8,7 +8,7 @@ import UseCasePage from '../index';
 
 jest.mock('../../../components/LocalesProvider/useLocalesProvider', () => () => ({
   changeLocale() {},
-  localeNames: ['en'],
+  localeNames: { en: 'English' },
   messages: ['test'],
 }));
 jest.mock('../../../hooks/useConfigurations', () => () => ({
@@ -734,11 +734,14 @@ describe('Admin | UseCasePage', () => {
                   aria-expanded="false"
                   aria-haspopup="true"
                   class="c2 c3"
+                  label="English"
                   type="button"
                 >
                   <span
                     class="c4 c5"
-                  />
+                  >
+                    English
+                  </span>
                   <div
                     aria-hidden="true"
                     class="c6 c7"

From 58a696436fcaef26d6f7cbdf3eed4b108a2a7e1c Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Tue, 23 Aug 2022 14:04:06 +0200
Subject: [PATCH 6/7] Breadcrumbs: Update snapshot tests & fix prop-types

---
 .../Breadcrumbs/tests/__snapshots__/index.test.js.snap          | 1 +
 .../upload/admin/src/components/Breadcrumbs/tests/index.test.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/upload/admin/src/components/Breadcrumbs/tests/__snapshots__/index.test.js.snap b/packages/core/upload/admin/src/components/Breadcrumbs/tests/__snapshots__/index.test.js.snap
index 8b937fff61..ea5bbe1621 100644
--- a/packages/core/upload/admin/src/components/Breadcrumbs/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/upload/admin/src/components/Breadcrumbs/tests/__snapshots__/index.test.js.snap
@@ -248,6 +248,7 @@ exports[`Media Library | Breadcrumbs should render and match snapshot 1`] = `
 
 <div>
   <nav
+    aria-label="Navigation"
     class="c0 "
   >
     <ol
diff --git a/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js b/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js
index 0d5e448cc2..04570395a4 100644
--- a/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js
+++ b/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js
@@ -40,7 +40,7 @@ const setup = (props) =>
       <MemoryRouter>
         <IntlProvider locale="en" messages={{}}>
           <ThemeProvider theme={lightTheme}>
-            <Breadcrumbs breadcrumbs={defaultBreadcrumbs} as="nav" {...props} />
+            <Breadcrumbs breadcrumbs={defaultBreadcrumbs} label="Navigation" as="nav" {...props} />
           </ThemeProvider>
         </IntlProvider>
       </MemoryRouter>

From bb4e94e343d21db22d517ac9862dc65540f50522 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Tue, 23 Aug 2022 14:06:44 +0200
Subject: [PATCH 7/7] DynamicZone: Fix prop-types

---
 .../components/AddComponentButton/tests/index.test.js          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/index.test.js
index c055ea996d..736b473757 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/index.test.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/index.test.js
@@ -17,6 +17,7 @@ describe('<AddComponentButton />', () => {
         <IntlProvider locale="en" messages={{}} defaultLocale="en">
           <AddComponentButton
             label="test"
+            isDisabled={false}
             isOpen={false}
             name="name"
             onClick={jest.fn()}
@@ -38,6 +39,7 @@ describe('<AddComponentButton />', () => {
           <AddComponentButton
             label="test"
             isOpen
+            isDisabled={false}
             name="name"
             onClick={jest.fn()}
             hasError={false}
@@ -58,6 +60,7 @@ describe('<AddComponentButton />', () => {
           <AddComponentButton
             label=""
             isOpen={false}
+            isDisabled={false}
             name="name"
             onClick={jest.fn()}
             hasError={false}