From 130319e07c1f40aa55410dda6b9a61655552c57b Mon Sep 17 00:00:00 2001
From: Youssef Khedher <khedher.youssef@hotmail.fr>
Date: Fri, 21 Jan 2022 12:18:44 +0100
Subject: [PATCH] fix: update create role links and fix ts errors (#620)

* fix: update create role links and fix ts errors

* fix: update RBAC link in create and edit page
---
 .../CreateProjectRole/CreateProjectRole.tsx           | 10 +++++-----
 .../project-roles/EditProjectRole/EditProjectRole.tsx | 11 ++++++-----
 .../project-roles/ProjectRoleForm/ProjectRoleForm.tsx |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx b/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx
index 2237d763ff..b9a5fb4aed 100644
--- a/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx
+++ b/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx
@@ -48,7 +48,7 @@ const CreateProjectRole = () => {
                     confetti: true,
                     type: 'success',
                 });
-            } catch (e) {
+            } catch (e: any) {
                 setToastApiError(e.toString());
             }
         }
@@ -64,7 +64,7 @@ const CreateProjectRole = () => {
     };
 
     const handleCancel = () => {
-        history.push('/admin/roles');
+        history.goBack();
     };
 
     return (
@@ -72,9 +72,9 @@ const CreateProjectRole = () => {
             loading={loading}
             title="Create project role"
             description="A project role can be
-customised to limit access
-to resources within a project"
-            documentationLink="https://docs.getunleash.io/"
+            customised to limit access
+            to resources within a project"
+            documentationLink="https://docs.getunleash.io/how-to/how-to-create-and-assign-custom-project-roles"
             formatApiCode={formatApiCode}
         >
             <ProjectRoleForm
diff --git a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx
index 56dd493efb..443c9467f7 100644
--- a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx
+++ b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx
@@ -16,7 +16,7 @@ const EditProjectRole = () => {
     const { uiConfig } = useUiConfig();
     const { setToastData, setToastApiError } = useToast();
 
-    const { id } = useParams();
+    const { id } = useParams<{ id: string }>();
     const { role } = useProjectRole(id);
 
     const history = useHistory();
@@ -68,7 +68,7 @@ const EditProjectRole = () => {
     const { refetch } = useProjectRole(id);
     const { editRole, loading } = useProjectRolesApi();
 
-    const handleSubmit = async e => {
+    const handleSubmit = async (e: Event) => {
         e.preventDefault();
         const payload = getProjectRolePayload();
 
@@ -81,18 +81,19 @@ const EditProjectRole = () => {
                 refetch();
                 history.push('/admin/roles');
                 setToastData({
+                    type: 'success',
                     title: 'Project role updated',
                     text: 'Your role changes will automatically be applied to the users with this role.',
                     confetti: true,
                 });
-            } catch (e) {
+            } catch (e: any) {
                 setToastApiError(e.toString());
             }
         }
     };
 
     const handleCancel = () => {
-        history.push('/admin/roles');
+        history.goBack();
     };
 
     return (
@@ -102,7 +103,7 @@ const EditProjectRole = () => {
             description="A project role can be
 customised to limit access
 to resources within a project"
-            documentationLink="https://docs.getunleash.io/"
+            documentationLink="https://docs.getunleash.io/how-to/how-to-create-and-assign-custom-project-roles"
             formatApiCode={formatApiCode}
         >
             <ProjectRoleForm
diff --git a/frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.tsx b/frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.tsx
index 5c84ab364c..55348f904a 100644
--- a/frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.tsx
+++ b/frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.tsx
@@ -33,6 +33,7 @@ interface IProjectRoleForm {
     errors: { [key: string]: string };
     submitButtonText: string;
     clearErrors: () => void;
+    validateNameUniqueness?: () => void;
     getRoleKey: (permission: { id: number; environment?: string }) => string;
 }