From b17bc9c7a141b121e1ae239db4e1bcb23ab0e55f Mon Sep 17 00:00:00 2001
From: mfrachet <marvin.frachet@strapi.io>
Date: Mon, 27 Sep 2021 16:37:55 +0200
Subject: [PATCH] Sort CT/ST in RBAC edit role

---
 .../pages/Roles/EditPage/components/ContentTypes/index.js     | 4 +++-
 .../src/pages/SettingsPage/pages/Webhooks/ListView/index.js   | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js
index 8445473b4e..dc48a34749 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js
@@ -10,6 +10,8 @@ const StyledBox = styled(Box)`
 `;
 
 const ContentTypes = ({ isFormDisabled, kind, layout: { actions, subjects } }) => {
+  const sortedSubjects = [...subjects].sort((a, b) => a.label > b.label);
+
   return (
     <StyledBox background="neutral0">
       <GlobalActions actions={actions} kind={kind} isFormDisabled={isFormDisabled} />
@@ -17,7 +19,7 @@ const ContentTypes = ({ isFormDisabled, kind, layout: { actions, subjects } }) =
         actions={actions}
         isFormDisabled={isFormDisabled}
         pathToData={kind}
-        subjects={subjects}
+        subjects={sortedSubjects}
       />
     </StyledBox>
   );
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js
index 42bd82dd4b..63121c1a14 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js
@@ -457,7 +457,6 @@ const ListView = () => {
                     })}
                     action={
                       <Button
-                        size="M"
                         variant="secondary"
                         startIcon={<AddIcon />}
                         onClick={() => (canCreate ? handleGoTo('create') : {})}