feat: ran lint and review comments addressed

backend/src/ee/routes/v1/index.ts

@@ -5,6 +5,9 @@ import { registerAccessApprovalRequestRouter } from "./access-approval-request-r
 import { registerAssumePrivilegeRouter } from "./assume-privilege-router";
 import { AUDIT_LOG_STREAM_REGISTER_ROUTER_MAP, registerAuditLogStreamRouter } from "./audit-log-stream-routers";
 import { registerCaCrlRouter } from "./certificate-authority-crl-router";
+import { registerDepreciatedProjectRoleRouter } from "./depreciated-project-role-router";
+import { registerDepreciatedProjectRouter } from "./depreciated-project-router";
+import { registerDepreciatedSecretApprovalPolicyRouter } from "./depreciated-secret-approval-policy-router";
 import { registerDynamicSecretLeaseRouter } from "./dynamic-secret-lease-router";
 import { registerKubernetesDynamicSecretLeaseRouter } from "./dynamic-secret-lease-routers/kubernetes-lease-router";
 import { registerDynamicSecretRouter } from "./dynamic-secret-router";
@@ -22,14 +25,11 @@ import { registerOidcRouter } from "./oidc-router";
 import { registerOrgRoleRouter } from "./org-role-router";
 import { registerPITRouter } from "./pit-router";
 import { registerProjectRoleRouter } from "./project-role-router";
-import { registerDepreciatedProjectRoleRouter } from "./depreciated-project-role-router";
 import { registerProjectRouter } from "./project-router";
-import { registerDepreciatedProjectRouter } from "./depreciated-project-router";
 import { registerRateLimitRouter } from "./rate-limit-router";
 import { registerRelayRouter } from "./relay-router";
 import { registerSamlRouter } from "./saml-router";
 import { registerScimRouter } from "./scim-router";
-import { registerDepreciatedSecretApprovalPolicyRouter } from "./depreciated-secret-approval-policy-router";
 import { registerSecretApprovalRequestRouter } from "./secret-approval-request-router";
 import { registerSecretRotationProviderRouter } from "./secret-rotation-provider-router";
 import { registerSecretRotationRouter } from "./secret-rotation-router";

backend/src/ee/routes/v2/index.ts

@@ -7,9 +7,9 @@ import {
   SECRET_SCANNING_REGISTER_ROUTER_MAP
 } from "@app/ee/routes/v2/secret-scanning-v2-routers";
 
+import { registerDepreciatedProjectRoleRouter } from "./depreciated-project-role-router";
 import { registerGatewayV2Router } from "./gateway-router";
 import { registerIdentityProjectAdditionalPrivilegeRouter } from "./identity-project-additional-privilege-router";
-import { registerDepreciatedProjectRoleRouter } from "./depreciated-project-role-router";
 import { registerSecretApprovalPolicyRouter } from "./secret-approval-policy-router";
 
 export const registerV2EERoutes = async (server: FastifyZodProvider) => {

backend/src/server/routes/v1/index.ts

@@ -16,6 +16,8 @@ import { registerCertificateTemplateRouter } from "./certificate-template-router
 import { registerDepreciatedProjectEnvRouter } from "./depreciated-project-env-router";
 import { registerDepreciatedProjectMembershipRouter } from "./depreciated-project-membership-router";
 import { registerDepreciatedProjectRouter } from "./depreciated-project-router";
+import { registerDepreciatedSecretFolderRouter } from "./depreciated-secret-folder-router";
+import { registerDepreciatedSecretImportRouter } from "./depreciated-secret-import-router";
 import { registerDepreciatedSecretTagRouter } from "./depreciated-secret-tag-router";
 import { registerEventRouter } from "./event-router";
 import { registerExternalGroupOrgRoleMappingRouter } from "./external-group-org-role-mapping-router";
@@ -30,6 +32,7 @@ import { registerIdentityKubernetesRouter } from "./identity-kubernetes-auth-rou
 import { registerIdentityLdapAuthRouter } from "./identity-ldap-auth-router";
 import { registerIdentityOciAuthRouter } from "./identity-oci-auth-router";
 import { registerIdentityOidcAuthRouter } from "./identity-oidc-auth-router";
+import { registerIdentityProjectRouter } from "./identity-project-router";
 import { registerIdentityRouter } from "./identity-router";
 import { registerIdentityTlsCertAuthRouter } from "./identity-tls-cert-auth-router";
 import { registerIdentityTokenAuthRouter } from "./identity-token-auth-router";
@@ -50,8 +53,6 @@ import { registerProjectKeyRouter } from "./project-key-router";
 import { registerProjectMembershipRouter } from "./project-membership-router";
 import { registerProjectRouter } from "./project-router";
 import { SECRET_REMINDER_REGISTER_ROUTER_MAP } from "./reminder-routers";
-import { registerDepreciatedSecretFolderRouter } from "./depreciated-secret-folder-router";
-import { registerDepreciatedSecretImportRouter } from "./depreciated-secret-import-router";
 import { registerSecretRequestsRouter } from "./secret-requests-router";
 import { registerSecretSharingRouter } from "./secret-sharing-router";
 import { registerSecretTagRouter } from "./secret-tag-router";
@@ -62,7 +63,6 @@ import { registerUserEngagementRouter } from "./user-engagement-router";
 import { registerUserRouter } from "./user-router";
 import { registerWebhookRouter } from "./webhook-router";
 import { registerWorkflowIntegrationRouter } from "./workflow-integration-router";
-import { registerIdentityProjectRouter } from "./identity-project-router";
 
 export const registerV1Routes = async (server: FastifyZodProvider) => {
   await server.register(registerSsoRouter, { prefix: "/sso" });

backend/src/server/routes/v1/project-env-router.ts

@@ -85,7 +85,7 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.object({
           message: z.string(),
-          workspace: z.string(),
+          projectId: z.string(),
           environment: ProjectEnvironmentsSchema
         })
       }
@@ -114,7 +114,7 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
       });
       return {
         message: "Successfully created new environment",
-        workspace: req.params.projectId,
+        projectId: req.params.projectId,
         environment
       };
     }
@@ -147,7 +147,7 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.object({
           message: z.string(),
-          workspace: z.string(),
+          projectId: z.string(),
           environment: ProjectEnvironmentsSchema
         })
       }
@@ -182,7 +182,7 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
 
       return {
         message: "Successfully updated environment",
-        workspace: req.params.projectId,
+        projectId: req.params.projectId,
         environment
       };
     }
@@ -210,7 +210,7 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.object({
           message: z.string(),
-          workspace: z.string(),
+          projectId: z.string(),
           environment: ProjectEnvironmentsSchema
         })
       }
@@ -240,7 +240,7 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
 
       return {
         message: "Successfully deleted environment",
-        workspace: req.params.projectId,
+        projectId: req.params.projectId,
         environment
       };
     }

backend/src/server/routes/v1/project-membership-router.ts

@@ -137,7 +137,6 @@ export const registerProjectMembershipRouter = async (server: FastifyZodProvider
     }
   });
 
