awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 16:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(frontend): interactions SecretApprovalRequestAction

Browse Source
This commit is contained in:
Alfonso Hernandez
2024-07-18 02:46:50 +02:00
parent 454826fbb6
commit d301f74feb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestAction.tsx
+5 -2
View File
@@ -134,8 +134,11 @@ export const SecretApprovalRequestAction = ({
Close request Close request
</Button> </Button>
<Button <Button
leftIcon={<FontAwesomeIcon icon={isSoftEnforcement && !canApprove ? faLandMineOn : faCheck} />} leftIcon={<FontAwesomeIcon icon={!canApprove ? faLandMineOn : faCheck} />}
isDisabled={!isMergable || (!byPassApproval && !canApprove)} isDisabled={
(!isMergable && canApprove)
|| (!canApprove && isSoftEnforcement && !byPassApproval)
}
isLoading={isMerging} isLoading={isMerging}
onClick={handleSecretApprovalRequestMerge} onClick={handleSecretApprovalRequestMerge}
colorSchema={isSoftEnforcement && !canApprove ? "danger" : "primary"} colorSchema={isSoftEnforcement && !canApprove ? "danger" : "primary"}