Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
backend logic for filters
Matheus Nogueira654f8226dba8
diff --git a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.tsindex f4b6587137..dd5af6dbee 100644--- a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts+++ b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts@@ -6,6 +6,7 @@ import { BitbucketDataSourceListItemSchema } from "@app/ee/services/secret-scannimport { GitHubDataSourceListItemSchema } from "@app/ee/services/secret-scanning-v2/github";import { GitLabDataSourceListItemSchema } from "@app/ee/services/secret-scanning-v2/gitlab";import {+ SecretScanningFindingOrderBy,SecretScanningFindingStatus,SecretScanningScanStatus} from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";@@ -20,6 +21,7 @@ import {SecretScanningFindings,SecretScanningProjects} from "@app/lib/api-docs";+import { OrderByDirection } from "@app/lib/types";import { readLimit, writeLimit } from "@app/server/config/rateLimiter";import { getTelemetryDistinctId } from "@app/server/lib/telemetry";import { verifyAuth } from "@app/server/plugins/auth/verify-auth";@@ -187,19 +189,34 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider).trim().min(1, "Project ID required").optional()- .describe(SecretScanningFindings.LIST.projectId)+ .describe(SecretScanningFindings.LIST.projectId),+ status: z.nativeEnum(SecretScanningFindingStatus).optional().describe(SecretScanningFindings.LIST.status),+ dataSourceId: z.string().trim().uuid().optional().describe(SecretScanningFindings.LIST.dataSourceId),+ resourceId: z.string().trim().uuid().optional().describe(SecretScanningFindings.LIST.resourceId),+ orderBy: z+ .nativeEnum(SecretScanningFindingOrderBy)+ .default(SecretScanningFindingOrderBy.CreatedAt)+ .describe(SecretScanningFindings.LIST.orderBy),+ orderDirection: z+ .nativeEnum(OrderByDirection)+ .default(OrderByDirection.DESC)+ .describe(SecretScanningFindings.LIST.orderDirection),+ offset: z.coerce.number().int().min(0).default(0).describe(SecretScanningFindings.LIST.offset),+ limit: z.coerce.number().int().min(1).max(100).default(100).describe(SecretScanningFindings.LIST.limit)}),response: {- 200: z.object({ findings: SecretScanningFindingSchema.array() })+ 200: z.object({ findings: SecretScanningFindingSchema.array(), totalCount: z.number() })}},onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN, AuthMode.OAUTH]),handler: async (req) => {const { permission } = req;const projectId = req.internalSecretScanningProjectId;+ const { status, dataSourceId, resourceId, orderBy, orderDirection, offset, limit } = req.query;- const findings = await server.services.secretScanningV2.listSecretScanningFindingsByProjectId(+ const { findings, totalCount } = await server.services.secretScanningV2.listSecretScanningFindingsByProjectId(projectId,+ { status, dataSourceId, resourceId, orderBy, orderDirection, offset, limit },permission);@@ -215,7 +232,7 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider)}});- return { findings };+ return { findings, totalCount };}});diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.tsindex 52b3674e78..dcb68fc3ce 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.ts@@ -9,6 +9,7 @@ import {TSecretScanningFindings} from "@app/db/schemas";import {+ SecretScanningFindingOrderBy,SecretScanningFindingStatus,SecretScanningScanStatus} from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";@@ -22,9 +23,27 @@ import {sqlNestRelationships,TFindOpt} from "@app/lib/knex";+import { OrderByDirection } from "@app/lib/types";export type TSecretScanningV2DALFactory = ReturnType<typeof secretScanningV2DALFactory>;+export type TListSecretScanningFindingsFilter = {+ status?: SecretScanningFindingStatus;+ dataSourceId?: string;+ resourceId?: string;+ orderBy: SecretScanningFindingOrderBy;+ orderDirection: OrderByDirection;+ offset: number;+ limit: number;+};++const FINDING_STATUS_SORT_ORDER = [+ SecretScanningFindingStatus.Unresolved,+ SecretScanningFindingStatus.Resolved,+ SecretScanningFindingStatus.FalsePositive,+ SecretScanningFindingStatus.Ignore+];+type TSecretScanningDataSourceFindFilter = Parameters<typeof buildFindFilter<TSecretScanningDataSources>>[0];type TSecretScanningDataSourceFindOptions = TFindOpt<TSecretScanningDataSources, true, "name">;@@ -530,14 +549,79 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {db.ref("name").withSchema(TableName.SecretScanningResource).as("resourceName"));- const findFindingsByProjectId = async (projectId: string, tx?: Knex) => {+ const applyFindingFilters = <Q extends Knex.QueryBuilder>(+ query: Q,+ projectId: string,+ {+ status,+ dataSourceId,+ resourceId+ }: Pick<TListSecretScanningFindingsFilter, "status" | "dataSourceId" | "resourceId">+ ) => {+ void query.where(`${TableName.SecretScanningDataSource}.projectId`, projectId);+ if (status) void query.where(`${TableName.SecretScanningFinding}.status`, status);+ if (dataSourceId) void query.where(`${TableName.SecretScanningDataSource}.id`, dataSourceId);+ if (resourceId) void query.where(`${TableName.SecretScanningFinding}.resourceId`, resourceId);+ return query;+ };++ const applyFindingOrder = <Q extends Knex.QueryBuilder>(+ query: Q,+ orderBy: SecretScanningFindingOrderBy,+ orderDirection: OrderByDirection+ ) => {+ const direction = orderDirection === OrderByDirection.ASC ? "asc" : "desc";++ switch (orderBy) {+ case SecretScanningFindingOrderBy.Rule:+ void query.orderBy(`${TableName.SecretScanningFinding}.rule`, direction);+ break;+ case SecretScanningFindingOrderBy.ResourceName:+ void query.orderBy(`${TableName.SecretScanningResource}.name`, direction);+ break;+ case SecretScanningFindingOrderBy.Author:+ void query.orderByRaw(`??->>'author' ${direction}`, [`${TableName.SecretScanningFinding}.details`]);+ break;+ case SecretScanningFindingOrderBy.Status:+ void query.orderByRaw(+ `CASE ?? ${FINDING_STATUS_SORT_ORDER.map(() => "WHEN ? THEN ?").join(" ")} END ${direction}`,+ [+ `${TableName.SecretScanningFinding}.status`,+ ...FINDING_STATUS_SORT_ORDER.flatMap((status, index) => [status, index])+ ]+ );+ break;+ case SecretScanningFindingOrderBy.CreatedAt:+ default:+ void query.orderBy(`${TableName.SecretScanningFinding}.createdAt`, direction);+ }++ // a unique tiebreaker keeps rows from repeating or vanishing across pages when sort values tie+ void query.orderBy(`${TableName.SecretScanningFinding}.id`, direction);+ return query;+ };++ const findFindingsByProjectId = async (+ projectId: string,+ { orderBy, orderDirection, offset, limit, ...filter }: TListSecretScanningFindingsFilter,+ tx?: Knex+ ) => {try {- const findings = await findingWithDetailsQuery(tx).where(- `${TableName.SecretScanningDataSource}.projectId`,- projectId- );+ const findingsQuery = applyFindingOrder(+ applyFindingFilters(findingWithDetailsQuery(tx), projectId, filter),+ orderBy,+ orderDirection+ )+ .offset(offset)+ .limit(limit);++ const countQuery = applyFindingFilters(baseFindingQuery(tx), projectId, filter)+ .count({ count: `${TableName.SecretScanningFinding}.id` })+ .first();++ const [findings, countResult] = await Promise.all([findingsQuery, countQuery]);- return findings;+ return { findings, totalCount: Number(countResult?.count ?? 0) };} catch (error) {throw new DatabaseError({ error, name: "Find By Project ID - Secret Scanning Finding" });}diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.tsindex 670cd5bfd3..70dcfbdf97 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.ts@@ -23,6 +23,14 @@ export enum SecretScanningFindingStatus {Ignore = "ignore"}+export enum SecretScanningFindingOrderBy {+ CreatedAt = "createdAt",+ Rule = "rule",+ ResourceName = "resourceName",+ Author = "author",+ Status = "status"+}+export enum SecretScanningFindingSeverity {High = "high",Medium = "medium",diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.tsindex 3ad08d76ad..8f703d16db 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts@@ -57,7 +57,7 @@ import { KmsDataKey } from "@app/services/kms/kms-types";import { bitbucketSecretScanningService } from "./bitbucket/bitbucket-secret-scanning-service";import { gitlabSecretScanningService } from "./gitlab/gitlab-secret-scanning-service";-import { TSecretScanningV2DALFactory } from "./secret-scanning-v2-dal";+import { TListSecretScanningFindingsFilter, TSecretScanningV2DALFactory } from "./secret-scanning-v2-dal";import { TSecretScanningV2QueueServiceFactory } from "./secret-scanning-v2-queue";export type TSecretScanningV2ServiceFactoryDep = {@@ -762,7 +762,11 @@ export const secretScanningV2ServiceFactory = ({});};- const listSecretScanningFindingsByProjectId = async (projectId: string, actor: OrgServiceActor) => {+ const listSecretScanningFindingsByProjectId = async (+ projectId: string,+ filter: TListSecretScanningFindingsFilter,+ actor: OrgServiceActor+ ) => {const plan = await licenseService.getPlan(actor.orgId);if (!plan.secretScanning)@@ -785,9 +789,9 @@ export const secretScanningV2ServiceFactory = ({ProjectPermissionSub.SecretScanningFindings);- const findings = await secretScanningV2DAL.findings.findByProjectId(projectId);+ const { findings, totalCount } = await secretScanningV2DAL.findings.findByProjectId(projectId, filter);- return findings as TSecretScanningFinding[];+ return { findings: findings as TSecretScanningFinding[], totalCount };};const updateSecretScanningFindingById = async (diff --git a/backend/src/lib/api-docs/constants.ts b/backend/src/lib/api-docs/constants.tsindex 7cd3a9afd2..e77e42a2a8 100644--- a/backend/src/lib/api-docs/constants.ts+++ b/backend/src/lib/api-docs/constants.ts@@ -4009,7 +4009,14 @@ export const SecretScanningDataSources = {export const SecretScanningFindings = {LIST: {- projectId: `The ID of the project to list Secret Scanning Findings from. Defaults to the organization's active Secret Scanning project.`+ projectId: `The ID of the project to list Secret Scanning Findings from. Defaults to the organization's active Secret Scanning project.`,+ status: "Only return findings with this status.",+ dataSourceId: "Only return findings detected in this Data Source.",+ resourceId: "Only return findings detected in this resource, such as a repository or project.",+ orderBy: "The field to sort findings by.",+ orderDirection: "The direction to sort findings in.",+ offset: "The number of findings to skip, for pagination.",+ limit: "The maximum number of findings to return, from 1 to 100."},UPDATE: {findingId: "The ID of the Secret Scanning Finding to update.",diff --git a/frontend/src/hooks/api/secretScanningV2/enums.ts b/frontend/src/hooks/api/secretScanningV2/enums.tsindex 670cd5bfd3..70dcfbdf97 100644--- a/frontend/src/hooks/api/secretScanningV2/enums.ts+++ b/frontend/src/hooks/api/secretScanningV2/enums.ts@@ -23,6 +23,14 @@ export enum SecretScanningFindingStatus {Ignore = "ignore"}+export enum SecretScanningFindingOrderBy {+ CreatedAt = "createdAt",+ Rule = "rule",+ ResourceName = "resourceName",+ Author = "author",+ Status = "status"+}+export enum SecretScanningFindingSeverity {High = "high",Medium = "medium",diff --git a/frontend/src/hooks/api/secretScanningV2/queries.tsx b/frontend/src/hooks/api/secretScanningV2/queries.tsxindex 08a799ff2e..c9a425e27d 100644--- a/frontend/src/hooks/api/secretScanningV2/queries.tsx+++ b/frontend/src/hooks/api/secretScanningV2/queries.tsx@@ -1,4 +1,4 @@-import { useQuery, UseQueryOptions } from "@tanstack/react-query";+import { keepPreviousData, useQuery, UseQueryOptions } from "@tanstack/react-query";import { apiRequest } from "@app/config/request";@@ -8,6 +8,7 @@ import {TGetSecretScanningUnresolvedFindingsResponse,TListSecretScanningDataSourceOptions,TListSecretScanningDataSources,+ TListSecretScanningFindingsDTO,TListSecretScanningFindingsResponse,TListSecretScanningResourcesResponse,TListSecretScanningScansResponse,@@ -16,7 +17,6 @@ import {TSecretScanningDataSourceOption,TSecretScanningDataSourceResponse,TSecretScanningDataSourceWithDetails,- TSecretScanningFinding,TSecretScanningResourceWithDetails,TSecretScanningScanWithDetails} from "./types";@@ -51,6 +51,10 @@ export const secretScanningV2Keys = {findingCount: (projectId: string) =>[...secretScanningV2Keys.finding(), "count", projectId] as const,listFindings: (projectId: string) => [...secretScanningV2Keys.finding(), "list", projectId],+ listFindingsWithParams: (params: TListSecretScanningFindingsDTO) => [+ ...secretScanningV2Keys.listFindings(params.projectId),+ params+ ],configByProjectId: (projectId: string) =>[...secretScanningV2Keys.all, "config", projectId] as const,activeProjectId: (orgId: string) => [...secretScanningV2Keys.all, "project", orgId] as const,@@ -242,27 +246,28 @@ export const useGetSecretScanningUnresolvedFindingCount = (};export const useListSecretScanningFindings = (- projectId: string,+ params: TListSecretScanningFindingsDTO,options?: Omit<UseQueryOptions<- TSecretScanningFinding[],+ TListSecretScanningFindingsResponse,unknown,- TSecretScanningFinding[],- ReturnType<typeof secretScanningV2Keys.listFindings>+ TListSecretScanningFindingsResponse,+ ReturnType<typeof secretScanningV2Keys.listFindingsWithParams>>,"queryKey" | "queryFn">) => {return useQuery({- queryKey: secretScanningV2Keys.listFindings(projectId),+ queryKey: secretScanningV2Keys.listFindingsWithParams(params),queryFn: async () => {const { data } = await apiRequest.get<TListSecretScanningFindingsResponse>("/api/v2/secret-scanning/findings",- { params: { projectId } }+ { params });- return data.findings;+ return data;},+ placeholderData: keepPreviousData,...options});};diff --git a/frontend/src/hooks/api/secretScanningV2/types/index.ts b/frontend/src/hooks/api/secretScanningV2/types/index.tsindex be6ac04aee..dbaa3d9d6a 100644--- a/frontend/src/hooks/api/secretScanningV2/types/index.ts+++ b/frontend/src/hooks/api/secretScanningV2/types/index.ts@@ -1,3 +1,4 @@+import { OrderByDirection } from "@app/hooks/api/generic/types";import {TGitLabDataSource,TGitLabDataSourceOption@@ -7,6 +8,7 @@ import { DiscriminativePick } from "@app/types";import {SecretScanningDataSource,SecretScanningFindingConfidence,+ SecretScanningFindingOrderBy,SecretScanningFindingSeverity,SecretScanningFindingStatus,SecretScanningScanStatus,@@ -179,6 +181,18 @@ export type TSecretScanningFinding = {updatedAt: string;};+export type TListSecretScanningFindingsDTO = {+ projectId: string;+ status?: SecretScanningFindingStatus;+ dataSourceId?: string;+ resourceId?: string;+ orderBy: SecretScanningFindingOrderBy;+ orderDirection: OrderByDirection;+ offset: number;+ limit: number;+};+export type TListSecretScanningFindingsResponse = {findings: TSecretScanningFinding[];+ totalCount: number;};diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsxindex 38fe635905..cbd9febf44 100644--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx@@ -24,7 +24,7 @@ import {useGetSecretScanningDataSource} from "@app/hooks/api/secretScanningV2";-import { SecretScanningFindingsSection } from "../components/findings";+import { SecretScanningFindingsTable } from "../components/findings";import {SecretScanningDataSourceSection,SecretScanningResourceSection,@@ -102,7 +102,7 @@ const PageContent = () => {I={ProjectPermissionSecretScanningFindingActions.Read}a={ProjectPermissionSub.SecretScanningFindings}>- <SecretScanningFindingsSection+ <SecretScanningFindingsTabledataSource={dataSource}cardHeader={<CardHeader>diff --git a/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsx b/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsxindex 9ef1e63636..3e1c17923f 100644--- a/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsx+++ b/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsx@@ -9,7 +9,7 @@ import { ProjectPermissionSub } from "@app/context";import { ProjectPermissionSecretScanningFindingActions } from "@app/context/ProjectPermissionContext/types";import { ProjectType } from "@app/hooks/api/projects/types";-import { SecretScanningFindingsSection } from "../components/findings";+import { SecretScanningFindingsTable } from "../components/findings";export const SecretScanningFindingsPage = () => {const { t } = useTranslation();@@ -35,7 +35,7 @@ export const SecretScanningFindingsPage = () => {title="Findings"description="Secrets detected across every data source."/>- <SecretScanningFindingsSection+ <SecretScanningFindingsTableinitialStatus={status}initialDataSourceId={dataSourceId}initialResourceId={resourceId}diff --git a/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsx b/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsxindex 5d408353b8..c7e3852156 100644--- a/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsx+++ b/frontend/src/pages/secret-scanning/components/findings/FindingStatusDialog.tsx@@ -35,7 +35,7 @@ type Props = {findings: TSecretScanningFinding[];status: SecretScanningFindingStatus | null;onOpenChange: (isOpen: boolean) => void;- onComplete?: () => void;+ onComplete?: (result: { status: SecretScanningFindingStatus; comment: string }) => void;};export const FindingStatusDialog = ({ findings, status, onOpenChange, onComplete }: Props) => {@@ -74,7 +74,7 @@ export const FindingStatusDialog = ({ findings, status, onOpenChange, onComplete: `Finding marked as ${name}`});onOpenChange(false);- onComplete?.();+ onComplete?.({ status, comment });}});diff --git a/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsSection.tsx b/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsSection.tsxdeleted file mode 100644index a52f91362f..0000000000--- a/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsSection.tsx+++ /dev/null@@ -1,18 +0,0 @@-import { ComponentProps } from "react";--import { useProject } from "@app/context";-import { useListSecretScanningFindings } from "@app/hooks/api/secretScanningV2";--import { SecretScanningFindingsTable } from "./SecretScanningFindingsTable";--type Props = Omit<ComponentProps<typeof SecretScanningFindingsTable>, "findings" | "isPending">;--export const SecretScanningFindingsSection = (props: Props) => {- const { currentProject } = useProject();-- const { data: findings = [], isPending } = useListSecretScanningFindings(currentProject.id, {- refetchInterval: 30000- });-- return <SecretScanningFindingsTable findings={findings} isPending={isPending} {...props} />;-};diff --git a/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx b/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsxindex a689856219..574efc06d6 100644--- a/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx+++ b/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx@@ -1,4 +1,4 @@-import { ReactNode, useMemo, useState } from "react";+import { ReactNode, useState } from "react";import { formatDistanceToNowStrict } from "date-fns";import { ChevronDownIcon, FilterIcon, ShieldCheckIcon } from "lucide-react";import { twMerge } from "tailwind-merge";@@ -16,7 +16,6 @@ import {DropdownMenuRadioGroup,DropdownMenuRadioItem,DropdownMenuSeparator,- DropdownMenuShortcut,DropdownMenuTrigger,Empty,EmptyContent,@@ -36,6 +35,7 @@ import {TableRow,type TableSortDirection} from "@app/components/v3";+import { useProject } from "@app/context";import {ProjectPermissionSecretScanningFindingActions,ProjectPermissionSub@@ -46,11 +46,15 @@ import {SECRET_SCANNING_FINDING_STATUS_MAP,SECRET_SCANNING_FINDING_STATUS_ORDER} from "@app/helpers/secretScanningV2";-import { usePagination, useResetPageHelper } from "@app/hooks";+import { OrderByDirection } from "@app/hooks/api/generic/types";import {+ SecretScanningFindingOrderBy,SecretScanningFindingStatus,TSecretScanningDataSource,TSecretScanningFinding,+ useListSecretScanningDataSources,+ useListSecretScanningFindings,+ useListSecretScanningResources,useUpdateMultipleSecretScanningFinding} from "@app/hooks/api/secretScanningV2";@@ -60,56 +64,57 @@ import { FindingStatusDialog } from "./FindingStatusDialog";export type FindingsStatusFilter = SecretScanningFindingStatus | "all";-enum FindingsOrderBy {- Rule = "rule",- Resource = "resource",- Author = "author",- Detected = "detected",- Status = "status"-}+type TSort = { orderBy: SecretScanningFindingOrderBy; orderDirection: OrderByDirection };-type TSort = { column: FindingsOrderBy; direction: Exclude<TableSortDirection, "none"> };--const DEFAULT_SORT: TSort = { column: FindingsOrderBy.Detected, direction: "descending" };+const DEFAULT_SORT: TSort = {+ orderBy: SecretScanningFindingOrderBy.CreatedAt,+ orderDirection: OrderByDirection.DESC+};const ALL_OPTION = "all";-const compareFindings = (- a: TSecretScanningFinding,- b: TSecretScanningFinding,- column: FindingsOrderBy-) => {- switch (column) {- case FindingsOrderBy.Rule:- return a.rule.localeCompare(b.rule);- case FindingsOrderBy.Resource:- return a.resourceName.localeCompare(b.resourceName);- case FindingsOrderBy.Author:- return (a.details.author ?? "").localeCompare(b.details.author ?? "");- case FindingsOrderBy.Status:- return (- SECRET_SCANNING_FINDING_STATUS_ORDER.indexOf(a.status) -- SECRET_SCANNING_FINDING_STATUS_ORDER.indexOf(b.status)- );- case FindingsOrderBy.Detected:- default:- return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();- }+type ResourceFilterProps = {+ dataSource: Pick<TSecretScanningDataSource, "id" | "type">;+ value: string | null;+ onChange: (resourceId: string | null) => void;};-const countBy = <T extends string>(- items: TSecretScanningFinding[],- key: (f: TSecretScanningFinding) => T-) =>- items.reduce<Record<string, number>>((acc, item) => {- const value = key(item);- acc[value] = (acc[value] ?? 0) + 1;- return acc;- }, {});+const ResourceFilter = ({ dataSource, value, onChange }: ResourceFilterProps) => {+ const { data: resources = [] } = useListSecretScanningResources({+ dataSourceId: dataSource.id,+ type: dataSource.type+ });++ const { singularTitle, pluralTitle } = RESOURCE_DESCRIPTION_HELPER[dataSource.type];+ const selectedName = resources.find((r) => r.id === value)?.name;++ return (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="outline">+ {singularTitle}: {selectedName ?? "All"}+ <ChevronDownIcon />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end" className="max-h-80 thin-scrollbar min-w-64 overflow-y-auto">+ <DropdownMenuRadioGroup+ value={value ?? ALL_OPTION}+ onValueChange={(next) => onChange(next === ALL_OPTION ? null : next)}+ >+ <DropdownMenuRadioItem value={ALL_OPTION}>All {pluralTitle}</DropdownMenuRadioItem>+ <DropdownMenuSeparator />+ {resources.map((resource) => (+ <DropdownMenuRadioItem key={resource.id} value={resource.id}>+ <span className="truncate font-mono">{resource.name}</span>+ </DropdownMenuRadioItem>+ ))}+ </DropdownMenuRadioGroup>+ </DropdownMenuContent>+ </DropdownMenu>+ );+};type Props = {- findings: TSecretScanningFinding[];- isPending: boolean;dataSource?: TSecretScanningDataSource;initialStatus?: FindingsStatusFilter;initialDataSourceId?: string;@@ -118,161 +123,150 @@ type Props = {};export const SecretScanningFindingsTable = ({- findings,- isPending,dataSource,initialStatus = SecretScanningFindingStatus.Unresolved,initialDataSourceId,initialResourceId,cardHeader}: Props) => {+ const { currentProject } = useProject();const isScoped = Boolean(dataSource);const [statusFilter, setStatusFilter] = useState<FindingsStatusFilter>(initialStatus);const [dataSourceFilter, setDataSourceFilter] = useState<string | null>(- initialDataSourceId ?? null+ dataSource?.id ?? initialDataSourceId ?? null);const [resourceFilter, setResourceFilter] = useState<string | null>(initialResourceId ?? null);const [sort, setSort] = useState<TSort>(DEFAULT_SORT);+ const [page, setPage] = useState(1);+ const [perPage, setPerPage] = useState(20);const [selectedIds, setSelectedIds] = useState<string[]>([]);- const [openFindingId, setOpenFindingId] = useState<string | null>(null);+ // a snapshot keeps the sheet open when a status change moves the finding out of the current filter+ const [openFinding, setOpenFinding] = useState<TSecretScanningFinding | null>(null);const [statusChange, setStatusChange] = useState<{- findingIds: string[];+ findings: TSecretScanningFinding[];status: SecretScanningFindingStatus;} | null>(null);- const { page, setPage, perPage, setPerPage, offset } = usePagination(FindingsOrderBy.Detected, {- initPerPage: 20- });-- const reopenFinding = useUpdateMultipleSecretScanningFinding();-- const scopedFindings = useMemo(- () => (dataSource ? findings.filter((f) => f.dataSourceId === dataSource.id) : findings),- [findings, dataSource]- );-- const dataSourceOptions = useMemo(() => {- const counts = countBy(scopedFindings, (f) => f.dataSourceId);- const seen = new Map<string, TSecretScanningFinding>();- scopedFindings.forEach((f) => {- if (!seen.has(f.dataSourceId)) seen.set(f.dataSourceId, f);- });- return [...seen.values()]- .map((f) => ({- id: f.dataSourceId,- name: f.dataSourceName,- type: f.dataSourceType,- count: counts[f.dataSourceId]- }))- .sort((a, b) => a.name.localeCompare(b.name));- }, [scopedFindings]);-- const sourceFilteredFindings = useMemo(- () =>- dataSourceFilter- ? scopedFindings.filter((f) => f.dataSourceId === dataSourceFilter)- : scopedFindings,- [scopedFindings, dataSourceFilter]- );-- const resourceOptions = useMemo(() => {- const counts = countBy(sourceFilteredFindings, (f) => f.resourceId);- const seen = new Map<string, string>();- sourceFilteredFindings.forEach((f) => {- if (!seen.has(f.resourceId)) seen.set(f.resourceId, f.resourceName);- });- return [...seen.entries()]- .map(([id, name]) => ({ id, name, count: counts[id] }))- .sort((a, b) => a.name.localeCompare(b.name));- }, [sourceFilteredFindings]);-- const inScopeFindings = useMemo(- () =>- resourceFilter- ? sourceFilteredFindings.filter((f) => f.resourceId === resourceFilter)- : sourceFilteredFindings,- [sourceFilteredFindings, resourceFilter]+ const { data, isPending } = useListSecretScanningFindings(+ {+ projectId: currentProject.id,+ status: statusFilter === "all" ? undefined : statusFilter,+ dataSourceId: dataSourceFilter ?? undefined,+ resourceId: resourceFilter ?? undefined,+ ...sort,+ offset: (page - 1) * perPage,+ limit: perPage+ },+ { refetchInterval: 30000 });- const statusCounts = useMemo(() => countBy(inScopeFindings, (f) => f.status), [inScopeFindings]);+ const { data: dataSources = [] } = useListSecretScanningDataSources(currentProject.id, {+ enabled: !isScoped+ });- const filteredFindings = useMemo(() => {- const direction = sort.direction === "ascending" ? 1 : -1;- return inScopeFindings- .filter((f) => statusFilter === "all" || f.status === statusFilter)- .sort((a, b) => compareFindings(a, b, sort.column) * direction);- }, [inScopeFindings, statusFilter, sort]);+ const selectedDataSource = dataSource ?? dataSources.find((d) => d.id === dataSourceFilter);- useResetPageHelper({ totalCount: filteredFindings.length, offset, setPage });+ const reopenFinding = useUpdateMultipleSecretScanningFinding();- const pageFindings = filteredFindings.slice(offset, offset + perPage);- const pageIds = pageFindings.map((f) => f.id);- const selectedFindings = filteredFindings.filter((f) => selectedIds.includes(f.id));+ const findings = data?.findings ?? [];+ const totalCount = data?.totalCount ?? 0;+ const pageIds = findings.map((f) => f.id);+ const selectedFindings = findings.filter((f) => selectedIds.includes(f.id));const isPageSelected = pageIds.length > 0 && pageIds.every((id) => selectedIds.includes(id));- const openFinding = findings.find((f) => f.id === openFindingId);- const openIndex = openFindingId ? filteredFindings.findIndex((f) => f.id === openFindingId) : -1;+ const visibleOpenFinding = openFinding+ ? (findings.find((f) => f.id === openFinding.id) ?? openFinding)+ : undefined;+ const openIndex = openFinding ? pageIds.indexOf(openFinding.id) : -1;- const resourceLabel = dataSource- ? RESOURCE_DESCRIPTION_HELPER[dataSource.type].singularTitle+ const resourceLabel = selectedDataSource+ ? RESOURCE_DESCRIPTION_HELPER[selectedDataSource.type].singularTitle: "Resource";- const selectedResourceName = resourceOptions.find((r) => r.id === resourceFilter)?.name;- const selectedDataSourceName = dataSourceOptions.find((d) => d.id === dataSourceFilter)?.name;+ const isFiltered =+ statusFilter !== "all" || Boolean(resourceFilter) || (!isScoped && Boolean(dataSourceFilter));const resetSelection = () => setSelectedIds([]);- const handleSortChange = (column: FindingsOrderBy, direction: TableSortDirection) => {- setSort(direction === "none" ? DEFAULT_SORT : { column, direction });+ const applyFilterChange = (change: () => void) => {+ change();+ setPage(1);+ resetSelection();};- const getSortDirection = (column: FindingsOrderBy): TableSortDirection =>- sort.column === column ? sort.direction : "none";+ const handleSortChange = (orderBy: SecretScanningFindingOrderBy, direction: TableSortDirection) =>+ applyFilterChange(() =>+ setSort(+ direction === "none"+ ? DEFAULT_SORT+ : {+ orderBy,+ orderDirection:+ direction === "ascending" ? OrderByDirection.ASC : OrderByDirection.DESC+ }+ )+ );++ const getSortDirection = (orderBy: SecretScanningFindingOrderBy): TableSortDirection => {+ if (sort.orderBy !== orderBy) return "none";+ return sort.orderDirection === OrderByDirection.ASC ? "ascending" : "descending";+ };- const getSortIconClassName = (column: FindingsOrderBy) =>- twMerge(- "transition-transform",- getSortDirection(column) === "descending" && "rotate-180",- getSortDirection(column) === "none" && "opacity-30"+ const renderSortableHead = (+ orderBy: SecretScanningFindingOrderBy,+ label: string,+ className?: string+ ) => {+ const direction = getSortDirection(orderBy);+ return (+ <TableHead+ className={className}+ sortDirection={direction}+ onSortChange={(next) => handleSortChange(orderBy, next)}+ >+ {label}+ <ChevronDownIcon+ className={twMerge(+ "transition-transform",+ direction === "descending" && "rotate-180",+ direction === "none" && "opacity-30"+ )}+ />+ </TableHead>);+ };const handleChangeStatus = (targetFindings: TSecretScanningFinding[],status: SecretScanningFindingStatus) => {if (status !== SecretScanningFindingStatus.Unresolved) {- setStatusChange({ findingIds: targetFindings.map((f) => f.id), status });+ setStatusChange({ findings: targetFindings, status });return;}reopenFinding.mutate(targetFindings.map((f) => ({ findingId: f.id, projectId: f.projectId, status })),{- onSuccess: () =>+ onSuccess: () => {+ setOpenFinding((prev) =>+ prev && targetFindings.some((f) => f.id === prev.id) ? { ...prev, status } : prev+ );+ resetSelection();createNotification({type: "success",text:targetFindings.length === 1? "Finding reopened": `${targetFindings.length} findings reopened`- })+ });+ }});};- const renderSortableHead = (column: FindingsOrderBy, label: string, className?: string) => (- <TableHead- className={className}- sortDirection={getSortDirection(column)}- onSortChange={(direction) => handleSortChange(column, direction)}- >- {label}- <ChevronDownIcon className={getSortIconClassName(column)} />- </TableHead>- );-const renderEmpty = () => {- if (!scopedFindings.length) {+ if (!isFiltered) {return (<Empty className="border"><EmptyHeader>@@ -294,7 +288,7 @@ export const SecretScanningFindingsTable = ({statusFilter === "all"? "": `${SECRET_SCANNING_FINDING_STATUS_MAP[statusFilter].name.toLowerCase()} `;- const scopeName = selectedResourceName ?? selectedDataSourceName;+ const scopeName = !resourceFilter && !isScoped ? selectedDataSource?.name : undefined;return (<Empty className="border">@@ -308,7 +302,11 @@ export const SecretScanningFindingsTable = ({</EmptyHeader>{statusFilter !== "all" && (<EmptyContent>- <Button variant="outline" size="xs" onClick={() => setStatusFilter("all")}>+ <Button+ variant="outline"+ size="xs"+ onClick={() => applyFilterChange(() => setStatusFilter("all"))}+ >Show All Statuses</Button></EmptyContent>@@ -317,7 +315,7 @@ export const SecretScanningFindingsTable = ({);};- const showEmpty = !isPending && filteredFindings.length === 0;+ const showEmpty = !isPending && totalCount === 0;return (<>@@ -335,13 +333,12 @@ export const SecretScanningFindingsTable = ({<ChevronDownIcon /></Button></DropdownMenuTrigger>- <DropdownMenuContent align="end" className="min-w-56">+ <DropdownMenuContent align="end" className="min-w-48"><DropdownMenuRadioGroupvalue={statusFilter}- onValueChange={(value) => {- setStatusFilter(value as FindingsStatusFilter);- resetSelection();- }}+ onValueChange={(value) =>+ applyFilterChange(() => setStatusFilter(value as FindingsStatusFilter))+ }>{SECRET_SCANNING_FINDING_STATUS_ORDER.map((status) => {const { Icon, className, name } = SECRET_SCANNING_FINDING_STATUS_MAP[status];@@ -349,15 +346,11 @@ export const SecretScanningFindingsTable = ({<DropdownMenuRadioItem key={status} value={status}><Icon className={className} />{name}- <DropdownMenuShortcut>{statusCounts[status] ?? 0}</DropdownMenuShortcut></DropdownMenuRadioItem>);})}<DropdownMenuSeparator />- <DropdownMenuRadioItem value="all">- All- <DropdownMenuShortcut>{inScopeFindings.length}</DropdownMenuShortcut>- </DropdownMenuRadioItem>+ <DropdownMenuRadioItem value={ALL_OPTION}>All</DropdownMenuRadioItem></DropdownMenuRadioGroup></DropdownMenuContent></DropdownMenu>@@ -365,7 +358,7 @@ export const SecretScanningFindingsTable = ({<DropdownMenu><DropdownMenuTrigger asChild><Button variant="outline">- Data Source: {selectedDataSourceName ?? "All"}+ Data Source: {selectedDataSource?.name ?? "All"}<ChevronDownIcon /></Button></DropdownMenuTrigger>@@ -375,18 +368,16 @@ export const SecretScanningFindingsTable = ({><DropdownMenuRadioGroupvalue={dataSourceFilter ?? ALL_OPTION}- onValueChange={(value) => {- setDataSourceFilter(value === ALL_OPTION ? null : value);- setResourceFilter(null);- resetSelection();- }}+ onValueChange={(value) =>+ applyFilterChange(() => {+ setDataSourceFilter(value === ALL_OPTION ? null : value);+ setResourceFilter(null);+ })+ }>- <DropdownMenuRadioItem value={ALL_OPTION}>- All Data Sources- <DropdownMenuShortcut>{scopedFindings.length}</DropdownMenuShortcut>- </DropdownMenuRadioItem>+ <DropdownMenuRadioItem value={ALL_OPTION}>All Data Sources</DropdownMenuRadioItem><DropdownMenuSeparator />- {dataSourceOptions.map((option) => (+ {dataSources.map((option) => (<DropdownMenuRadioItem key={option.id} value={option.id}><ProviderIconalt={`${SECRET_SCANNING_DATA_SOURCE_MAP[option.type].name} data source`}@@ -394,48 +385,19 @@ export const SecretScanningFindingsTable = ({className="size-4"/><span className="truncate">{option.name}</span>- <DropdownMenuShortcut>{option.count}</DropdownMenuShortcut></DropdownMenuRadioItem>))}</DropdownMenuRadioGroup></DropdownMenuContent></DropdownMenu>)}- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="outline">- {resourceLabel}: {selectedResourceName ?? "All"}- <ChevronDownIcon />- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent- align="end"- className="max-h-80 thin-scrollbar min-w-64 overflow-y-auto"- >- <DropdownMenuRadioGroup- value={resourceFilter ?? ALL_OPTION}- onValueChange={(value) => {- setResourceFilter(value === ALL_OPTION ? null : value);- resetSelection();- }}- >- <DropdownMenuRadioItem value={ALL_OPTION}>- All{" "}- {dataSource- ? RESOURCE_DESCRIPTION_HELPER[dataSource.type].pluralTitle- : "Resources"}- <DropdownMenuShortcut>{sourceFilteredFindings.length}</DropdownMenuShortcut>- </DropdownMenuRadioItem>- <DropdownMenuSeparator />- {resourceOptions.map((option) => (- <DropdownMenuRadioItem key={option.id} value={option.id}>- <span className="truncate font-mono">{option.name}</span>- <DropdownMenuShortcut>{option.count}</DropdownMenuShortcut>- </DropdownMenuRadioItem>- ))}- </DropdownMenuRadioGroup>- </DropdownMenuContent>- </DropdownMenu>+ {selectedDataSource && (+ <ResourceFilter+ dataSource={selectedDataSource}+ value={resourceFilter}+ onChange={(value) => applyFilterChange(() => setResourceFilter(value))}+ />+ )}</CardContent>{showEmpty ? (@@ -449,20 +411,14 @@ export const SecretScanningFindingsTable = ({aria-label="Select all findings on this page"isChecked={isPageSelected}isDisabled={isPending || !pageIds.length}- onCheckedChange={() =>- setSelectedIds((prev) =>- isPageSelected- ? prev.filter((id) => !pageIds.includes(id))- : [...new Set([...prev, ...pageIds])]- )- }+ onCheckedChange={() => setSelectedIds(isPageSelected ? [] : pageIds)}/></TableHead>- {renderSortableHead(FindingsOrderBy.Rule, "Rule")}- {renderSortableHead(FindingsOrderBy.Resource, resourceLabel)}- {renderSortableHead(FindingsOrderBy.Author, "Author")}- {renderSortableHead(FindingsOrderBy.Detected, "Detected", "w-36")}- {renderSortableHead(FindingsOrderBy.Status, "Status", "w-36")}+ {renderSortableHead(SecretScanningFindingOrderBy.Rule, "Rule")}+ {renderSortableHead(SecretScanningFindingOrderBy.ResourceName, resourceLabel)}+ {renderSortableHead(SecretScanningFindingOrderBy.Author, "Author")}+ {renderSortableHead(SecretScanningFindingOrderBy.CreatedAt, "Detected", "w-36")}+ {renderSortableHead(SecretScanningFindingOrderBy.Status, "Status", "w-36")}</TableRow></TableHeader><TableBody>@@ -480,7 +436,7 @@ export const SecretScanningFindingsTable = ({</TableRow>))}{!isPending &&- pageFindings.map((finding) => {+ findings.map((finding) => {const isSelected = selectedIds.includes(finding.id);const source = SECRET_SCANNING_DATA_SOURCE_MAP[finding.dataSourceType];@@ -488,7 +444,7 @@ export const SecretScanningFindingsTable = ({<TableRowkey={finding.id}data-state={isSelected ? "selected" : undefined}- onClick={() => setOpenFindingId(finding.id)}+ onClick={() => setOpenFinding(finding)}><TableCell onClick={(e) => e.stopPropagation()}><Checkbox@@ -538,17 +494,17 @@ export const SecretScanningFindingsTable = ({</Table>)}- {!isPending && filteredFindings.length > 0 && (+ {!isPending && totalCount > 0 && (<CardContent className="-mt-5 pt-0"><Pagination- count={filteredFindings.length}+ count={totalCount}page={page}perPage={perPage}- onChangePage={setPage}- onChangePerPage={(newPerPage) => {- setPerPage(newPerPage);- setPage(1);+ onChangePage={(newPage) => {+ setPage(newPage);+ resetSelection();}}+ onChangePerPage={(newPerPage) => applyFilterChange(() => setPerPage(newPerPage))}/></CardContent>)}@@ -591,25 +547,34 @@ export const SecretScanningFindingsTable = ({</SelectedActionBar><FindingDetailSheet- finding={openFinding}- position={openIndex >= 0 ? { index: openIndex, total: filteredFindings.length } : null}- onClose={() => setOpenFindingId(null)}+ finding={visibleOpenFinding}+ position={openIndex >= 0 ? { index: openIndex, total: findings.length } : null}+ onClose={() => setOpenFinding(null)}onPrevious={() => {- if (openIndex > 0) setOpenFindingId(filteredFindings[openIndex - 1].id);+ if (openIndex > 0) setOpenFinding(findings[openIndex - 1]);}}onNext={() => {- if (openIndex >= 0 && openIndex < filteredFindings.length - 1)- setOpenFindingId(filteredFindings[openIndex + 1].id);+ if (openIndex >= 0 && openIndex < findings.length - 1)+ setOpenFinding(findings[openIndex + 1]);}}- onChangeStatus={(status) => openFinding && handleChangeStatus([openFinding], status)}+ onChangeStatus={(status) =>+ visibleOpenFinding && handleChangeStatus([visibleOpenFinding], status)+ }isReopening={reopenFinding.isPending}/><FindingStatusDialog- findings={findings.filter((f) => statusChange?.findingIds.includes(f.id))}+ findings={statusChange?.findings ?? []}status={statusChange?.status ?? null}onOpenChange={(isOpen) => !isOpen && setStatusChange(null)}- onComplete={resetSelection}+ onComplete={({ status, comment }) => {+ setOpenFinding((prev) =>+ prev && statusChange?.findings.some((f) => f.id === prev.id)+ ? { ...prev, status, triageComment: comment || prev.triageComment }+ : prev+ );+ resetSelection();+ }}/></>);diff --git a/frontend/src/pages/secret-scanning/components/findings/index.ts b/frontend/src/pages/secret-scanning/components/findings/index.tsindex c5bd4a418d..84a9a3bea3 100644--- a/frontend/src/pages/secret-scanning/components/findings/index.ts+++ b/frontend/src/pages/secret-scanning/components/findings/index.ts@@ -1,2 +1,2 @@-export { SecretScanningFindingsSection } from "./SecretScanningFindingsSection";export type { FindingsStatusFilter } from "./SecretScanningFindingsTable";+export { SecretScanningFindingsTable } from "./SecretScanningFindingsTable";