-  // TODO(depri): ask this usage again
   server.route({
     method: "POST",
     url: "/:projectId/memberships/details",

backend/src/server/routes/v1/project-router.ts

@@ -19,15 +19,28 @@ import {
 } from "@app/db/schemas";
 import { ProjectMicrosoftTeamsConfigsSchema } from "@app/db/schemas/project-microsoft-teams-configs";
 import { EventType } from "@app/ee/services/audit-log/audit-log-types";
+import { InfisicalProjectTemplate } from "@app/ee/services/project-template/project-template-types";
+import { sanitizedSshCa } from "@app/ee/services/ssh/ssh-certificate-authority-schema";
+import { sanitizedSshCertificate } from "@app/ee/services/ssh-certificate/ssh-certificate-schema";
+import { sanitizedSshCertificateTemplate } from "@app/ee/services/ssh-certificate-template/ssh-certificate-template-schema";
+import { loginMappingSchema, sanitizedSshHost } from "@app/ee/services/ssh-host/ssh-host-schema";
+import { LoginMappingSource } from "@app/ee/services/ssh-host/ssh-host-types";
+import { sanitizedSshHostGroup } from "@app/ee/services/ssh-host-group/ssh-host-group-schema";
 import { ApiDocsTags, PROJECTS } from "@app/lib/api-docs";
 import { CharacterType, characterValidator } from "@app/lib/validator/validate-string";
 import { re2Validator } from "@app/lib/zod";
 import { readLimit, requestAccessLimit, writeLimit } from "@app/server/config/rateLimiter";
+import { slugSchema } from "@app/server/lib/schemas";
+import { getTelemetryDistinctId } from "@app/server/lib/telemetry";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
 import { ActorType, AuthMode } from "@app/services/auth/auth-type";
+import { CaStatus } from "@app/services/certificate-authority/certificate-authority-enums";
+import { sanitizedCertificateTemplate } from "@app/services/certificate-template/certificate-template-schema";
 import { validateMicrosoftTeamsChannelsSchema } from "@app/services/microsoft-teams/microsoft-teams-fns";
+import { sanitizedPkiSubscriber } from "@app/services/pki-subscriber/pki-subscriber-schema";
 import { ProjectFilterType, SearchProjectSortBy } from "@app/services/project/project-types";
 import { validateSlackChannelsField } from "@app/services/slack/slack-auth-validators";
+import { PostHogEventTypes } from "@app/services/telemetry/telemetry-types";
 import { WorkflowIntegration } from "@app/services/workflow-integration/workflow-integration-types";
 
 import {
@@ -36,19 +49,6 @@ import {
   SanitizedProjectSchema
 } from "../sanitizedSchemas";
 import { sanitizedServiceTokenSchema } from "../v2/service-token-router";
-import { slugSchema } from "@app/server/lib/schemas";
-import { CaStatus } from "@app/services/certificate-authority/certificate-authority-enums";
-import { sanitizedCertificateTemplate } from "@app/services/certificate-template/certificate-template-schema";
-import { sanitizedSshCertificate } from "@app/ee/services/ssh-certificate/ssh-certificate-schema";
-import { sanitizedSshCertificateTemplate } from "@app/ee/services/ssh-certificate-template/ssh-certificate-template-schema";
-import { sanitizedSshCa } from "@app/ee/services/ssh/ssh-certificate-authority-schema";
-import { loginMappingSchema, sanitizedSshHost } from "@app/ee/services/ssh-host/ssh-host-schema";
-import { LoginMappingSource } from "@app/ee/services/ssh-host/ssh-host-types";
-import { sanitizedSshHostGroup } from "@app/ee/services/ssh-host-group/ssh-host-group-schema";
-import { InfisicalProjectTemplate } from "@app/ee/services/project-template/project-template-types";
-import { PostHogEventTypes } from "@app/services/telemetry/telemetry-types";
-import { getTelemetryDistinctId } from "@app/server/lib/telemetry";
-import { sanitizedPkiSubscriber } from "@app/services/pki-subscriber/pki-subscriber-schema";
 
 const projectWithEnv = SanitizedProjectSchema.merge(
   z.object({
@@ -292,7 +292,6 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
     }
   });
 
-  // TODO(depri): confirm with the team
   server.route({
     method: "GET",
     url: "/slug/:slug",

backend/src/server/routes/v2/index.ts

@@ -1,17 +1,17 @@
 import { registerCaRouter } from "./certificate-authority-router";
 import { registerDepreciatedGroupProjectRouter } from "./depreciated-group-project-router";
-import { registerIdentityOrgRouter } from "./identity-org-router";
 import { registerDepreciatedIdentityProjectRouter } from "./depreciated-identity-project-router";
+import { registerDepreciatedProjectMembershipRouter } from "./depreciated-project-membership-router";
+import { registerDepreciatedProjectRouter } from "./depreciated-project-router";
+import { registerIdentityOrgRouter } from "./identity-org-router";
 import { registerMfaRouter } from "./mfa-router";
 import { registerOrgRouter } from "./organization-router";
 import { registerPasswordRouter } from "./password-router";
 import { registerPkiTemplatesRouter } from "./pki-templates-router";
-import { registerDepreciatedProjectMembershipRouter } from "./depreciated-project-membership-router";
-import { registerDepreciatedProjectRouter } from "./depreciated-project-router";
-import { registerServiceTokenRouter } from "./service-token-router";
-import { registerUserRouter } from "./user-router";
 import { registerSecretFolderRouter } from "./secret-folder-router";
 import { registerSecretImportRouter } from "./secret-import-router";
+import { registerServiceTokenRouter } from "./service-token-router";
+import { registerUserRouter } from "./user-router";
 
 export const registerV2Routes = async (server: FastifyZodProvider) => {
   await server.register(registerMfaRouter, { prefix: "/auth" });

backend/src/server/routes/v3/depreciated-secret-router.ts

@@ -298,7 +298,7 @@ export const registerDepreciatedSecretRouter = async (server: FastifyZodProvider
         workspaceId = projectId;
       }
 
-      if (!workspaceId || !environment) throw new BadRequestError({ message: "Missing workspace id or environment" });
+      if (!workspaceId || !environment) throw new BadRequestError({ message: "Missing project id or environment" });
 
       const { secrets, imports } = await server.services.secret.getSecretsRaw({
         actorId: req.permission.id,

backend/src/server/routes/v3/index.ts

@@ -1,6 +1,6 @@
+import { registerDepreciatedSecretRouter } from "./depreciated-secret-router";
 import { registerExternalMigrationRouter } from "./external-migration-router";
 import { registerLoginRouter } from "./login-router";
-import { registerDepreciatedSecretRouter } from "./depreciated-secret-router";
 import { registerSignupRouter } from "./signup-router";
 import { registerUserRouter } from "./user-router";
 

backend/src/server/routes/v4/secret-router.ts

@@ -172,7 +172,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
         }
       }
 
-      if (!projectId || !environment) throw new BadRequestError({ message: "Missing workspace id or environment" });
+      if (!projectId || !environment) throw new BadRequestError({ message: "Missing project id or environment" });
 
       const { secrets, imports } = await server.services.secret.getSecretsRaw({
         actorId: req.permission.id,
@@ -225,7 +225,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
 
   server.route({
     method: "GET",
-    url: "/raw/id/:secretId",
+    url: "/id/:secretId",
     config: {
       rateLimit: secretsLimit
     },

frontend/src/components/projects/NewProjectModal.tsx

@@ -36,8 +36,8 @@ import {
 import { getProjectHomePage, getProjectLottieIcon } from "@app/helpers/project";
 import { useCreateWorkspace, useGetExternalKmsList, useGetUserProjects } from "@app/hooks/api";
 import { INTERNAL_KMS_KEY_ID } from "@app/hooks/api/kms/types";
-import { InfisicalProjectTemplate, useListProjectTemplates } from "@app/hooks/api/projectTemplates";
 import { ProjectType } from "@app/hooks/api/projects/types";
+import { InfisicalProjectTemplate, useListProjectTemplates } from "@app/hooks/api/projectTemplates";
 
 const formSchema = z.object({
   name: z.string().trim().min(1, "Required").max(64, "Too long, maximum length is 64 characters"),

frontend/src/components/secret-rotations-v2/CreateSecretRotationV2Modal.tsx

@@ -6,8 +6,8 @@ import { SecretRotationV2Form } from "@app/components/secret-rotations-v2/forms"
 import { SecretRotationV2ModalHeader } from "@app/components/secret-rotations-v2/SecretRotationV2ModalHeader";
 import { SecretRotationV2Select } from "@app/components/secret-rotations-v2/SecretRotationV2Select";
 import { Modal, ModalContent } from "@app/components/v2";
-import { SecretRotation, TSecretRotationV2 } from "@app/hooks/api/secretRotationsV2";
 import { ProjectEnv } from "@app/hooks/api/projects/types";
+import { SecretRotation, TSecretRotationV2 } from "@app/hooks/api/secretRotationsV2";
 
 type SharedProps = {
   secretPath: string;

frontend/src/components/secret-rotations-v2/forms/SecretRotationV2Form.tsx

@@ -13,6 +13,7 @@ import { SecretRotationV2SecretsMappingFields } from "@app/components/secret-rot
 import { Button } from "@app/components/v2";
 import { useProject } from "@app/context";
 import { IS_ROTATION_DUAL_CREDENTIALS, SECRET_ROTATION_MAP } from "@app/helpers/secretRotationsV2";
+import { ProjectEnv } from "@app/hooks/api/projects/types";
 import {
   SecretRotation,
   TSecretRotationV2,
@@ -22,7 +23,6 @@ import {
   useCreateSecretRotationV2,
   useUpdateSecretRotationV2
 } from "@app/hooks/api/secretRotationsV2/mutations";
-import { ProjectEnv } from "@app/hooks/api/projects/types";
 
 import { SecretRotationV2FormSchema, TSecretRotationV2Form } from "./schemas";
 

frontend/src/components/secret-syncs/forms/SecretSyncSourceFields.tsx

@@ -4,7 +4,7 @@ import { subject } from "@casl/ability";
 
 import { FilterableSelect, FormControl } from "@app/components/v2";
 import { SecretPathInput } from "@app/components/v2/SecretPathInput";
-import { useProjectPermission, useProject } from "@app/context";
+import { useProject, useProjectPermission } from "@app/context";
 import {
   ProjectPermissionSecretSyncActions,
   ProjectPermissionSub

frontend/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx

@@ -133,7 +133,7 @@ export const InfisicalSecretInput = forwardRef<HTMLTextAreaElement, Props>(
     const { data: folders } = useGetProjectFolders({
       environment: suggestionSource.environment || "",
       path: suggestionSource.secretPath || "",
-      projectId: projectId,
+      projectId,
       options: {
         enabled: isPopupOpen
       }

frontend/src/components/v2/SecretPathInput/SecretPathInput.tsx

@@ -36,11 +36,11 @@ export const SecretPathInput = ({
   const [debouncedInputValue] = useDebounce(inputValue, 200);
 
   const { currentProject } = useProject();
-  const workspaceId = currentProject?.id || "";
+  const projectId = currentProject?.id || "";
   const { folderNames: folders } = useGetFoldersByEnv({
     path: secretPath,
     environments: [environment || currentProject?.environments?.[0].slug || ""],
-    projectId: workspaceId
+    projectId
   });
 
   useEffect(() => {

frontend/src/helpers/project.ts

@@ -1,6 +1,6 @@
 import { apiRequest } from "@app/config/request";
 import { createWorkspace } from "@app/hooks/api/projects/queries";
-import { ProjectType, ProjectEnv } from "@app/hooks/api/projects/types";
+import { ProjectEnv, ProjectType } from "@app/hooks/api/projects/types";
 
 const secretsToBeAdded = [
   {
@@ -47,8 +47,8 @@ export const initProjectHelper = async ({ projectName }: { projectName: string }
   });
 
   try {
-    const { data } = await apiRequest.post("/api/v3/secrets/batch/raw", {
+    const { data } = await apiRequest.post("/api/v4/secrets/batch", {
-      workspaceId: project.id,
+      projectId: project.id,
       environment: "dev",
       secretPath: "/",
       secrets: secretsToBeAdded

frontend/src/hooks/api/accessApproval/queries.tsx

@@ -16,8 +16,8 @@ import {
 export const accessApprovalKeys = {
   getAccessApprovalPolicies: (projectSlug: string) =>
     [{ projectSlug }, "access-approval-policies"] as const,
-  getAccessApprovalPolicyOfABoard: (workspaceId: string, environment: string) =>
+  getAccessApprovalPolicyOfABoard: (projectId: string, environment: string) =>
-    [{ workspaceId, environment }, "access-approval-policy"] as const,
+    [{ projectId, environment }, "access-approval-policy"] as const,
 
   getAccessApprovalRequests: (
     projectSlug: string,

frontend/src/hooks/api/accessApproval/types.ts

@@ -1,7 +1,7 @@
 import { EnforcementLevel, PolicyType } from "../policies/enums";
+import { ProjectEnv } from "../projects/types";
 import { TProjectPermission } from "../roles/types";
 import { ApprovalStatus } from "../secretApprovalRequest/types";
-import { ProjectEnv } from "../projects/types";
 
 export type TAccessApprovalPolicy = {
   id: string;

frontend/src/hooks/api/auth/queries.tsx

@@ -5,8 +5,8 @@ import { apiRequest } from "@app/config/request";
 import { SessionStorageKeys } from "@app/const";
 
 import { organizationKeys } from "../organization/queries";
-import { setAuthToken } from "../reactQuery";
 import { projectKeys } from "../projects";
+import { setAuthToken } from "../reactQuery";
 import {
   CompleteAccountDTO,
   CompleteAccountSignupDTO,

frontend/src/hooks/api/folderCommits/queries.tsx

@@ -87,7 +87,7 @@ const fetchFolderCommitHistory = async (
     params: {
       environment,
       path: directory,
-      projectId: projectId,
+      projectId,
       offset,
       limit,
       search,
@@ -102,7 +102,7 @@ export const fetchCommitDetails = async (projectId: string, commitId: string) =>
     `/api/v1/pit/commits/${commitId}/changes`,
     {
       params: {
-        projectId: projectId
+        projectId
       }
     }
   );
@@ -125,7 +125,7 @@ export const fetchRollbackPreview = async (
         environment: envSlug,
         deepRollback,
         secretPath,
-        projectId: projectId
+        projectId
       }
     }
   );
@@ -157,7 +157,7 @@ const fetchRevert = async (commitId: string, projectId: string) => {
   const { data } = await apiRequest.post<{ success: boolean; message: string }>(
     `/api/v1/pit/commits/${commitId}/revert`,
     {
-      projectId: projectId
+      projectId
     }
   );
   return data;
@@ -235,7 +235,7 @@ export const useGetFolderCommitsCount = ({
 }) =>
   useQuery({
     enabled: Boolean(projectId && environment) && !isPaused,
-    queryKey: commitKeys.count({ projectId: projectId, environment, directory }),
+    queryKey: commitKeys.count({ projectId, environment, directory }),
     queryFn: () => fetchFolderCommitsCount({ projectId, environment, directory })
   });
 

frontend/src/hooks/api/identities/types.ts

@@ -1,7 +1,7 @@
 import { OrderByDirection } from "../generic/types";
 import { OrgIdentityOrderBy } from "../organization/types";
+import { Project, ProjectUserMembershipTemporaryMode } from "../projects/types";
 import { TOrgRole } from "../roles/types";
-import { ProjectUserMembershipTemporaryMode, Project } from "../projects/types";
 import { IdentityAuthMethod, IdentityJwtConfigurationType } from "./enums";
 
 export type IdentityTrustedIp = {

frontend/src/hooks/api/index.tsx

@@ -1,5 +1,5 @@
-export * from "./admin";
 export * from "./accessApproval";
+export * from "./admin";
 export * from "./apiKeys";
 export * from "./assumePrivileges";
 export * from "./auditLogs";
@@ -28,6 +28,7 @@ export * from "./organization";
 export * from "./pkiAlerts";
 export * from "./pkiCollections";
 export * from "./pkiSubscriber";
+export * from "./projects";
 export * from "./projectUserAdditionalPrivilege";
 export * from "./rateLimit";
 export * from "./roles";
@@ -53,4 +54,3 @@ export * from "./trustedIps";
 export * from "./users";
 export * from "./webhooks";
 export * from "./workflowIntegrations";
-export * from "./projects";

frontend/src/hooks/api/projects/index.tsx

@@ -17,8 +17,8 @@ export {
   useDeleteWsEnvironment,
   useGetProjectSshConfig,
   useGetUpgradeProjectStatus,
-  useGetUserWorkspaceMemberships,
   useGetUserProjects,
+  useGetUserWorkspaceMemberships,
   useGetWorkspaceAuthorizations,
   useGetWorkspaceById,
   useGetWorkspaceIdentityMembershipDetails,

frontend/src/hooks/api/projects/queries.tsx

@@ -31,6 +31,8 @@ import {
   CreateWorkspaceDTO,
   DeleteEnvironmentDTO,
   DeleteWorkspaceDTO,
+  Project,
+  ProjectEnv,
   ProjectIdentityOrderBy,
   ProjectType,
   TGetUpgradeProjectStatusDTO,
@@ -41,9 +43,7 @@ import {
   TUpdateWorkspaceUserRoleDTO,
   UpdateAuditLogsRetentionDTO,
   UpdateEnvironmentDTO,
-  UpdateProjectDTO,
+  UpdateProjectDTO
-  Project,
-  ProjectEnv
 } from "./types";
 
 export const fetchProjectById = async (projectId: string) => {

frontend/src/hooks/api/projects/query-keys.tsx

@@ -1,7 +1,6 @@
-import { TListProjectIdentitiesDTO, TSearchProjectsDTO } from "./types";
-
 import type { CaStatus } from "../ca";
 import { WorkflowIntegrationPlatform } from "../workflowIntegrations/types";
+import { TListProjectIdentitiesDTO, TSearchProjectsDTO } from "./types";
 
 export const projectKeys = {
   getProjectById: (projectId: string) => ["projects", { projectId }] as const,

frontend/src/hooks/api/secretImports/types.ts

@@ -1,5 +1,5 @@
-import { SecretV3Raw } from "../secrets/types";
 import { ProjectEnv } from "../projects/types";
+import { SecretV3Raw } from "../secrets/types";
 
 export type TSecretImport = {
   id: string;

frontend/src/hooks/api/secrets/mutations.tsx

@@ -405,14 +405,14 @@ export const useMoveSecrets = ({
 };
 
 export const createSecret = async (dto: TCreateSecretsV3DTO) => {
-  const { data } = await apiRequest.post(`/api/v3/secrets/${dto.secretKey}`, dto);
+  const { data } = await apiRequest.post(`/api/v4/secrets/${dto.secretKey}`, dto);
   return data;
 };
 
 export const useBackfillSecretReference = () =>
   useMutation<{ message: string }, object, { projectId: string }>({
     mutationFn: async ({ projectId }) => {
-      const { data } = await apiRequest.post("/api/v3/secrets/backfill-secret-references", {
+      const { data } = await apiRequest.post("/api/v4/secrets/backfill-secret-references", {
         projectId
       });
       return data.message;

frontend/src/hooks/api/tags/queries.tsx

@@ -9,11 +9,9 @@ const projectTags = {
 };
 
 const fetchWsTag = async (projectID: string) => {
-  const { data } = await apiRequest.get<{ projectTags: UserWsTags }>(
+  const { data } = await apiRequest.get<{ tags: UserWsTags }>(`/api/v1/projects/${projectID}/tags`);
-    `/api/v1/projects/${projectID}/tags`
-  );
 
-  return data.projectTags;
+  return data.tags;
 };
 
 export const useGetWsTags = (projectID: string) => {
@@ -29,14 +27,11 @@ export const useCreateWsTag = () => {
 
   return useMutation<WsTag, object, CreateTagDTO>({
     mutationFn: async ({ projectId: projectID, tagColor, tagSlug }) => {
-      const { data } = await apiRequest.post<{ projectTag: WsTag }>(
+      const { data } = await apiRequest.post<{ tag: WsTag }>(`/api/v1/projects/${projectID}/tags`, {
-        `/api/v1/projects/${projectID}/tags`,
+        color: tagColor || "",
-        {
+        slug: tagSlug
-          color: tagColor || "",
+      });
-          slug: tagSlug
+      return data.tag;
-        }
-      );
-      return data.projectTag;
     },
     onSuccess: (tagData) => {
       queryClient.invalidateQueries({ queryKey: projectTags.getWsTags(tagData?.projectId) });
@@ -49,10 +44,10 @@ export const useDeleteWsTag = () => {
 
   return useMutation<WsTag, object, DeleteTagDTO>({
     mutationFn: async ({ tagID, projectId }) => {
-      const { data } = await apiRequest.delete<{ projectTag: WsTag }>(
+      const { data } = await apiRequest.delete<{ tag: WsTag }>(
         `/api/v1/projects/${projectId}/tags/${tagID}`
       );
-      return data.projectTag;
+      return data.tag;
     },
     onSuccess: (tagData) => {
       queryClient.invalidateQueries({ queryKey: projectTags.getWsTags(tagData?.projectId) });

frontend/src/hooks/api/types.ts

@@ -8,6 +8,18 @@ export type { IncidentContact } from "./incidentContacts/types";
 export type { IntegrationAuth } from "./integrationAuth/types";
 export type { TCloudIntegration, TIntegration } from "./integrations/types";
 export type { Organization } from "./organization/types";
+export type {
+  CreateEnvironmentDTO,
+  CreateWorkspaceDTO,
+  DeleteEnvironmentDTO,
+  DeleteWorkspaceDTO,
+  Project,
+  ProjectEnv,
+  ProjectTag,
+  ToggleAutoCapitalizationDTO,
+  UpdateEnvironmentDTO,
+  UpdateProjectDTO
+} from "./projects/types";
 export type { TSecretApprovalPolicy } from "./secretApproval/types";
 export type {
   TGetSecretApprovalRequestDetails,
@@ -28,18 +40,6 @@ export type { SubscriptionPlan } from "./subscriptions/types";
 export type { WsTag } from "./tags/types";
 export type { OrgUser, TWorkspaceUser, User, UserEnc } from "./users/types";
 export type { TWebhook } from "./webhooks/types";
-export type {
-  CreateEnvironmentDTO,
-  CreateWorkspaceDTO,
-  DeleteEnvironmentDTO,
-  DeleteWorkspaceDTO,
-  ToggleAutoCapitalizationDTO,
-  UpdateEnvironmentDTO,
-  UpdateProjectDTO,
-  Project,
-  ProjectEnv,
-  ProjectTag
-} from "./projects/types";
 
 export enum ApiErrorTypes {
   ValidationError = "ValidationFailure",

frontend/src/hooks/api/users/queries.tsx

@@ -8,9 +8,9 @@ import { queryClient as qc } from "@app/hooks/api/reactQuery";
 import { APIKeyDataV2 } from "../apiKeys/types";
 import { MfaMethod } from "../auth/types";
 import { TGroupWithProjectMemberships } from "../groups/types";
+import { projectKeys } from "../projects";
 import { setAuthToken } from "../reactQuery";
 import { subscriptionQueryKeys } from "../subscriptions/queries";
-import { projectKeys } from "../projects";
 import { userKeys } from "./query-keys";
 import {
   AddUserToOrgDTO,

frontend/src/hooks/api/webhooks/query.tsx

@@ -8,19 +8,19 @@ export const queryKeys = {
   getWebhooks: (workspaceId: string) => ["webhooks", { workspaceId }]
 };
 
-const fetchWebhooks = async (workspaceId: string) => {
+const fetchWebhooks = async (projectId: string) => {
   const { data } = await apiRequest.get<{ webhooks: TWebhook[] }>("/api/v1/webhooks", {
     params: {
-      workspaceId
+      projectId
     }
   });
 
   return data.webhooks;
 };
 
-export const useGetWebhooks = (workspaceId: string) =>
+export const useGetWebhooks = (projectId: string) =>
   useQuery({
-    queryKey: queryKeys.getWebhooks(workspaceId),
+    queryKey: queryKeys.getWebhooks(projectId),
-    queryFn: () => fetchWebhooks(workspaceId),
+    queryFn: () => fetchWebhooks(projectId),
-    enabled: Boolean(workspaceId)
+    enabled: Boolean(projectId)
   });

frontend/src/hooks/usePathAccessPolicies.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 
-import { useSubscription, useProject } from "@app/context";
+import { useProject, useSubscription } from "@app/context";
 import { useGetAccessApprovalPolicies } from "@app/hooks/api";
 
 const matchesPath = (folderPath: string, pattern: string) => {

frontend/src/layouts/KmsLayout/KmsLayout.tsx

@@ -4,7 +4,7 @@ import { Link, Outlet } from "@tanstack/react-router";
 import { motion } from "framer-motion";
 
 import { Lottie, Menu, MenuGroup, MenuItem } from "@app/components/v2";
-import { useProjectPermission, useProject } from "@app/context";
+import { useProject, useProjectPermission } from "@app/context";
 
 import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";
 

frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx

@@ -40,7 +40,7 @@ import { envConfig } from "@app/config/env";
 import { useOrganization, useSubscription, useUser } from "@app/context";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import { useToggle } from "@app/hooks";
-import { useGetOrganizations, useLogoutUser, projectKeys } from "@app/hooks/api";
+import { projectKeys, useGetOrganizations, useLogoutUser } from "@app/hooks/api";
 import { authKeys, selectOrganization } from "@app/hooks/api/auth/queries";
 import { MfaMethod } from "@app/hooks/api/auth/types";
 import { getAuthToken } from "@app/hooks/api/reactQuery";

frontend/src/layouts/PkiManagerLayout/PkiManagerLayout.tsx

@@ -16,7 +16,7 @@ import { Link, Outlet } from "@tanstack/react-router";
 import { motion } from "framer-motion";
 
 import { Lottie, Menu, MenuGroup, MenuItem } from "@app/components/v2";
-import { useProjectPermission, useProject } from "@app/context";
+import { useProject, useProjectPermission } from "@app/context";
 
 import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";
 

frontend/src/layouts/ProjectLayout/components/AssumePrivilegeModeBanner/AssumePrivilegeModeBanner.tsx

@@ -2,7 +2,7 @@ import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { Button } from "@app/components/v2";
-import { useProjectPermission, useProject } from "@app/context";
+import { useProject, useProjectPermission } from "@app/context";
 import { getProjectHomePage } from "@app/helpers/project";
 import { useRemoveAssumeProjectPrivilege } from "@app/hooks/api";
 import { ActorType } from "@app/hooks/api/auditLogs/enums";

frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx

@@ -28,15 +28,15 @@ import {
   OrgPermissionActions,
   OrgPermissionSubjects,
   useOrganization,
-  useSubscription,
+  useProject,
-  useProject
+  useSubscription
 } from "@app/context";
 import { getProjectHomePage } from "@app/helpers/project";
 import { usePopUp } from "@app/hooks";
 import { useGetUserProjects } from "@app/hooks/api";
+import { Project } from "@app/hooks/api/projects/types";
 import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";
 import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";
-import { Project } from "@app/hooks/api/projects/types";
 
 export const ProjectSelect = () => {
   const [searchProject, setSearchProject] = useState("");

frontend/src/layouts/SecretManagerLayout/SecretManagerLayout.tsx

@@ -15,7 +15,7 @@ import { Link, Outlet, useLocation } from "@tanstack/react-router";
 import { motion } from "framer-motion";
 
 import { Badge, Lottie, Menu, MenuGroup, MenuItem } from "@app/components/v2";
-import { useProjectPermission, useProject } from "@app/context";
+import { useProject, useProjectPermission } from "@app/context";
 import {
   useGetAccessRequestsCount,
   useGetSecretApprovalRequestCount,

frontend/src/layouts/SecretScanningLayout/SecretScanningLayout.tsx

@@ -13,9 +13,9 @@ import { motion } from "framer-motion";
 import { Badge, Lottie, Menu, MenuGroup, MenuItem } from "@app/components/v2";
 import {
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import { ProjectPermissionSecretScanningFindingActions } from "@app/context/ProjectPermissionContext/types";
 import { useGetSecretScanningUnresolvedFindingCount } from "@app/hooks/api/secretScanningV2";

frontend/src/layouts/SshLayout/SshLayout.tsx

@@ -15,8 +15,8 @@ import { Lottie, Menu, MenuGroup, MenuItem } from "@app/components/v2";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 
 import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";

frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/components/PkiSubscriberCertificatesTable.tsx

@@ -27,8 +27,8 @@ import {
 import {
   ProjectPermissionPkiSubscriberActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { useGetPkiSubscriberCertificates } from "@app/hooks/api";
 import { caSupportsCapability } from "@app/hooks/api/ca/constants";

frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/components/PkiSubscriberDetailsSection.tsx

@@ -16,8 +16,8 @@ import {
 import {
   ProjectPermissionPkiSubscriberActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { useTimedReset } from "@app/hooks";
 import {

frontend/src/pages/cert-manager/PkiTemplateListPage/PkiTemplateListPage.tsx

@@ -42,8 +42,8 @@ import {
 import {
   ProjectPermissionPkiTemplateActions,
   ProjectPermissionSub,
-  useSubscription,
+  useProject,
-  useProject
+  useSubscription
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteCertTemplateV2 } from "@app/hooks/api";

frontend/src/pages/cert-manager/layout.tsx

@@ -2,8 +2,8 @@ import { createFileRoute } from "@tanstack/react-router";
 
 import { BreadcrumbTypes } from "@app/components/v2";
 import { projectKeys } from "@app/hooks/api";
-import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
 import { fetchProjectById } from "@app/hooks/api/projects/queries";
+import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
 import { PkiManagerLayout } from "@app/layouts/PkiManagerLayout";
 import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
 

frontend/src/pages/kms/KmipPage/components/KmipClientTable.tsx

@@ -39,9 +39,9 @@ import {
 import {
   ProjectPermissionKmipActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import {
   getUserTablePreference,

frontend/src/pages/kms/OverviewPage/components/CmekTable.tsx

@@ -49,8 +49,8 @@ import {
   ProjectPermissionActions,
   ProjectPermissionCmekActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { kmsKeyUsageOptions } from "@app/helpers/kms";
 import {

frontend/src/pages/kms/layout.tsx

@@ -2,8 +2,8 @@ import { createFileRoute } from "@tanstack/react-router";
 
 import { BreadcrumbTypes } from "@app/components/v2";
 import { projectKeys } from "@app/hooks/api";
-import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
 import { fetchProjectById } from "@app/hooks/api/projects/queries";
+import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
 import { KmsLayout } from "@app/layouts/KmsLayout";
 import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
 

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx

@@ -23,8 +23,8 @@ import {
   useGetOrgRoles,
   useGetUserProjects
 } from "@app/hooks/api";
-import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { ProjectType, ProjectVersion } from "@app/hooks/api/projects/types";
+import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 import { OrgInviteLink } from "./OrgInviteLink";

frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx

@@ -25,7 +25,7 @@ export const IdentityProjectsSection = ({ identityId }: Props) => {
     try {
       await deleteMutateAsync({
         identityId: id,
-        projectId: projectId
+        projectId
       });
 
       createNotification({

frontend/src/pages/organization/ProjectsPage/components/AllProjectView.tsx

@@ -48,7 +48,7 @@ import {
   useRequestProjectAccess,
   useSearchProjects
 } from "@app/hooks/api";
-import { ProjectType, Project, ProjectEnv } from "@app/hooks/api/projects/types";
+import { Project, ProjectEnv, ProjectType } from "@app/hooks/api/projects/types";
 import {
   ProjectListToggle,
   ProjectListView

frontend/src/pages/organization/ProjectsPage/components/MyProjectView.tsx

@@ -41,9 +41,9 @@ import {
 import { usePagination, useResetPageHelper } from "@app/hooks";
 import { useGetUserProjects } from "@app/hooks/api";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
+import { Project, ProjectType } from "@app/hooks/api/projects/types";
 import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";
 import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";
-import { ProjectType, Project } from "@app/hooks/api/projects/types";
 import {
   ProjectListToggle,
   ProjectListView

frontend/src/pages/organization/SettingsPage/components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx

@@ -7,8 +7,8 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
 import { getProjectTitle } from "@app/helpers/project";
 import { usePopUp } from "@app/hooks";
-import { TProjectTemplate, useDeleteProjectTemplate } from "@app/hooks/api/projectTemplates";
 import { ProjectType } from "@app/hooks/api/projects/types";
+import { TProjectTemplate, useDeleteProjectTemplate } from "@app/hooks/api/projectTemplates";
 
 import { ProjectTemplateDetailsModal } from "../../ProjectTemplateDetailsModal";
 import { ProjectTemplateEnvironmentsForm } from "./ProjectTemplateEnvironmentsForm";

frontend/src/pages/organization/SettingsPage/components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx

@@ -15,12 +15,12 @@ import {
   TextArea
 } from "@app/components/v2";
 import { getProjectLottieIcon } from "@app/helpers/project";
+import { ProjectType } from "@app/hooks/api/projects/types";
 import {
   TProjectTemplate,
   useCreateProjectTemplate,
   useUpdateProjectTemplate
 } from "@app/hooks/api/projectTemplates";
-import { ProjectType } from "@app/hooks/api/projects/types";
 import { slugSchema } from "@app/lib/schemas";
 
 const formSchema = z.object({

frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupRoles.tsx

@@ -29,8 +29,8 @@ import { formatProjectRoleName } from "@app/helpers/roles";
 import { usePopUp } from "@app/hooks";
 import { useGetProjectRoles, useUpdateGroupWorkspaceRole } from "@app/hooks/api";
 import { TGroupMembership } from "@app/hooks/api/groups/types";
-import { TProjectRole } from "@app/hooks/api/roles/types";
 import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
+import { TProjectRole } from "@app/hooks/api/roles/types";
 import { groupBy } from "@app/lib/fn/array";
 
 const temporaryRoleFormSchema = z.object({

frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx

@@ -8,8 +8,8 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
-  useSubscription,
+  useProject,
-  useProject
+  useSubscription
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteGroupFromWorkspace } from "@app/hooks/api";

frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx

@@ -30,8 +30,8 @@ import {
   useGetProjectRoles,
   useGetWorkspaceUsers
 } from "@app/hooks/api";
-import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { ProjectVersion } from "@app/hooks/api/projects/types";
+import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 const addMemberFormSchema = z.object({
@@ -66,9 +66,9 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
   });
 
   const orgId = currentOrg?.id || "";
-  const workspaceId = currentProject?.id || "";
+  const projectId = currentProject?.id || "";
 
-  const { data: members } = useGetWorkspaceUsers(workspaceId);
+  const { data: members } = useGetWorkspaceUsers(projectId);
   const { data: orgUsers } = useGetOrgUsers(orgId);
 
   const { data: roles } = useGetProjectRoles(currentProject?.id || "");

frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/MemberRbacSection.tsx

@@ -29,14 +29,14 @@ import {
   ProjectPermissionActions,
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import { useGetProjectRoles, useUpdateUserWorkspaceRole } from "@app/hooks/api";
+import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { TWorkspaceUser } from "@app/hooks/api/types";
-import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
 
 const roleFormSchema = z.object({
   roles: z

frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/SpecificPrivilegeSection.tsx

@@ -43,8 +43,8 @@ import {
   ProjectPermissionActions,
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { removeTrailingSlash } from "@app/helpers/string";
 import { usePopUp } from "@app/hooks";

frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx

@@ -44,7 +44,7 @@ import {
   Tooltip,
   Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useUser, useProject } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject, useUser } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import {
@@ -85,8 +85,8 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
   const filterRoles = useMemo(() => filter.roles, [filter.roles]);
 
   const userId = user?.id || "";
-  const workspaceId = currentProject?.id || "";
+  const projectId = currentProject?.id || "";
-  const { data: projectRoles } = useGetProjectRoles(workspaceId);
+  const { data: projectRoles } = useGetProjectRoles(projectId);
 
   const {
     search,
@@ -111,7 +111,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
   };
 
   const { data: members = [], isPending: isMembersLoading } = useGetWorkspaceUsers(
-    workspaceId,
+    projectId,
     undefined,
     filterRoles
   );
@@ -309,7 +309,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
                         navigate({
                           to: `${getProjectBaseURL(currentProject.type)}/members/$membershipId`,
                           params: {
-                            projectId: workspaceId,
+                            projectId,
                             membershipId
                           }
                         });
@@ -319,7 +319,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
                       navigate({
                         to: `${getProjectBaseURL(currentProject.type)}/members/$membershipId`,
                         params: {
-                          projectId: workspaceId,
+                          projectId,
                           membershipId
                         }
                       })

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

@@ -57,7 +57,7 @@ const Page = () => {
       {
         actorId: identityId,
         actorType: ActorType.IDENTITY,
-        projectId: projectId
+        projectId
       },
       {
         onSuccess: () => {
@@ -86,7 +86,7 @@ const Page = () => {
       navigate({
         to: `${getProjectBaseURL(currentProject.type)}/access-management` as const,
         params: {
-          projectId: projectId
+          projectId
         },
         search: {
           selectedTab: "identities"

frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeModifySection.tsx

@@ -24,8 +24,8 @@ import {
 import {
   ProjectPermissionIdentityActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import {
   useCreateIdentityProjectAdditionalPrivilege,

frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsx

@@ -29,13 +29,13 @@ import {
   ProjectPermissionActions,
   ProjectPermissionIdentityActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { useGetProjectRoles, useUpdateIdentityWorkspaceRole } from "@app/hooks/api";
 import { IdentityMembership } from "@app/hooks/api/identities/types";
-import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
+import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 
 const roleFormSchema = z.object({
   roles: z

frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MembershipProjectAdditionalPrivilegeModifySection.tsx

@@ -23,8 +23,8 @@ import {
 import {
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import {
   useCreateProjectUserAdditionalPrivilege,

frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx

@@ -22,7 +22,7 @@ import {
   Tooltip,
   Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useUser, useProject } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject, useUser } from "@app/context";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import { usePopUp } from "@app/hooks";
 import { useUpdateUserWorkspaceRole } from "@app/hooks/api";

frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleModify.tsx

@@ -29,14 +29,14 @@ import {
   ProjectPermissionActions,
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import { useGetProjectRoles, useUpdateUserWorkspaceRole } from "@app/hooks/api";
+import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { TWorkspaceUser } from "@app/hooks/api/types";
-import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
 
 const roleFormSchema = z.object({
   roles: z

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

@@ -32,8 +32,8 @@ import {
   TPermissionCondition,
   TPermissionConditionOperators
 } from "@app/context/ProjectPermissionContext/types";
-import { TProjectPermission } from "@app/hooks/api/roles/types";
 import { ProjectType } from "@app/hooks/api/projects/types";
+import { TProjectPermission } from "@app/hooks/api/roles/types";
 
 const GeneralPolicyActionSchema = z.object({
   read: z.boolean().optional(),

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

@@ -12,8 +12,8 @@ import { ProjectPermissionSub, useProject } from "@app/context";
 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/projects/types";
+import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 
 import { AddPoliciesButton } from "./AddPoliciesButton";
 import { DynamicSecretPermissionConditions } from "./DynamicSecretPermissionConditions";

frontend/src/pages/project/SettingsPage/components/AuditLogsRetentionSection/AuditLogsRetentionSection.tsx

@@ -5,10 +5,10 @@ import { z } from "zod";
 import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input } from "@app/components/v2";
-import { useProjectPermission, useSubscription, useProject } from "@app/context";
+import { useProject, useProjectPermission, useSubscription } from "@app/context";
 import { usePopUp } from "@app/hooks";
-import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { useUpdateWorkspaceAuditLogsRetention } from "@app/hooks/api/projects/queries";
+import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 
 const formSchema = z.object({
   auditLogsRetentionDays: z.coerce.number().min(0)

frontend/src/pages/project/SettingsPage/components/DeleteProjectProtection/DeleteProjectProtection.tsx

@@ -12,7 +12,7 @@ export const DeleteProjectProtection = () => {
   const handleToggleDeleteProjectProtection = async (state: boolean) => {
     try {
       await mutateAsync({
-        projectId: projectId,
+        projectId,
         hasDeleteProtection: state
       });
 

frontend/src/pages/project/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx

@@ -9,8 +9,8 @@ import {
   ProjectPermissionActions,
   ProjectPermissionSub,
   useOrganization,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { useToggle } from "@app/hooks";
 import { useDeleteWorkspace, useGetWorkspaceUsers, useLeaveProject } from "@app/hooks/api";

frontend/src/pages/secret-manager/CommitDetailsPage/CommitDetailsPage.tsx

@@ -73,7 +73,7 @@ export const CommitDetailsPage = () => {
         >
           <CommitDetailsTab
             selectedCommitId={selectedCommitId}
-            workspaceId={currentProject.id}
+            projectId={currentProject.id}
             goBackToHistory={handleGoBackToHistory}
             envSlug={envSlug}
             goToRollbackPreview={handleGoToRollbackPreview}

frontend/src/pages/secret-manager/CommitDetailsPage/components/CommitDetailsTab/CommitDetailsTab.tsx

@@ -53,13 +53,13 @@ const formatDisplayDate = (dateString: string): string => {
 
 export const CommitDetailsTab = ({
   selectedCommitId,
-  workspaceId,
+  projectId,
   envSlug,
   goBackToHistory,
   goToRollbackPreview
 }: {
   selectedCommitId: string;
-  workspaceId: string;
+  projectId: string;
   envSlug: string;
   goBackToHistory: () => void;
   goToRollbackPreview: () => void;
@@ -71,7 +71,7 @@ export const CommitDetailsTab = ({
     "revertChanges"
   ] as const);
 
-  const { data: commitDetails, isLoading } = useGetCommitDetails(workspaceId, selectedCommitId);
+  const { data: commitDetails, isLoading } = useGetCommitDetails(projectId, selectedCommitId);
 
   const routerQueryParams: { secretPath?: string } = useSearch({
     from: ROUTE_PATHS.SecretManager.CommitDetailsPage.id
@@ -80,7 +80,7 @@ export const CommitDetailsTab = ({
 
   const { mutateAsync: revert } = useCommitRevert({
     commitId: selectedCommitId,
-    projectId: workspaceId,
+    projectId,
     environment: envSlug,
     directory: secretPath
   });

frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx

@@ -8,8 +8,8 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
-  useSubscription,
+  useProject,
-  useProject
+  useSubscription
 } from "@app/context";
 import { useDeleteTrustedIp } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";

frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistTable.tsx

@@ -18,8 +18,8 @@ import {
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
-  useSubscription,
+  useProject,
-  useProject
+  useSubscription
 } from "@app/context";
 import { useGetTrustedIps } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";

frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/components/IntegrationAuditLogsSection.tsx

@@ -1,7 +1,7 @@
 import { Link } from "@tanstack/react-router";
 
 import { EmptyState } from "@app/components/v2";
-import { useSubscription, useProject } from "@app/context";
+import { useProject, useSubscription } from "@app/context";
 import { EventType } from "@app/hooks/api/auditLogs/enums";
 import { TIntegrationWithEnv } from "@app/hooks/api/integrations/types";
 import { LogsSection } from "@app/pages/organization/AuditLogsPage/components/LogsSection";

frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx

@@ -24,8 +24,8 @@ import { ROUTE_PATHS } from "@app/const/routes";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { SecretSync } from "@app/hooks/api/secretSyncs";

frontend/src/pages/secret-manager/IntegrationsListPage/route.tsx

@@ -4,13 +4,13 @@ import { z } from "zod";
 
 import { projectKeys } from "@app/hooks/api";
 import { TIntegration } from "@app/hooks/api/integrations/types";
+import { fetchWorkspaceIntegrations } from "@app/hooks/api/projects/queries";
 import {
   fetchSecretSyncsByProjectId,
   SecretSync,
   secretSyncKeys,
   TSecretSync
 } from "@app/hooks/api/secretSyncs";
-import { fetchWorkspaceIntegrations } from "@app/hooks/api/projects/queries";
 import { IntegrationsListPageTabs } from "@app/types/integrations";
 
 import { IntegrationsListPage } from "./IntegrationsListPage";

frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx

@@ -63,9 +63,9 @@ import {
   ProjectPermissionActions,
   ProjectPermissionDynamicSecretActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import { ProjectPermissionSecretRotationActions } from "@app/context/ProjectPermissionContext/types";
 import {
@@ -92,11 +92,11 @@ import {
 import { useGetProjectSecretsOverview } from "@app/hooks/api/dashboard/queries";
 import { DashboardSecretsOrderBy, ProjectSecretsImportedBy } from "@app/hooks/api/dashboard/types";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
+import { ProjectVersion } from "@app/hooks/api/projects/types";
 import { useUpdateFolderBatch } from "@app/hooks/api/secretFolders/queries";
 import { TUpdateFolderBatchDTO } from "@app/hooks/api/secretFolders/types";
 import { TSecretRotationV2 } from "@app/hooks/api/secretRotationsV2";
-import { SecretType, SecretV3RawSanitized, TSecretFolder, ProjectEnv } from "@app/hooks/api/types";
+import { ProjectEnv, SecretType, SecretV3RawSanitized, TSecretFolder } from "@app/hooks/api/types";
-import { ProjectVersion } from "@app/hooks/api/projects/types";
 import {
   useDynamicSecretOverview,
   useFolderOverview,
@@ -270,7 +270,7 @@ export const OverviewPage = () => {
     getImportedSecretByKey,
     getEnvImportedSecretKeyCount
   } = useGetImportedSecretsAllEnvs({
-    projectId: projectId,
+    projectId,
     path: secretPath,
     environments: (userAvailableEnvs || []).map(({ slug }) => slug)
   });
@@ -278,7 +278,7 @@ export const OverviewPage = () => {
   const isFilteredByResources = Object.values(filter).some(Boolean);
   const { isPending: isOverviewLoading, data: overview } = useGetProjectSecretsOverview(
     {
-      projectId: projectId,
+      projectId,
       environments: visibleEnvs.map((env) => env.slug),
       secretPath,
       orderDirection,
@@ -392,7 +392,7 @@ export const OverviewPage = () => {
         name: folderName,
         path: secretPath,
         environment,
-        projectId: projectId,
+        projectId,
         description
       });
     });
@@ -484,7 +484,7 @@ export const OverviewPage = () => {
         );
         if (folderName && parentPath && canCreateFolder) {
           await createFolder({
-            projectId: projectId,
+            projectId,
             path: parentPath,
             environment: env,
             name: folderName
@@ -648,7 +648,7 @@ export const OverviewPage = () => {
       );
       if (folderName && parentPath && canCreateFolder) {
         await createFolder({
-          projectId: projectId,
+          projectId,
           environment: slug,
           path: parentPath,
           name: folderName
@@ -662,7 +662,7 @@ export const OverviewPage = () => {
       navigate({
         to: "/projects/secret-management/$projectId/secrets/$envSlug",
         params: {
-          projectId: projectId,
+          projectId,
           envSlug: slug
         },
         search: query
@@ -1412,7 +1412,7 @@ export const OverviewPage = () => {
                         <Link
                           to="/projects/secret-management/$projectId/settings"
                           params={{
-                            projectId: projectId
+                            projectId
                           }}
                           hash="environments"
                         >

frontend/src/pages/secret-manager/OverviewPage/components/CreateSecretForm/CreateSecretForm.tsx

@@ -19,8 +19,8 @@ import { InfisicalSecretInput } from "@app/components/v2/InfisicalSecretInput";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionContext/types";
 import { getKeyValue } from "@app/helpers/parseEnvVar";
@@ -92,7 +92,7 @@ export const CreateSecretForm = ({ secretPath = "/", onClose }: Props) => {
 
         if (folderName && parentPath && canCreateFolder) {
           await createFolder({
-            projectId: projectId,
+            projectId,
             path: parentPath,
             environment,
             name: folderName
@@ -190,7 +190,7 @@ export const CreateSecretForm = ({ secretPath = "/", onClose }: Props) => {
     try {
       const parsedSlug = slugSchema.parse(slug);
       await createWsTag.mutateAsync({
-        projectId: projectId,
+        projectId,
         tagSlug: parsedSlug,
         tagColor: ""
       });

frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretRenameRow.tsx

@@ -10,7 +10,7 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { IconButton, Input, Spinner, Tooltip } from "@app/components/v2";
-import { ProjectPermissionSub, useProjectPermission, useProject } from "@app/context";
+import { ProjectPermissionSub, useProject, useProjectPermission } from "@app/context";
 import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionContext/types";
 import { useToggle } from "@app/hooks";
 import { useUpdateSecretV3 } from "@app/hooks/api";

frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchModal.tsx

@@ -33,8 +33,8 @@ import {
 } from "@app/components/v2";
 import { useDebounce } from "@app/hooks";
 import { useGetProjectSecretsQuickSearch } from "@app/hooks/api/dashboard";
-import { WsTag } from "@app/hooks/api/tags/types";
 import { ProjectEnv } from "@app/hooks/api/projects/types";
+import { WsTag } from "@app/hooks/api/tags/types";
 import { QuickSearchSecretRotationItem } from "@app/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem";
 import { RowType } from "@app/pages/secret-manager/SecretDashboardPage/SecretMainPage.types";
 

frontend/src/pages/secret-manager/OverviewPage/components/SecretV2MigrationSection/SecretV2MigrationSection.tsx

@@ -8,11 +8,11 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, Checkbox, Modal, ModalContent, Spinner } from "@app/components/v2";
-import { useProjectPermission, useProject } from "@app/context";
+import { useProject, useProjectPermission } from "@app/context";
 import { usePopUp } from "@app/hooks";
-import { useGetWorkspaceById, useMigrateProjectToV3, projectKeys } from "@app/hooks/api";
+import { projectKeys, useGetWorkspaceById, useMigrateProjectToV3 } from "@app/hooks/api";
-import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { ProjectVersion } from "@app/hooks/api/projects/types";
+import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 
 enum ProjectUpgradeStatus {
   InProgress = "IN_PROGRESS",

frontend/src/pages/secret-manager/OverviewPage/components/SelectionPanel/SelectionPanel.tsx

@@ -9,9 +9,9 @@ import { Button, DeleteActionModal, Tooltip } from "@app/components/v2";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionContext/types";
 import { usePopUp } from "@app/hooks";
@@ -133,7 +133,7 @@ export const SelectionPanel = ({
                 folderId: folder?.id,
                 path: secretPath,
                 environment: env.slug,
-                projectId: projectId
+                projectId
               });
             }
           })

frontend/src/pages/secret-manager/OverviewPage/components/SelectionPanel/components/MoveSecretsDialog/MoveSecretsDialog.tsx

@@ -30,8 +30,8 @@ import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionCo
 import { useDebounce } from "@app/hooks";
 import { useMoveSecrets } from "@app/hooks/api";
 import { useGetProjectSecretsQuickSearch } from "@app/hooks/api/dashboard";
-import { SecretV3RawSanitized } from "@app/hooks/api/secrets/types";
 import { ProjectEnv } from "@app/hooks/api/projects/types";
+import { SecretV3RawSanitized } from "@app/hooks/api/secrets/types";
 
 type Props = {
   isOpen: boolean;

frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx

@@ -66,7 +66,7 @@ export const SecretApprovalsPage = () => {
             <AccessApprovalRequest projectId={projectId} projectSlug={projectSlug} />
           </TabPanel>
           <TabPanel value={TabSection.Policies}>
-            <ApprovalPolicyList workspaceId={projectId} />
+            <ApprovalPolicyList projectId={projectId} />
           </TabPanel>
         </Tabs>
       </div>

frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx

@@ -39,10 +39,10 @@ import { Badge } from "@app/components/v2/Badge";
 import {
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
   useSubscription,
-  useUser,
+  useUser
-  useProject
 } from "@app/context";
 import {
   getUserTablePreference,

frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx

@@ -25,7 +25,7 @@ import {
   Tooltip
 } from "@app/components/v2";
 import { Badge } from "@app/components/v2/Badge";
-import { ProjectPermissionActions, useUser, useProject } from "@app/context";
+import { ProjectPermissionActions, useProject, useUser } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useListWorkspaceGroups, useReviewAccessRequest } from "@app/hooks/api";
 import {

frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx

@@ -40,9 +40,9 @@ import {
 import {
   ProjectPermissionSub,
   TProjectPermission,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import { ProjectPermissionActions } from "@app/context/ProjectPermissionContext/types";
 import {
@@ -59,14 +59,14 @@ import {
 import { useGetAccessApprovalPolicies } from "@app/hooks/api/accessApproval/queries";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
 import { PolicyType } from "@app/hooks/api/policies/enums";
-import { TAccessApprovalPolicy, Project } from "@app/hooks/api/types";
+import { Project, TAccessApprovalPolicy } from "@app/hooks/api/types";
 
 import { AccessPolicyForm } from "./components/AccessPolicyModal";
 import { ApprovalPolicyRow } from "./components/ApprovalPolicyRow";
 import { RemoveApprovalPolicyModal } from "./components/RemoveApprovalPolicyModal";
 
 interface IProps {
-  workspaceId: string;
+  projectId: string;
 }
 
 enum PolicyOrderBy {
@@ -118,7 +118,7 @@ const useApprovalPolicies = (permission: TProjectPermission, currentProject?: Pr
   };
 };
 
-export const ApprovalPolicyList = ({ workspaceId }: IProps) => {
+export const ApprovalPolicyList = ({ projectId }: IProps) => {
   const { handlePopUpToggle, handlePopUpOpen, popUp } = usePopUp([
     "policyForm",
     "deletePolicy",
@@ -128,7 +128,7 @@ export const ApprovalPolicyList = ({ workspaceId }: IProps) => {
   const { subscription } = useSubscription();
   const { currentProject } = useProject();
 
-  const { data: members } = useGetWorkspaceUsers(workspaceId, true);
+  const { data: members } = useGetWorkspaceUsers(projectId, true);
   const { data: groups } = useListWorkspaceGroups(currentProject?.id || "");
 
   const { policies, isLoading: isPoliciesLoading } = useApprovalPolicies(

frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx

@@ -35,9 +35,9 @@ import { ROUTE_PATHS } from "@app/const/routes";
 import {
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useUser,
+  useUser
-  useProject
 } from "@app/context";
 import {
   getUserTablePreference,

frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestAction.tsx

@@ -13,12 +13,12 @@ import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, Checkbox, FormControl, Input } from "@app/components/v2";
+import { useProject } from "@app/context";
 import {
   usePerformSecretApprovalRequestMerge,
   useUpdateSecretApprovalRequestStatus
 } from "@app/hooks/api";
 import { EnforcementLevel } from "@app/hooks/api/policies/enums";
-import { useProject } from "@app/context";
 
 type Props = {
   approvalRequestId: string;

frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx

@@ -33,7 +33,7 @@ import {
   TextArea,
   Tooltip
 } from "@app/components/v2";
-import { useUser, useProject } from "@app/context";
+import { useProject, useUser } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import {
   useGetSecretApprovalRequestDetails,

frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx

@@ -25,8 +25,8 @@ import {
   ProjectPermissionActions,
   ProjectPermissionDynamicSecretActions,
   ProjectPermissionSub,
-  useProjectPermission,
+  useProject,
-  useProject
+  useProjectPermission
 } from "@app/context";
 import {
   ProjectPermissionCommitsActions,
@@ -50,10 +50,10 @@ import { useGetProjectSecretsDetails } from "@app/hooks/api/dashboard";
 import { DashboardSecretsOrderBy } from "@app/hooks/api/dashboard/types";
 import { useGetFolderCommitsCount } from "@app/hooks/api/folderCommits";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
+import { ProjectVersion } from "@app/hooks/api/projects/types";
 import { PendingAction } from "@app/hooks/api/secretFolders/types";
 import { useCreateCommit } from "@app/hooks/api/secrets/mutations";
 import { SecretV3RawSanitized } from "@app/hooks/api/types";
-import { ProjectVersion } from "@app/hooks/api/projects/types";
 import { usePathAccessPolicies } from "@app/hooks/usePathAccessPolicies";
 import { useResizableColWidth } from "@app/hooks/useResizableColWidth";
 import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";
@@ -148,7 +148,7 @@ const Page = () => {
 
   useEffect(() => {
     if (isBatchMode && projectId && environment && secretPath) {
-      loadPendingChanges({ projectId: projectId, environment, secretPath });
+      loadPendingChanges({ projectId, environment, secretPath });
     }
   }, [isBatchMode, projectId, environment, secretPath, loadPendingChanges]);
 
@@ -248,7 +248,7 @@ const Page = () => {
       navigate({
         to: "/projects/secret-management/$projectId/overview",
         params: {
-          projectId: projectId
+          projectId
         }
       });
     }
@@ -262,7 +262,7 @@ const Page = () => {
     isFetched
   } = useGetProjectSecretsDetails({
     environment,
-    projectId: projectId,
+    projectId,
     secretPath,
     offset,
     limit,
@@ -316,7 +316,7 @@ const Page = () => {
 
   // fetch imported secrets to show user the overriden ones
   const { data: importedSecrets } = useGetImportedSecretsSingleEnv({
-    projectId: projectId,
+    projectId,
     environment,
     path: secretPath,
     options: {
@@ -416,7 +416,7 @@ const Page = () => {
       navigate({
         to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
         params: {
-          projectId: projectId,
+          projectId,
           folderId,
           environment
         },
@@ -647,7 +647,7 @@ const Page = () => {
                 ? change.tags?.map((tag) => ({
                     id: tag.id,
                     slug: tag.slug,
-                    projectId: projectId,
+                    projectId,
                     createdAt: new Date().toISOString(),
                     updatedAt: new Date().toISOString(),
                     __v: 0
@@ -955,7 +955,7 @@ const Page = () => {
                   secretImports={imports}
                   isFetching={isDetailsFetching}
                   environment={environment}
-                  workspaceId={projectId}
+                  projectId={projectId}
                   secretPath={secretPath}
                   importedSecrets={importedSecrets}
                 />
@@ -964,7 +964,7 @@ const Page = () => {
                 <FolderListView
                   folders={mergedFolders}
                   environment={environment}
-                  workspaceId={projectId}
+                  projectId={projectId}
                   secretPath={secretPath}
                   onNavigateToFolder={handleResetFilter}
                   canNavigate={isFetched}
@@ -999,7 +999,7 @@ const Page = () => {
                 <CommitForm
                   onCommit={handleCreateCommit}
                   environment={environment}
-                  workspaceId={projectId}
+                  projectId={projectId}
                   secretPath={secretPath}
                   isCommitting={isCommitPending}
                 />

frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx

@@ -55,9 +55,9 @@ import {
   ProjectPermissionActions,
   ProjectPermissionDynamicSecretActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
+  useSubscription
-  useProject
 } from "@app/context";
 import {
   ProjectPermissionCommitsActions,
@@ -635,7 +635,7 @@ export const ActionBar = ({
         queryKey: secretKeys.getProjectSecret({ projectId, environment, secretPath })
       });
       queryClient.invalidateQueries({});
-      queryKey: dashboardKeys.getDashboardSecrets({ projectId, secretPath });
+      dashboardKeys.getDashboardSecrets({ projectId, secretPath });
       queryClient.invalidateQueries({
         queryKey: secretApprovalRequestKeys.count({ projectId })
       });

frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateSecretImportForm.tsx

@@ -14,7 +14,7 @@ import {
   SelectItem
 } from "@app/components/v2";
 import { SecretPathInput } from "@app/components/v2/SecretPathInput";
-import { useSubscription, useProject } from "@app/context";
+import { useProject, useSubscription } from "@app/context";
 import { useCreateSecretImport } from "@app/hooks/api";
 
 const typeSchema = z.object({
@@ -43,7 +43,7 @@ type Props = {
 
 export const CreateSecretImportForm = ({
   environment,
-  projectId: workspaceId,
+  projectId,
   secretPath = "/",
   isOpen,
   onClose,
@@ -77,7 +77,7 @@ export const CreateSecretImportForm = ({
 
       await createSecretImport({
         environment,
-        projectId: workspaceId,
+        projectId,
         path: secretPath,
         isReplication,
         import: {

frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ReplicateFolderFromBoard/ReplicateFolderFromBoard.tsx

@@ -64,7 +64,7 @@ type SecretStructure = {
 
 export const ReplicateFolderFromBoard = ({
   environments = [],
-  projectId: workspaceId,
+  projectId,
   isOpen,
   onToggle,
   onParsedEnv
@@ -82,14 +82,14 @@ export const ReplicateFolderFromBoard = ({
   const [debouncedEnvCopySecretPath] = useDebounce(envCopySecPath);
 
   const { data: accessibleSecrets } = useGetAccessibleSecrets({
-    projectId: workspaceId,
+    projectId,
     secretPath: "/",
     environment: selectedEnvSlug.slug,
     recursive: true,
     filterByAction: shouldIncludeValues
       ? ProjectPermissionSecretActions.ReadValue
       : ProjectPermissionSecretActions.DescribeSecret,
-    options: { enabled: Boolean(workspaceId) && Boolean(selectedEnvSlug) && isOpen }
+    options: { enabled: Boolean(projectId) && Boolean(selectedEnvSlug) && isOpen }
   });
 
   const restructureSecrets = useMemo(() => {

frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx

@@ -25,14 +25,14 @@ interface CommitFormProps {
   onCommit: (changes: PendingChanges, commitMessage: string) => Promise<void>;
   isCommitting?: boolean;
   environment: string;
-  workspaceId: string;
+  projectId: string;
   secretPath: string;
 }
 
 interface ResourceChangeProps {
   change: PendingChange;
   environment: string;
-  workspaceId: string;
+  projectId: string;
   secretPath: string;
 }
 
@@ -237,7 +237,7 @@ const RenderFolderChanges = ({ onDiscard, change }: RenderResourceProps) => {
 const ResourceChange: React.FC<ResourceChangeProps> = ({
   change,
   environment,
-  workspaceId,
+  projectId,
   secretPath
 }) => {
   const { removePendingChange } = useBatchModeActions();
@@ -245,7 +245,7 @@ const ResourceChange: React.FC<ResourceChangeProps> = ({
   const handleDeletePending = useCallback(
     (changeType: string, id: string) => {
       removePendingChange(id, changeType, {
-        projectId: workspaceId,
+        projectId,
         environment,
         secretPath
       });
@@ -272,7 +272,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
   onCommit,
   isCommitting = false,
   environment,
-  workspaceId,
+  projectId,
   secretPath
 }) => {
   const { isBatchMode, pendingChanges, totalChangesCount } = useBatchMode();
@@ -291,7 +291,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
     }
     await onCommit(pendingChanges, commitMessage);
     clearAllPendingChanges({
-      projectId: workspaceId,
+      projectId,
       environment,
       secretPath
     });
@@ -335,9 +335,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
                   <div className="ml-6 mt-0.5 flex items-center gap-3">
                     <Button
                       size="sm"
-                      onClick={() =>
+                      onClick={() => clearAllPendingChanges({ projectId, environment, secretPath })}
-                        clearAllPendingChanges({ projectId: workspaceId, environment, secretPath })
-                      }
                       isDisabled={totalChangesCount === 0}
                       variant="outline_bg"
                       className="px-4 hover:border-red/40 hover:bg-red/[0.1]"
@@ -393,7 +391,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
                           key={change.id}
                           change={change}
                           environment={environment}
-                          workspaceId={workspaceId}
+                          projectId={projectId}
                           secretPath={secretPath}
                         />
                       ))}
@@ -414,7 +412,7 @@ export const CommitForm: React.FC<CommitFormProps> = ({
                           key={change.id}
                           change={change}
                           environment={environment}
-                          workspaceId={workspaceId}
+                          projectId={projectId}
                           secretPath={secretPath}
                         />
                       ))}

frontend/src/pages/secret-manager/SecretDashboardPage/components/CompareEnvironments/CompareEnvironments.tsx

@@ -133,7 +133,7 @@ export const CompareEnvironments = ({ secretPath }: Props) => {
     setUserTablePreference("secretCompareTable", PreferenceKey.PerPage, newPerPage);
   };
 
-  const workspaceId = currentProject.id;
+  const projectId = currentProject.id;
   const [searchFilter, setSearchFilter] = useState("");
   const [debouncedSearchFilter] = useDebounce(searchFilter);
   const [debouncedSelectedEnvironments] = useDebounce(selectedEnvironments);
@@ -151,7 +151,7 @@ export const CompareEnvironments = ({ secretPath }: Props) => {
     getImportedSecretByKey,
     getEnvImportedSecretKeyCount
   } = useGetImportedSecretsAllEnvs({
-    projectId: workspaceId,
+    projectId,
     path: secretPath,
     environments: (currentProject.environments || []).map(({ slug }) => slug)
   });
@@ -163,7 +163,7 @@ export const CompareEnvironments = ({ secretPath }: Props) => {
   const isFilteredByResources = Object.values(filter).some(Boolean);
   const { isPending: isOverviewLoading, data: overview } = useGetProjectSecretsOverview(
     {
-      projectId: workspaceId,
+      projectId,
       environments: compareEnvironments.map((env) => env.slug),
       secretPath,
       orderDirection,

frontend/src/pages/secret-manager/SecretDashboardPage/components/EnvironmentTabs/EnvironmentTabs.tsx

@@ -24,8 +24,8 @@ import { ROUTE_PATHS } from "@app/const/routes";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
-  useSubscription,
+  useProject,
-  useProject
+  useSubscription
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { projectKeys } from "@app/hooks/api";

frontend/src/pages/secret-manager/SecretDashboardPage/components/FolderListView/FolderListView.tsx

@@ -33,7 +33,7 @@ import { FolderForm } from "../ActionBar/FolderForm";
 type Props = {
   folders?: TSecretFolder[];
   environment: string;
-  workspaceId: string;
+  projectId: string;
   secretPath?: string;
   onNavigateToFolder: (path: string) => void;
   canNavigate: boolean;
@@ -42,7 +42,7 @@ type Props = {
 export const FolderListView = ({
   folders = [],
   environment,
-  workspaceId,
+  projectId,
   secretPath = "/",
   onNavigateToFolder,
   canNavigate
@@ -89,7 +89,7 @@ export const FolderListView = ({
           };
 
           addPendingChange(updatedCreate, {
-            projectId: workspaceId,
+            projectId,
             environment,
             secretPath
           });
@@ -106,7 +106,7 @@ export const FolderListView = ({
           };
 
           addPendingChange(updateChange, {
-            projectId: workspaceId,
+            projectId,
             environment,
             secretPath
           });
@@ -121,7 +121,7 @@ export const FolderListView = ({
         name: newFolderName,
         path: secretPath,
         environment,
-        projectId: workspaceId,
+        projectId,
         description: newFolderDescription
       });
       handlePopUpClose("updateFolder");
@@ -140,7 +140,7 @@ export const FolderListView = ({
 
   const handleDeletePending = (id: string) => {
     removePendingChange(id, "folder", {
-      projectId: workspaceId,
+      projectId,
       environment,
       secretPath
     });
@@ -161,7 +161,7 @@ export const FolderListView = ({
         };
 
         addPendingChange(pendingFolderDelete, {
-          projectId: workspaceId,
+          projectId,
           environment,
           secretPath
         });
@@ -174,7 +174,7 @@ export const FolderListView = ({
         folderId: folderData.id,
         path: secretPath,
         environment,
-        projectId: workspaceId
+        projectId
       });
 
       handlePopUpClose("deleteFolder");