diff --git a/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts b/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts index 51bcab0016..91e0425422 100644 --- a/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts +++ b/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts @@ -1,5 +1,6 @@ import { z } from "zod"; +import { EventType } from "@app/ee/services/audit-log/audit-log-types"; import { BadRequestError } from "@app/lib/errors"; import { readLimit, writeLimit } from "@app/server/config/rateLimiter"; import { verifyAuth } from "@app/server/plugins/auth/verify-auth"; @@ -11,7 +12,6 @@ import { TUpdatePolicyDTO } from "@app/services/approval-policy/approval-policy-types"; import { AuthMode } from "@app/services/auth/auth-type"; -import { EventType } from "@app/ee/services/audit-log/audit-log-types"; export const registerApprovalPolicyEndpoints =
({ server, diff --git a/backend/src/services/approval-policy/approval-policy-service.ts b/backend/src/services/approval-policy/approval-policy-service.ts index 1940b98776..4c675be98d 100644 --- a/backend/src/services/approval-policy/approval-policy-service.ts +++ b/backend/src/services/approval-policy/approval-policy-service.ts @@ -1,6 +1,13 @@ +import { ForbiddenError } from "@casl/ability"; + import { ActionProjectType, ProjectMembershipRole, TApprovalPolicies, TApprovalRequests } from "@app/db/schemas"; import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal"; import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types"; +import { + ProjectPermissionApprovalRequestActions, + ProjectPermissionApprovalRequestGrantActions, + ProjectPermissionSub +} from "@app/ee/services/permission/project-permission"; import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors"; import { ms } from "@app/lib/ms"; import { OrgServiceActor } from "@app/lib/types"; @@ -34,13 +41,6 @@ import { TCreateRequestDTO, TUpdatePolicyDTO } from "./approval-policy-types"; -import { ForbiddenError } from "@casl/ability"; -import { - ProjectPermissionActions, - ProjectPermissionApprovalRequestActions, - ProjectPermissionApprovalRequestGrantActions, - ProjectPermissionSub -} from "@app/ee/services/permission/project-permission"; type TApprovalPolicyServiceFactoryDep = { approvalPolicyDAL: TApprovalPolicyDALFactory; @@ -751,6 +751,7 @@ export const approvalPolicyServiceFactory = ({ if (isRequester) { filteredRequests.push(request); + // eslint-disable-next-line no-continue continue; }