From e6165f779031f732dbee2ea9ab0a39facfbb67ec Mon Sep 17 00:00:00 2001
From: x <x032205@gmail.com>
Date: Mon, 21 Apr 2025 17:39:42 -0400
Subject: [PATCH] remove commented code, combine a UI if-check, split
 permission check for cert section and pki collection section

---
 .../layouts/ProjectLayout/ProjectLayout.tsx   | 82 +++++++++----------
 .../CertificatesPage/CertificatesPage.tsx     | 11 ++-
 2 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/frontend/src/layouts/ProjectLayout/ProjectLayout.tsx b/frontend/src/layouts/ProjectLayout/ProjectLayout.tsx
index bfa67078a..889074f09 100644
--- a/frontend/src/layouts/ProjectLayout/ProjectLayout.tsx
+++ b/frontend/src/layouts/ProjectLayout/ProjectLayout.tsx
@@ -105,48 +105,46 @@ export const ProjectLayout = () => {
                         </Link>
                       )}
                       {isCertManager && (
-                        <Link
-                          to={`/${ProjectType.CertificateManager}/$projectId/overview` as const}
-                          params={{
-                            projectId: currentWorkspace.id
-                          }}
-                        >
-                          {({ isActive }) => (
-                            <MenuItem isSelected={isActive} icon="certificate">
-                              Certificates
-                            </MenuItem>
-                          )}
-                        </Link>
-                      )}
-                      {isCertManager && (
-                        <Link
-                          to={
-                            `/${ProjectType.CertificateManager}/$projectId/certificate-authorities` as const
-                          }
-                          params={{
-                            projectId: currentWorkspace.id
-                          }}
-                        >
-                          {({ isActive }) => (
-                            <MenuItem isSelected={isActive} icon="certificate-authority">
-                              Certificate Authorities
-                            </MenuItem>
-                          )}
-                        </Link>
-                      )}
-                      {isCertManager && (
-                        <Link
-                          to={`/${ProjectType.CertificateManager}/$projectId/alerting` as const}
-                          params={{
-                            projectId: currentWorkspace.id
-                          }}
-                        >
-                          {({ isActive }) => (
-                            <MenuItem isSelected={isActive} icon="settings-cog">
-                              Alerting
-                            </MenuItem>
-                          )}
-                        </Link>
+                        <>
+                          <Link
+                            to={`/${ProjectType.CertificateManager}/$projectId/overview` as const}
+                            params={{
+                              projectId: currentWorkspace.id
+                            }}
+                          >
+                            {({ isActive }) => (
+                              <MenuItem isSelected={isActive} icon="certificate">
+                                Certificates
+                              </MenuItem>
+                            )}
+                          </Link>
+                          <Link
+                            to={
+                              `/${ProjectType.CertificateManager}/$projectId/certificate-authorities` as const
+                            }
+                            params={{
+                              projectId: currentWorkspace.id
+                            }}
+                          >
+                            {({ isActive }) => (
+                              <MenuItem isSelected={isActive} icon="certificate-authority">
+                                Certificate Authorities
+                              </MenuItem>
+                            )}
+                          </Link>
+                          <Link
+                            to={`/${ProjectType.CertificateManager}/$projectId/alerting` as const}
+                            params={{
+                              projectId: currentWorkspace.id
+                            }}
+                          >
+                            {({ isActive }) => (
+                              <MenuItem isSelected={isActive} icon="settings-cog">
+                                Alerting
+                              </MenuItem>
+                            )}
+                          </Link>
+                        </>
                       )}
                       {isCmek && (
                         <Link
diff --git a/frontend/src/pages/cert-manager/CertificatesPage/CertificatesPage.tsx b/frontend/src/pages/cert-manager/CertificatesPage/CertificatesPage.tsx
index 4fea06105..b5f8052b1 100644
--- a/frontend/src/pages/cert-manager/CertificatesPage/CertificatesPage.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/CertificatesPage.tsx
@@ -6,7 +6,6 @@ import { PageHeader } from "@app/components/v2";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
 
 import { PkiCollectionSection } from "../AlertingPage/components";
-// import { CertificateTemplatesSection } from "./components/CertificateTemplatesSection";
 import { CertificatesSection } from "./components";
 
 export const CertificatesPage = () => {
@@ -22,10 +21,16 @@ export const CertificatesPage = () => {
           renderGuardBanner
           passThrough={false}
           I={ProjectPermissionActions.Read}
-          a={ProjectPermissionSub.Certificates}
+          a={ProjectPermissionSub.PkiCollections}
         >
           <PkiCollectionSection />
-          {/* <CertificateTemplatesSection /> */}
+        </ProjectPermissionCan>
+        <ProjectPermissionCan
+          renderGuardBanner
+          passThrough={false}
+          I={ProjectPermissionActions.Read}
+          a={ProjectPermissionSub.Certificates}
+        >
           <CertificatesSection />
         </ProjectPermissionCan>
       </div>