Skip to content

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

Merge remote-tracking branch 'origin/main' into carlosmonastyrski/pki-485-cert-soft-delete-2

Carlos Monastyrski971952f0755a
diff --cc docs/documentation/platform/pki/settings/certificate-cleanup.mdx
index e7e352b554,4ae39a9a7e..26c7a67083
--- a/docs/documentation/platform/pki/settings/certificate-cleanup.mdx
+++ b/docs/documentation/platform/pki/settings/certificate-cleanup.mdx
@@@ -4,10 -4,10 +4,10 @@@ sidebarTitle: "Certificate cleanup
description: "Automatically remove expired certificates to keep your inventory organized."
---
- Automatically remove expired certificates from your Certificate Manager. Cleanup runs daily and permanently removes certificates that have been expired for a configurable number of days. If you delete a certificate yourself, its details stay in the inventory until it expires and cleanup removes it.
-Automatically remove expired certificates from Infisical Certificate Management. Cleanup runs daily and deletes certificates that have been expired for a configurable number of days.
++Automatically remove expired certificates from Infisical Certificate Management. Cleanup runs daily and permanently removes certificates that have been expired for a configurable number of days. If you delete a certificate yourself, its details stay in the inventory until it expires and cleanup removes it.
<Info>
- This setting is managed by product admins and applies to all certificates in the Certificate Manager.
+ This setting is managed by product admins and applies to all certificates in Infisical Certificate Management.
</Info>
## Configure certificate cleanup
diff --cc frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
index 669e18bcb5,beabb7af0e..065d379b8c
--- a/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
+++ b/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
@@@ -1,6 -1,5 +1,5 @@@
- import { Helmet } from "react-helmet";
import { subject } from "@casl/ability";
-import { Link, useNavigate, useParams, useSearch } from "@tanstack/react-router";
+import { Link, useParams, useSearch } from "@tanstack/react-router";
import { ChevronLeftIcon, EllipsisIcon } from "lucide-react";
import { createNotification } from "@app/components/notifications";
diff --cc frontend/src/pages/cert-manager/InstallationDetailsByIDPage/components/InstallationCertificatesSection.tsx
index ea125448b9,3651c9b6a1..ac135baa97
--- a/frontend/src/pages/cert-manager/InstallationDetailsByIDPage/components/InstallationCertificatesSection.tsx
+++ b/frontend/src/pages/cert-manager/InstallationDetailsByIDPage/components/InstallationCertificatesSection.tsx
@@@ -71,25 -70,22 +70,24 @@@ export const InstallationCertificatesSe
: null;
return (
- <TableRow
- key={cert.id}
- onClick={() =>
- navigate({
- to: "/organizations/$orgId/cert-manager/certificates/$certificateId",
- params: {
- orgId,
- certificateId: cert.certificateId
- }
- })
- }
- >
- <TableCell>{cert.commonName || "N/A"}</TableCell>
+ <TableRow key={cert.id} linked>
+ <TableCell>
+ <RowLink
+ {...getInstancePinningLink(
+ currentProject.orgId,
+ currentProject,
+ `certificates/${cert.certificateId}`
+ )!}
+ >
+ {cert.commonName || "N/A"}
+ </RowLink>
+ </TableCell>
<TableCell>
- {expiryDetails ? (
+ {cert.deletedAt && <Badge variant="neutral">Deleted</Badge>}
+ {!cert.deletedAt && expiryDetails && (
<Badge variant={expiryDetails.variant}>{expiryDetails.label}</Badge>
- ) : (
+ )}
+ {!cert.deletedAt && !expiryDetails && (
<Badge variant="neutral">Unknown</Badge>
)}
</TableCell>
diff --cc frontend/src/pages/cert-manager/PoliciesPage/PoliciesPage.tsx
index c2c59ff875,a2225b0a01..ce5bd5cf72
--- a/frontend/src/pages/cert-manager/PoliciesPage/PoliciesPage.tsx
+++ b/frontend/src/pages/cert-manager/PoliciesPage/PoliciesPage.tsx
@@@ -1,10 -1,9 +1,9 @@@
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
- import { Helmet } from "react-helmet";
- import { useTranslation } from "react-i18next";
import { useNavigate, useSearch } from "@tanstack/react-router";
+ import { PageTitle } from "@app/components/PageTitle";
import { AccessRestrictedDialog, PageHeader, PageLoader } from "@app/components/v3";
-import { useProject, useProjectPermission } from "@app/context";
+import { useOrganization, useProject, useProjectPermission } from "@app/context";
import {
ProjectPermissionCertificateActions,
ProjectPermissionCertificatePolicyActions,
@@@ -26,8 -25,6 +25,7 @@@ enum TabSections
}
export const PoliciesPage = () => {
- const { t } = useTranslation();
+ const { currentOrg } = useOrganization();
const { currentProject } = useProject();
const { permission } = useProjectPermission();
const navigate = useNavigate();