From 00e6b008e7a72059cd024c43947ad98daebb2fcb Mon Sep 17 00:00:00 2001
From: HichamELBSI <elabbassih@gmail.com>
Date: Fri, 5 Jun 2020 23:23:52 +0200
Subject: [PATCH] Fix edit a role

Signed-off-by: HichamELBSI <elabbassih@gmail.com>
---
 .../ee/containers/Roles/CreatePage/index.js   |  2 +-
 .../admin/src/components/Roles/RoleForm.js    | 28 ++++++++++++-------
 .../src/containers/Roles/EditPage/index.js    |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js b/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js
index e626f895d0..1d456eef9a 100644
--- a/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js
+++ b/packages/strapi-admin/admin/ee/containers/Roles/CreatePage/index.js
@@ -73,7 +73,7 @@ const CreatePage = () => {
 
   return (
     <Formik
-      initialValues={{ name: null, description: null }}
+      initialValues={{ name: '', description: '' }}
       onSubmit={handleCreateRoleSubmit}
       validationSchema={schema}
     >
diff --git a/packages/strapi-admin/admin/src/components/Roles/RoleForm.js b/packages/strapi-admin/admin/src/components/Roles/RoleForm.js
index cdf06ee301..6d58b7935b 100644
--- a/packages/strapi-admin/admin/src/components/Roles/RoleForm.js
+++ b/packages/strapi-admin/admin/src/components/Roles/RoleForm.js
@@ -7,12 +7,12 @@ import FormCard from '../FormBloc';
 import SizedInput from '../SizedInput';
 import ButtonWithNumber from './ButtonWithNumber';
 
-const RoleForm = ({ usersCount, values, errors, onChange, onBlur, isLoading }) => {
+const RoleForm = ({ role, values, errors, onChange, onBlur, isLoading }) => {
   const { formatMessage } = useIntl();
 
   const actions = [
     <ButtonWithNumber
-      number={usersCount}
+      number={role.usersCount}
       onClick={() => console.log('Open user modal')}
       key="user-button"
     >
@@ -26,12 +26,20 @@ const RoleForm = ({ usersCount, values, errors, onChange, onBlur, isLoading }) =
     <FormCard
       actions={actions}
       isLoading={isLoading}
-      title={formatMessage({
-        id: 'Settings.roles.form.title',
-      })}
-      subtitle={formatMessage({
-        id: 'Settings.roles.form.description',
-      })}
+      title={
+        role
+          ? role.name
+          : formatMessage({
+            id: 'Settings.roles.form.title',
+          })
+      }
+      subtitle={
+        role
+          ? role.description
+          : formatMessage({
+            id: 'Settings.roles.form.description',
+          })
+      }
     >
       <NameInput
         label={formatMessage({
@@ -63,7 +71,7 @@ const RoleForm = ({ usersCount, values, errors, onChange, onBlur, isLoading }) =
 
 RoleForm.defaultProps = {
   isLoading: false,
-  usersCount: 0,
+  role: null,
   values: { name: '', description: '' },
 };
 RoleForm.propTypes = {
@@ -71,7 +79,7 @@ RoleForm.propTypes = {
   isLoading: PropTypes.bool,
   onBlur: PropTypes.func.isRequired,
   onChange: PropTypes.func.isRequired,
-  usersCount: PropTypes.number,
+  role: PropTypes.object,
   values: PropTypes.object,
 };
 
diff --git a/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js b/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js
index 5e77f4daa9..5f472badbf 100644
--- a/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js
+++ b/packages/strapi-admin/admin/src/containers/Roles/EditPage/index.js
@@ -109,7 +109,7 @@ const EditPage = () => {
               values={values}
               onChange={handleChange}
               onBlur={handleBlur}
-              usersCount={role.usersCount}
+              role={role}
             />
             {!isLayoutLoading && !isRoleLoading && (
               <Padded top size="md">