From f0ff6ac691151161fa6be29e18b52d91d898e0d3 Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Sat, 17 Aug 2024 19:15:20 +0100 Subject: [PATCH] ENCOA-87: Allow MasterCorporate & Corporate to change the type of students and teachers --- src/components/UserCard.tsx | 34 +++++++++++++++++++++++++--- src/pages/(admin)/Lists/UserList.tsx | 14 ++++++++---- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx index 23a79fea..60c8aa79 100644 --- a/src/components/UserCard.tsx +++ b/src/components/UserCard.tsx @@ -525,7 +525,9 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, setExpiryDate(checked ? user.subscriptionExpirationDate || new Date() : null)} - disabled={disabled}> + disabled={ + disabled || (!["admin", "developer"].includes(loggedInUser.type) && !!loggedInUser.subscriptionExpirationDate) + }> Enabled @@ -564,7 +566,12 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, - {checkAccess(loggedInUser, ["developer", "admin"]) && ( + {checkAccess( + loggedInUser, + ["developer", "admin", "corporate", "mastercorporate"], + permissions, + user.type === "teacher" ? "editTeacher" : user.type === "student" ? "editStudent" : undefined, + ) && ( <>
@@ -600,7 +607,28 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,