awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change deactivate button messaging, add scim check

Browse Source
This commit is contained in:
Tuan Dang
2024-07-18 10:44:54 +07:00
parent 498b1109c9
commit 4b718b679a
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
View File

@@ -165,6 +165,7 @@ export const OrgMembersSection = () => {
(popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId (popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId
) )
} }
buttonText="Deactivate"
/> />
<UpgradePlanModal <UpgradePlanModal
isOpen={popUp.upgradePlan.isOpen} isOpen={popUp.upgradePlan.isOpen}

4
frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
View File

@@ -293,7 +293,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLink }: Prop
onClick={async (e) => { onClick={async (e) => {
e.stopPropagation(); e.stopPropagation();
if (currentOrg?.authEnforced) { if (currentOrg?.scimEnabled) {
createNotification({ createNotification({
text: "You cannot manage users from Infisical when org-level auth is enforced for your organization", text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
type: "error" type: "error"
@@ -338,7 +338,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLink }: Prop
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
if (currentOrg?.authEnforced) { if (currentOrg?.scimEnabled) {
createNotification({ createNotification({
text: "You cannot manage users from Infisical when org-level auth is enforced for your organization", text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
type: "error" type: "error"

1
frontend/src/views/Org/UserPage/UserPage.tsx
View File

@@ -259,6 +259,7 @@ export const UserPage = withPermission(
(popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId (popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId
) )
} }
buttonText="Deactivate"
/> />
<UpgradePlanModal <UpgradePlanModal
isOpen={popUp.upgradePlan.isOpen} isOpen={popUp.upgradePlan.isOpen}