Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

greptile comments

Matheus Nogueira3b2ce93bdccd
diff --git a/frontend/src/hooks/api/secretScanningV2/queries.tsx b/frontend/src/hooks/api/secretScanningV2/queries.tsx
index c9a425e27d..6e2d537210 100644
--- a/frontend/src/hooks/api/secretScanningV2/queries.tsx
+++ b/frontend/src/hooks/api/secretScanningV2/queries.tsx
@@ -6,6 +6,8 @@ import {
TGetSecretScanningConfigResponse,
TGetSecretScanningDataSource,
TGetSecretScanningUnresolvedFindingsResponse,
+ TListSecretScanningBasicDataSources,
+ TListSecretScanningBasicResourcesResponse,
TListSecretScanningDataSourceOptions,
TListSecretScanningDataSources,
TListSecretScanningFindingsDTO,
@@ -17,6 +19,7 @@ import {
TSecretScanningDataSourceOption,
TSecretScanningDataSourceResponse,
TSecretScanningDataSourceWithDetails,
+ TSecretScanningResource,
TSecretScanningResourceWithDetails,
TSecretScanningScanWithDetails
} from "./types";
@@ -37,6 +40,16 @@ export const secretScanningV2Keys = {
dataSourceId
],
listDataSources: (projectId: string) => [...secretScanningV2Keys.dataSource(), "list", projectId],
+ listBasicDataSources: (projectId: string) => [
+ ...secretScanningV2Keys.dataSource(),
+ "list-basic",
+ projectId
+ ],
+ listBasicResources: (dataSourceId: string) => [
+ ...secretScanningV2Keys.dataSource(),
+ "resources-basic",
+ dataSourceId
+ ],
listResources: (dataSourceId: string) => [
...secretScanningV2Keys.dataSource(),
"resources",
@@ -149,6 +162,58 @@ export const useListSecretScanningDataSources = (
});
};
+// Unlike the dashboard lists, these include sources and resources whose findings are all closed.
+export const useListSecretScanningBasicDataSources = (
+ projectId: string,
+ options?: Omit<
+ UseQueryOptions<
+ TSecretScanningDataSource[],
+ unknown,
+ TSecretScanningDataSource[],
+ ReturnType<typeof secretScanningV2Keys.listBasicDataSources>
+ >,
+ "queryKey" | "queryFn"
+ >
+) => {
+ return useQuery({
+ queryKey: secretScanningV2Keys.listBasicDataSources(projectId),
+ queryFn: async () => {
+ const { data } = await apiRequest.get<TListSecretScanningBasicDataSources>(
+ "/api/v2/secret-scanning/data-sources",
+ { params: { projectId } }
+ );
+
+ return data.dataSources;
+ },
+ ...options
+ });
+};
+
+export const useListSecretScanningBasicResources = (
+ { dataSourceId, type }: TGetSecretScanningDataSource,
+ options?: Omit<
+ UseQueryOptions<
+ TSecretScanningResource[],
+ unknown,
+ TSecretScanningResource[],
+ ReturnType<typeof secretScanningV2Keys.listBasicResources>
+ >,
+ "queryKey" | "queryFn"
+ >
+) => {
+ return useQuery({
+ queryKey: secretScanningV2Keys.listBasicResources(dataSourceId),
+ queryFn: async () => {
+ const { data } = await apiRequest.get<TListSecretScanningBasicResourcesResponse>(
+ `/api/v2/secret-scanning/data-sources/${type}/${dataSourceId}/resources`
+ );
+
+ return data.resources;
+ },
+ ...options
+ });
+};
+
export const useGetSecretScanningDataSource = (
{ dataSourceId, type }: TGetSecretScanningDataSource,
options?: Omit<
diff --git a/frontend/src/hooks/api/secretScanningV2/types/index.ts b/frontend/src/hooks/api/secretScanningV2/types/index.ts
index dbaa3d9d6a..343cc50ee4 100644
--- a/frontend/src/hooks/api/secretScanningV2/types/index.ts
+++ b/frontend/src/hooks/api/secretScanningV2/types/index.ts
@@ -33,6 +33,10 @@ export type TListSecretScanningDataSources = {
dataSources: TSecretScanningDataSourceWithDetails[];
};
+export type TListSecretScanningBasicDataSources = {
+ dataSources: TSecretScanningDataSource[];
+};
+
export type TSecretScanningDataSourceOption =
| TGitHubDataSourceOption
| TBitbucketDataSourceOption
@@ -107,6 +111,15 @@ export type TListSecretScanningResourcesResponse = {
resources: TSecretScanningResourceWithDetails[];
};
+export type TSecretScanningResource = Pick<
+ TSecretScanningResourceWithDetails,
+ "id" | "dataSourceId" | "externalId" | "name" | "createdAt" | "updatedAt"
+>;
+
+export type TListSecretScanningBasicResourcesResponse = {
+ resources: TSecretScanningResource[];
+};
+
export type TSecretScanningScanWithDetails = {
id: string;
createdAt: string;
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx
index 1795577f2b..35ec84a14c 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx
@@ -100,6 +100,7 @@ const PageContent = () => {
a={ProjectPermissionSub.SecretScanningFindings}
>
<SecretScanningFindingsTable
+ key={dataSource.id}
dataSource={dataSource}
description="Secrets detected in this data source."
/>
diff --git a/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsx b/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsx
index 5fbdef1e61..e7972d3740 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/SecretScanningFindingsPage.tsx
@@ -36,6 +36,8 @@ export const SecretScanningFindingsPage = () => {
description="Secrets detected across every data source."
/>
<SecretScanningFindingsTable
+ // filters are only read from the URL on mount, so a navigation that changes them needs a fresh table
+ key={`${status ?? ""}:${dataSourceId ?? ""}:${resourceId ?? ""}`}
description="Review and triage leaked secrets."
initialStatus={status}
initialDataSourceId={dataSourceId}
diff --git a/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx b/frontend/src/pages/secret-scanning/components/findings/SecretScanningFindingsTable.tsx
index f40697acc8..c66282a969 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 { useState } from "react";
+import { useEffect, useState } from "react";
import { formatDistanceToNowStrict } from "date-fns";
import { ChevronDownIcon, FilterIcon, ShieldCheckIcon } from "lucide-react";
import { twMerge } from "tailwind-merge";
@@ -56,9 +56,9 @@ import {
SecretScanningFindingStatus,
TSecretScanningDataSource,
TSecretScanningFinding,
- useListSecretScanningDataSources,
+ useListSecretScanningBasicDataSources,
+ useListSecretScanningBasicResources,
useListSecretScanningFindings,
- useListSecretScanningResources,
useUpdateMultipleSecretScanningFinding
} from "@app/hooks/api/secretScanningV2";
@@ -84,7 +84,7 @@ type ResourceFilterProps = {
};
const ResourceFilter = ({ dataSource, value, onChange }: ResourceFilterProps) => {
- const { data: resources = [] } = useListSecretScanningResources({
+ const { data: resources = [] } = useListSecretScanningBasicResources({
dataSourceId: dataSource.id,
type: dataSource.type
});
@@ -152,7 +152,7 @@ export const SecretScanningFindingsTable = ({
status: SecretScanningFindingStatus;
} | null>(null);
- const { data, isPending } = useListSecretScanningFindings(
+ const { data, isPending, isPlaceholderData } = useListSecretScanningFindings(
{
projectId: currentProject.id,
status: statusFilter === "all" ? undefined : statusFilter,
@@ -165,7 +165,14 @@ export const SecretScanningFindingsTable = ({
{ refetchInterval: 30000 }
);
- const { data: dataSources = [] } = useListSecretScanningDataSources(currentProject.id, {
+ // closing the last findings on a page shrinks the total, which can leave the current page empty
+ useEffect(() => {
+ if (!data || isPlaceholderData) return;
+ const lastPage = Math.max(1, Math.ceil(data.totalCount / perPage));
+ if (page > lastPage) setPage(lastPage);
+ }, [data, isPlaceholderData, page, perPage]);
+
+ const { data: dataSources = [] } = useListSecretScanningBasicDataSources(currentProject.id, {
enabled: !isScoped
});
@@ -426,7 +433,7 @@ export const SecretScanningFindingsTable = ({
<Checkbox
aria-label="Select all findings on this page"
isChecked={isPageSelected}
- isDisabled={isPending || !pageIds.length}
+ isDisabled={isPending || isPlaceholderData || !pageIds.length}
onCheckedChange={() => setSelectedIds(isPageSelected ? [] : pageIds)}
/>
</TableHead>
@@ -460,12 +467,13 @@ export const SecretScanningFindingsTable = ({
<TableRow
key={finding.id}
data-state={isSelected ? "selected" : undefined}
- onClick={() => setOpenFinding(finding)}
+ onClick={isPlaceholderData ? undefined : () => setOpenFinding(finding)}
>
<TableCell onClick={(e) => e.stopPropagation()}>
<Checkbox
aria-label={`Select finding ${finding.rule}`}
isChecked={isSelected}
+ isDisabled={isPlaceholderData}
onCheckedChange={() =>
setSelectedIds((prev) =>
isSelected
@@ -535,7 +543,7 @@ export const SecretScanningFindingsTable = ({
{(isAllowed) => (
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Button variant="project" size="xs" isDisabled={!isAllowed}>
+ <Button variant="project" size="xs" isDisabled={!isAllowed || isPlaceholderData}>
Set Status
<ChevronDownIcon />
</Button>