Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

Merge remote-tracking branch 'origin/main' into feat/digicert-tls-reissue

Carlos Monastyrskiecf7aa1b4a77
diff --cc frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
index a0b80d1191,b216b17259..9dc924e765
--- a/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
+++ b/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
@@@ -435,32 -437,25 +437,26 @@@ const Page = () =>
const profileMissing = !certificate.profileId;
if (profileMissing && !isManagedCertificate(certificate)) return null;
- const item = (
- <DropdownMenuItem
- isDisabled={!canEditCertificate || profileMissing}
- onClick={() =>
- handlePopUpOpen("renewCertificate", {
- certificateId: certificate.id,
- commonName: displayName,
- canRevoke: canDeleteCertificate
- })
- }
- >
- Renew Now
- </DropdownMenuItem>
- );
-
- if (!profileMissing) return item;
+ const renewBlockedReason = profileMissing
+ ? RENEWAL_UNAVAILABLE_NO_PROFILE
+ : applicationAccess?.renewBlockedReason;
return (
- <Tooltip>
- <TooltipTrigger asChild>
- <div>{item}</div>
- </TooltipTrigger>
- <TooltipContent side="left" sideOffset={20} className="max-w-72">
- {RENEWAL_UNAVAILABLE_NO_PROFILE}
- </TooltipContent>
- </Tooltip>
+ <BlockedActionTooltip reason={renewBlockedReason}>
+ <DropdownMenuItem
+ isDisabled={!canRenewCertificate || profileMissing}
+ isDisabledFocusable={Boolean(renewBlockedReason)}
+ onClick={() =>
+ handlePopUpOpen("renewCertificate", {
+ certificateId: certificate.id,
- commonName: displayName
++ commonName: displayName,
++ canRevoke: canDeleteCertificate
+ })
+ }
+ >
+ Renew Now
+ </DropdownMenuItem>
+ </BlockedActionTooltip>
);
})()}
{!isInventoryView &&
diff --cc frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx
index 231d47643b,c2da075489..aeb06a0e72
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx
@@@ -1279,38 -1301,27 +1301,28 @@@ export const CertificatesTable = (
if (profileMissing && !isManagedCertificate(certificate))
return null;
- const item = (
- <DropdownMenuItem
- isDisabled={!canEditCertificate || profileMissing}
- onClick={(e) => {
- e.stopPropagation();
- handlePopUpOpen("renewCertificate", {
- certificateId: certificate.id,
- commonName: certificate.commonName,
- canRevoke: canDeleteCertificate
- });
- }}
- >
- <RefreshCwIcon />
- Renew Now
- </DropdownMenuItem>
- );
-
- if (!profileMissing) return item;
+ const renewBlockedReason = profileMissing
+ ? RENEWAL_UNAVAILABLE_NO_PROFILE
+ : rowApplicationAccess?.renewBlockedReason;
return (
- <Tooltip>
- <TooltipTrigger asChild>
- <div>{item}</div>
- </TooltipTrigger>
- <TooltipContent
- side="left"
- sideOffset={20}
- className="max-w-72"
+ <BlockedActionTooltip reason={renewBlockedReason}>
+ <DropdownMenuItem
+ isDisabled={!canRenewCertificate || profileMissing}
+ isDisabledFocusable={Boolean(renewBlockedReason)}
+ onClick={(e) => {
+ e.stopPropagation();
+ handlePopUpOpen("renewCertificate", {
+ certificateId: certificate.id,
- commonName: certificate.commonName
++ commonName: certificate.commonName,
++ canRevoke: canDeleteCertificate
+ });
+ }}
>
- {RENEWAL_UNAVAILABLE_NO_PROFILE}
- </TooltipContent>
- </Tooltip>
+ <RefreshCwIcon />
+ Renew Now
+ </DropdownMenuItem>
+ </BlockedActionTooltip>
);
})()}
{!isInventoryView &&