feat: removed filters made in project roles

frontend/src/hooks/useGetProjectTypeFromRoute.tsx

@@ -8,15 +8,10 @@ export const useGetProjectTypeFromRoute = () => {
 
   return useMemo(() => {
     const segments = location.pathname.split("/");
+    const type = segments?.[2];
+    if (!type) return ProjectType.SecretManager;
 
-    let type: ProjectType | undefined;
+    // second element would be /projects/$projectId/<type>
-
+    return Object.values(ProjectType).find((el) => el === type) || ProjectType.SecretManager;
-    // location of project type can vary in router path, so we need to check all possible values
-    segments.forEach((segment) => {
-      if (Object.values(ProjectType).includes(segment as ProjectType))
-        type = segment as ProjectType;
-    });
-
-    return type;
   }, [location]);
 };

frontend/src/pages/project/GroupDetailsByIDPage/route.tsx

@@ -1,6 +1,7 @@
 import { createFileRoute, linkOptions } from "@tanstack/react-router";
 
 import { GroupDetailsByIDPage } from "./GroupDetailsByIDPage";
+import { ProjectAccessControlTabs } from "@app/types/project";
 
 export const Route = createFileRoute(
   "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/groups/$groupId"
@@ -16,6 +17,9 @@ export const Route = createFileRoute(
             to: "/projects/$projectId/access-management",
             params: {
               projectId: params.projectId
+            },
+            search: {
+              selectedTab: ProjectAccessControlTabs.Groups
             }
           })
         },

frontend/src/pages/project/IdentityDetailsByIDPage/route.tsx

@@ -1,6 +1,7 @@
 import { createFileRoute, linkOptions } from "@tanstack/react-router";
 
 import { IdentityDetailsByIDPage } from "./IdentityDetailsByIDPage";
+import { ProjectAccessControlTabs } from "@app/types/project";
 
 export const Route = createFileRoute(
   "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/identities/$identityId"
@@ -16,6 +17,9 @@ export const Route = createFileRoute(
             to: "/projects/$projectId/access-management",
             params: {
               projectId: params.projectId
+            },
+            search: {
+              selectedTab: ProjectAccessControlTabs.Identities
             }
           })
         },

frontend/src/pages/project/MemberDetailsByIDPage/route.tsx

@@ -1,6 +1,7 @@
 import { createFileRoute, linkOptions } from "@tanstack/react-router";
 
 import { MemberDetailsByIDPage } from "./MemberDetailsByIDPage";
+import { ProjectAccessControlTabs } from "@app/types/project";
 
 export const Route = createFileRoute(
   "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/members/$membershipId"
@@ -16,6 +17,9 @@ export const Route = createFileRoute(
             to: "/projects/$projectId/access-management",
             params: {
               projectId: params.projectId
+            },
+            search: {
+              selectedTab: ProjectAccessControlTabs.Member
             }
           })
         },

frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal.tsx

@@ -19,14 +19,11 @@ import {
   Tr
 } from "@app/components/v2";
 import { ProjectPermissionSub } from "@app/context";
-import { useGetProjectTypeFromRoute } from "@app/hooks";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import {
   EXCLUDED_PERMISSION_SUBS,
   isConditionalSubjects,
   PROJECT_PERMISSION_OBJECT,
-  ProjectTypePermissionSubjects,
   TFormSchema
 } from "./ProjectRoleModifySection.utils";
 
@@ -58,15 +55,8 @@ const Content = ({ onClose }: ContentProps) => {
     }
   });
 
-  const projectType = useGetProjectTypeFromRoute();
-
   const filteredPolicies = Object.entries(PROJECT_PERMISSION_OBJECT)
-    .filter(
+    .filter(([, { title }]) => (search ? title.toLowerCase().includes(search.toLowerCase()) : true))
-      ([subject, { title }]) =>
-        ProjectTypePermissionSubjects[projectType ?? ProjectType.SecretManager][
-          subject as ProjectPermissionSub
-        ] && (search ? title.toLowerCase().includes(search.toLowerCase()) : true)
-    )
     .filter(([subject]) => !EXCLUDED_PERMISSION_SUBS.includes(subject as ProjectPermissionSub))
     .sort((a, b) => a[1].title.localeCompare(b[1].title))
     .map(([subject]) => subject);

frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal.tsx

@@ -13,8 +13,6 @@ import {
   ModalContent
 } from "@app/components/v2";
 import { ProjectPermissionSub } from "@app/context";
-import { useGetProjectTypeFromRoute } from "@app/hooks";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import {
   PROJECT_PERMISSION_OBJECT,
@@ -34,14 +32,11 @@ type ContentProps = {
 
 const Content = ({ onClose }: ContentProps) => {
   const rootForm = useFormContext<TFormSchema>();
-  const projectType = useGetProjectTypeFromRoute();
 
   const [selectedTemplate, setSelectedTemplate] = useState<RoleTemplate>();
   const [conflictingSubjects, setConflictingSubjects] = useState<ProjectPermissionSub[]>([]);
   const [showConflictingSubjects, setShowConflictingSubjects] = useState(false);
 
-  const templates = RoleTemplates[projectType ?? ProjectType.SecretManager];
-
   const onSubmit = (skipConflicting = false) => {
     if (!selectedTemplate) {
       createNotification({ type: "error", text: "Please select a template" });
@@ -126,12 +121,12 @@ const Content = ({ onClose }: ContentProps) => {
         type="single"
         value={selectedTemplate?.id}
         onValueChange={(value) =>
-          setSelectedTemplate(templates.find((template) => template.id === value))
+          setSelectedTemplate(RoleTemplates.find((template) => template.id === value))
         }
         collapsible
         className="w-full border-collapse"
       >
-        {templates.map(({ name, description, permissions, id }) => (
+        {RoleTemplates.map(({ name, description, permissions, id }) => (
           <AccordionItem
             key={id}
             value={id}

frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx

@@ -1645,9 +1645,8 @@ export type RoleTemplate = {
   permissions: { subject: ProjectPermissionSub; actions: string[] }[];
 };
 
-const projectManagerTemplate = (
+export const RoleTemplates = [
-  additionalPermissions: RoleTemplate["permissions"] = []
+  {
-): RoleTemplate => ({
     id: "project-manager",
     name: "Project Management Policies",
     description: "Grants access to manage project members and settings",
@@ -1677,12 +1676,24 @@ const projectManagerTemplate = (
         subject: ProjectPermissionSub.Settings,
         actions: [ProjectPermissionActions.Read, ProjectPermissionActions.Edit]
       },
-    ...additionalPermissions
+      {
+        subject: ProjectPermissionSub.IpAllowList,
+        actions: Object.values(ProjectPermissionActions)
+      },
+      {
+        subject: ProjectPermissionSub.SecretApproval,
+        actions: Object.values(ProjectPermissionActions)
+      },
+      {
+        subject: ProjectPermissionSub.ServiceTokens,
+        actions: Object.values(ProjectPermissionActions)
+      },
+      {
+        subject: ProjectPermissionSub.Webhooks,
+        actions: Object.values(ProjectPermissionActions)
+      }
     ]
-});
+  },
-
-export const RoleTemplates: Record<ProjectType, RoleTemplate[]> = {
-  [ProjectType.SSH]: [
   {
     id: "ssh-viewer",
     name: "SSH Viewing Policies",
@@ -1744,9 +1755,6 @@ export const RoleTemplates: Record<ProjectType, RoleTemplate[]> = {
       }
     ]
   },
-    projectManagerTemplate()
-  ],
-  [ProjectType.KMS]: [
   {
     id: "kms-viewer",
     name: "KMS Viewing Policies",
@@ -1784,9 +1792,6 @@ export const RoleTemplates: Record<ProjectType, RoleTemplate[]> = {
       }
     ]
   },
-    projectManagerTemplate()
-  ],
-  [ProjectType.CertificateManager]: [
   {
     id: "cert-viewer",
     name: "Certificate Viewing Policies",
@@ -1844,9 +1849,6 @@ export const RoleTemplates: Record<ProjectType, RoleTemplate[]> = {
       }
     ]
   },
-    projectManagerTemplate()
-  ],
-  [ProjectType.SecretScanning]: [
   {
     id: "scanning-viewer",
     name: "Secret Scanning Viewing Policies",
@@ -1889,14 +1891,6 @@ export const RoleTemplates: Record<ProjectType, RoleTemplate[]> = {
       }
     ]
   },
-    projectManagerTemplate([
-      {
-        subject: ProjectPermissionSub.SecretScanningConfigs,
-        actions: Object.values(ProjectPermissionSecretScanningConfigActions)
-      }
-    ])
-  ],
-  [ProjectType.SecretManager]: [
   {
     id: "secret-viewer",
     name: "Secret Viewing Policies",
@@ -2007,28 +2001,5 @@ export const RoleTemplates: Record<ProjectType, RoleTemplate[]> = {
         actions: Object.values(ProjectPermissionCommitsActions)
       }
     ]
-    },
-    projectManagerTemplate([
-      {
-        subject: ProjectPermissionSub.IpAllowList,
-        actions: Object.values(ProjectPermissionActions)
-      },
-      {
-        subject: ProjectPermissionSub.Kms,
-        actions: [ProjectPermissionActions.Edit]
-      },
-      {
-        subject: ProjectPermissionSub.SecretApproval,
-        actions: Object.values(ProjectPermissionActions)
-      },
-      {
-        subject: ProjectPermissionSub.ServiceTokens,
-        actions: Object.values(ProjectPermissionActions)
-      },
-      {
-        subject: ProjectPermissionSub.Webhooks,
-        actions: Object.values(ProjectPermissionActions)
   }
-    ])
+];
-  ]
-};

frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx

@@ -14,7 +14,6 @@ import { ProjectPermissionSet } from "@app/context/ProjectPermissionContext";
 import { evaluatePermissionsAbility } from "@app/helpers/permissions";
 import { useGetProjectRoleBySlug, useUpdateProjectRole } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import { AddPoliciesButton } from "./AddPoliciesButton";
 import { DynamicSecretPermissionConditions } from "./DynamicSecretPermissionConditions";
@@ -30,7 +29,6 @@ import {
   isConditionalSubjects,
   PROJECT_PERMISSION_OBJECT,
   projectRoleFormSchema,
-  ProjectTypePermissionSubjects,
   rolePermission2Form,
   TFormSchema
 } from "./ProjectRoleModifySection.utils";
@@ -135,8 +133,6 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
     [JSON.stringify(permissions)]
   );
 
-  const isSecretManagerProject = currentWorkspace.type === ProjectType.SecretManager;
-
   return (
     <div className="w-full">
       <form
@@ -185,7 +181,6 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
               {!isPending && <PermissionEmptyState />}
               {(Object.keys(PROJECT_PERMISSION_OBJECT) as ProjectPermissionSub[])
                 .filter((subject) => !EXCLUDED_PERMISSION_SUBS.includes(subject))
-                .filter((subject) => ProjectTypePermissionSubjects[currentWorkspace.type][subject])
                 .map((subject) => (
                   <GeneralPermissionPolicies
                     subject={subject}
@@ -194,7 +189,6 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
                     key={`project-permission-${subject}`}
                     isDisabled={isDisabled}
                     onShowAccessTree={
-                      isSecretManagerProject &&
                       [
                         ProjectPermissionSub.Secrets,
                         ProjectPermissionSub.SecretFolders,
@@ -212,7 +206,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
           </div>
         </FormProvider>
       </form>
-      {isSecretManagerProject && showAccessTree && (
+      {showAccessTree && (
         <AccessTree
           permissions={formattedPermissions}
           subject={showAccessTree}

frontend/src/pages/project/RoleDetailsBySlugPage/route.tsx

@@ -1,6 +1,7 @@
 import { createFileRoute, linkOptions } from "@tanstack/react-router";
 
 import { RoleDetailsBySlugPage } from "./RoleDetailsBySlugPage";
+import { ProjectAccessControlTabs } from "@app/types/project";
 
 export const Route = createFileRoute(
   "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/roles/$roleSlug"
@@ -16,6 +17,9 @@ export const Route = createFileRoute(
             to: "/projects/$projectId/access-management",
             params: {
               projectId: params.projectId
+            },
+            search: {
+              selectedTab: ProjectAccessControlTabs.Roles
             }
           })
         },