Skip to content

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

feat: revamp data source listing

Matheus Nogueira64d3e6f377ef
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.ts
index dd5af6dbee..0d8c0cda3f 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
@@ -463,7 +463,8 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider)
lastScannedAt: z.date().nullish(),
lastScanStatus: z.nativeEnum(SecretScanningScanStatus).nullish(),
lastScanStatusMessage: z.string().nullish(),
- unresolvedFindings: z.number().nullish()
+ unresolvedFindings: z.number().nullish(),
+ resourceCount: z.number()
})
)
.array()
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.ts
index dcb68fc3ce..1e60c6b474 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
@@ -304,6 +304,20 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {
]
});
+ // counted separately because the join above drops resources whose findings are all resolved
+ const resourceCounts = await (tx || db.replicaNode())(TableName.SecretScanningResource)
+ .whereIn(
+ "dataSourceId",
+ results.map(({ id }) => id)
+ )
+ .groupBy("dataSourceId")
+ .select("dataSourceId")
+ .count({ count: "*" });
+
+ const resourceCountByDataSourceId = new Map(
+ resourceCounts.map(({ dataSourceId, count }) => [dataSourceId, Number(count)])
+ );
+
return results.map(({ scans, findings, ...dataSource }) => {
const lastScan =
scans && scans.length
@@ -317,7 +331,8 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {
lastScanStatus: lastScan?.status ?? null,
lastScanStatusMessage: lastScan?.statusMessage ?? null,
lastScannedAt: lastScan?.createdAt ?? null,
- unresolvedFindings: scans.length ? findings.length : null
+ unresolvedFindings: scans.length ? findings.length : null,
+ resourceCount: resourceCountByDataSourceId.get(dataSource.id) ?? 0
};
});
} catch (error) {
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts
index cdabfdfb22..681e09b41d 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-types.ts
@@ -46,6 +46,7 @@ export type TSecretScanningDataSourceWithDetails = TSecretScanningDataSource & {
lastScanStatus?: SecretScanningScanStatus | null;
lastScanStatusMessage?: string | null;
unresolvedFindings: number;
+ resourceCount: number;
};
export type TSecretScanningResourceWithDetails = TSecretScanningResources & {
diff --git a/frontend/src/hooks/api/secretScanningV2/types/index.ts b/frontend/src/hooks/api/secretScanningV2/types/index.ts
index 343cc50ee4..c0c05cf27e 100644
--- a/frontend/src/hooks/api/secretScanningV2/types/index.ts
+++ b/frontend/src/hooks/api/secretScanningV2/types/index.ts
@@ -27,6 +27,7 @@ export type TSecretScanningDataSourceWithDetails = TSecretScanningDataSource & {
lastScanStatus: SecretScanningScanStatus | null;
lastScanStatusMessage: string | null;
unresolvedFindings: number | null;
+ resourceCount: number;
};
export type TListSecretScanningDataSources = {
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/SecretScanningDataSourcesPage.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/SecretScanningDataSourcesPage.tsx
index 623590e138..fa60b654b6 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/SecretScanningDataSourcesPage.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/SecretScanningDataSourcesPage.tsx
@@ -29,7 +29,7 @@ export const SecretScanningDataSourcesPage = () => {
<PageHeader
scope={ProjectType.SecretScanning}
title="Data Sources"
- description="Manage your Secret Scanning data sources."
+ description="Connected systems Secret Scanning reads from."
/>
<SecretScanningDataSourcesSection />
</div>
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourceRow.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourceRow.tsx
index 2181bbb380..74238efc0e 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourceRow.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourceRow.tsx
@@ -1,66 +1,35 @@
-import { useCallback } from "react";
-import {
- faCheck,
- faCopy,
- faEdit,
- faEllipsisV,
- faExpand,
- faInfoCircle,
- faPlugCircleXmark,
- faToggleOff,
- faToggleOn,
- faTrash
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useNavigate } from "@tanstack/react-router";
-import { formatDistance } from "date-fns";
-import { AlertTriangleIcon, BanIcon, ScanTextIcon } from "lucide-react";
-import { twMerge } from "tailwind-merge";
+import { formatDistanceToNowStrict } from "date-fns";
+import { CircleCheckIcon, PauseIcon, UnplugIcon } from "lucide-react";
-import { createNotification } from "@app/components/notifications";
-import { ProjectPermissionCan } from "@app/components/permissions";
import { SecretScanningScanStatusBadge } from "@app/components/secret-scanning";
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
- IconButton,
- Td,
+ Badge,
+ ProviderIcon,
+ TableCell,
+ TableRow,
Tooltip,
- Tr
-} from "@app/components/v2";
-import { Badge, ProviderIcon } from "@app/components/v3";
+ TooltipContent,
+ TooltipTrigger
+} from "@app/components/v3";
import { ROUTE_PATHS } from "@app/const/routes";
-import { ProjectPermissionSub, useOrganization } from "@app/context";
-import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import { useOrganization } from "@app/context";
import {
RESOURCE_DESCRIPTION_HELPER,
SECRET_SCANNING_DATA_SOURCE_MAP
} from "@app/helpers/secretScanningV2";
-import { useToggle } from "@app/hooks";
import {
- SecretScanningFindingStatus,
SecretScanningScanStatus,
TSecretScanningDataSourceWithDetails
} from "@app/hooks/api/secretScanningV2";
type Props = {
dataSource: TSecretScanningDataSourceWithDetails;
- onDelete: (dataSource: TSecretScanningDataSourceWithDetails) => void;
- onTriggerScan: (dataSource: TSecretScanningDataSourceWithDetails) => void;
- onToggleEnableAutoScan: (dataSource: TSecretScanningDataSourceWithDetails) => void;
- onEdit: (dataSource: TSecretScanningDataSourceWithDetails) => void;
};
-export const SecretScanningDataSourceRow = ({
- dataSource,
- onDelete,
- onEdit,
- onTriggerScan,
- onToggleEnableAutoScan
-}: Props) => {
+export const SecretScanningDataSourceRow = ({ dataSource }: Props) => {
const navigate = useNavigate();
+ const { currentOrg } = useOrganization();
const {
id,
name,
@@ -68,266 +37,106 @@ export const SecretScanningDataSourceRow = ({
isAutoScanEnabled,
type,
unresolvedFindings,
+ resourceCount,
lastScannedAt,
lastScanStatus,
lastScanStatusMessage,
isDisconnected
} = dataSource;
- const { currentOrg } = useOrganization();
const sourceDetails = SECRET_SCANNING_DATA_SOURCE_MAP[type];
+ const resourceDescription = RESOURCE_DESCRIPTION_HELPER[type];
- const [isIdCopied, setIsIdCopied] = useToggle(false);
+ const renderLastScan = () => {
+ if (lastScanStatus && lastScanStatus !== SecretScanningScanStatus.Completed) {
+ return (
+ <SecretScanningScanStatusBadge
+ status={lastScanStatus}
+ statusMessage={lastScanStatusMessage}
+ scannedAt={lastScannedAt}
+ />
+ );
+ }
- const handleCopyId = useCallback(() => {
- setIsIdCopied.on();
- navigator.clipboard.writeText(id);
+ if (!lastScannedAt) return <span className="text-muted">Never</span>;
- createNotification({
- text: "Data Source ID copied to clipboard",
- type: "info"
- });
+ return formatDistanceToNowStrict(new Date(lastScannedAt), { addSuffix: true });
+ };
- const timer = setTimeout(() => setIsIdCopied.off(), 2000);
+ const renderStatus = () => {
+ if (isDisconnected) {
+ return (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge variant="danger">
+ <UnplugIcon />
+ Disconnected
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent className="max-w-sm">
+ The external data source has been removed and can no longer be scanned. Delete this
+ data source and reconnect it.
+ </TooltipContent>
+ </Tooltip>
+ );
+ }
- // eslint-disable-next-line consistent-return
- return () => clearTimeout(timer);
- }, [isIdCopied]);
+ if (!isAutoScanEnabled) {
+ return (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge variant="neutral">
+ <PauseIcon />
+ Paused
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent className="max-w-sm">
+ Auto-scan is disabled. Scans are not triggered when a {resourceDescription.verb} occurs
+ to {resourceDescription.pluralNoun} in this data source.
+ </TooltipContent>
+ </Tooltip>
+ );
+ }
- const autoScanDescription = RESOURCE_DESCRIPTION_HELPER[type];
+ return (
+ <Badge variant="success">
+ <CircleCheckIcon />
+ Active
+ </Badge>
+ );
+ };
return (
- <Tr
+ <TableRow
onClick={() =>
navigate({
to: ROUTE_PATHS.SecretScanning.DataSourceByIdPage.path,
- params: {
- orgId: currentOrg.id,
- dataSourceId: id,
- type
- }
+ params: { orgId: currentOrg.id, dataSourceId: id, type }
})
}
- className={twMerge(
- "group h-10 cursor-pointer transition-colors duration-100 hover:bg-surface-hover",
- lastScanStatus === SecretScanningScanStatus.Failed && "bg-danger/5 hover:bg-danger/10"
- )}
- key={`data-source-${id}`}
>
- <Td className="max-w-0 min-w-32!">
- <div className="flex w-full items-center">
+ <TableCell>
+ <div className="flex items-center gap-1.5">
<ProviderIcon
- alt={`${sourceDetails.name} Data Source`}
+ alt={`${sourceDetails.name} data source`}
icon={sourceDetails.image}
- className="w-5"
+ className="size-4"
/>
- <p className="ml-2 truncate">{sourceDetails.name}</p>
- </div>
- </Td>
- <Td className="max-w-0 min-w-32!">
- <div className="flex w-full items-center">
- <p className="truncate">{name}</p>
- {description && (
- <Tooltip content={description}>
- <FontAwesomeIcon icon={faInfoCircle} size="xs" className="ml-1 text-muted" />
- </Tooltip>
- )}
- </div>
- </Td>
- <Td>
- {/* eslint-disable-next-line no-nested-ternary */}
- {lastScanStatus?.match(/queued|scanning/) ? (
- <Badge variant="neutral">
- <ScanTextIcon />
- Scanning For Leaks
- </Badge>
- ) : // eslint-disable-next-line no-nested-ternary
- lastScannedAt ? (
- // eslint-disable-next-line no-nested-ternary
- unresolvedFindings ? (
- <Badge variant="warning" asChild>
- <button
- type="button"
- onClick={(e) => {
- e.stopPropagation();
- navigate({
- to: "/organizations/$orgId/secret-scanning/findings",
- params: {
- orgId: currentOrg.id
- },
- search: {
- dataSourceId: id,
- status: SecretScanningFindingStatus.Unresolved
- }
- });
- }}
- >
- <AlertTriangleIcon />
- {unresolvedFindings} Secret{unresolvedFindings > 1 ? "s" : ""} Detected
- </button>
- </Badge>
- ) : lastScanStatus === SecretScanningScanStatus.Failed ? (
- <span className="text-muted">No findings</span>
- ) : (
- <Badge variant="success">
- <FontAwesomeIcon icon={faCheck} />
- No Secrets Detected
- </Badge>
- )
- ) : (
- <span className="text-muted">No findings</span>
- )}
- </Td>
- <Td>
- <div className="flex w-full items-center gap-1">
- {/* eslint-disable-next-line no-nested-ternary */}
- {lastScanStatus?.match(/queued|scanning|failed/) ? (
- <SecretScanningScanStatusBadge
- status={lastScanStatus}
- statusMessage={lastScanStatusMessage}
- scannedAt={lastScannedAt}
- />
- ) : lastScannedAt ? (
- <span>{formatDistance(new Date(lastScannedAt), new Date(), { addSuffix: true })}</span>
- ) : (
- <span className="text-muted">No scans</span>
- )}
- {!isAutoScanEnabled && !isDisconnected && (
- <Tooltip
- className="text-xs"
- content={`Auto-Scan is disabled. Scans will not be automatically triggered when a ${autoScanDescription.verb} occurs to ${autoScanDescription.pluralNoun} associated with this data source`}
- >
- <Badge className="ml-auto" variant="neutral">
- <BanIcon />
- Auto-Scan Disabled
- </Badge>
- </Tooltip>
- )}
- {isDisconnected && (
- <Tooltip
- className="text-xs"
- content="The external data source has been removed and can no longer be scanned. Delete this data source and re-initialize the connection."
- >
- <div className="ml-auto">
- <Badge
- variant="danger"
- className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
- >
- <FontAwesomeIcon icon={faPlugCircleXmark} />
- <span>Disconnected</span>
- </Badge>
- </div>
- </Tooltip>
- )}
+ {sourceDetails.name}
</div>
- </Td>
- <Td>
- <Tooltip className="max-w-sm text-center" content="Options">
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <IconButton
- ariaLabel="Options"
- colorSchema="secondary"
- className="w-6"
- variant="plain"
- >
- <FontAwesomeIcon icon={faEllipsisV} />
- </IconButton>
- </DropdownMenuTrigger>
- <DropdownMenuContent sideOffset={2} align="end">
- <DropdownMenuItem
- icon={<FontAwesomeIcon icon={isIdCopied ? faCheck : faCopy} />}
- onClick={(e) => {
- e.stopPropagation();
- handleCopyId();
- }}
- >
- Copy Data Source ID
- </DropdownMenuItem>
- <ProjectPermissionCan
- I={ProjectPermissionSecretScanningDataSourceActions.TriggerScans}
- a={ProjectPermissionSub.SecretScanningDataSources}
- >
- {(isAllowed: boolean) => (
- <DropdownMenuItem
- icon={<FontAwesomeIcon icon={faExpand} />}
- onClick={(e) => {
- e.stopPropagation();
- onTriggerScan(dataSource);
- }}
- isDisabled={!isAllowed}
- >
- <Tooltip
- position="left"
- sideOffset={42}
- content={`Manually trigger a scan for this ${sourceDetails.name} data source.`}
- >
- <div className="flex h-full w-full items-center justify-between gap-1">
- <span>Trigger Scan</span>
- <FontAwesomeIcon
- className="text-label-secondary"
- size="sm"
- icon={faInfoCircle}
- />
- </div>
- </Tooltip>
- </DropdownMenuItem>
- )}
- </ProjectPermissionCan>
- <ProjectPermissionCan
- I={ProjectPermissionSecretScanningDataSourceActions.Edit}
- a={ProjectPermissionSub.SecretScanningDataSources}
- >
- {(isAllowed: boolean) => (
- <DropdownMenuItem
- isDisabled={!isAllowed}
- icon={<FontAwesomeIcon icon={isAutoScanEnabled ? faToggleOff : faToggleOn} />}
- onClick={(e) => {
- e.stopPropagation();
- onToggleEnableAutoScan(dataSource);
- }}
- >
- {isAutoScanEnabled ? "Disable" : "Enable"} Auto-Scan
- </DropdownMenuItem>
- )}
- </ProjectPermissionCan>
- <ProjectPermissionCan
- I={ProjectPermissionSecretScanningDataSourceActions.Edit}
- a={ProjectPermissionSub.SecretScanningDataSources}
- >
- {(isAllowed: boolean) => (
- <DropdownMenuItem
- isDisabled={!isAllowed}
- icon={<FontAwesomeIcon icon={faEdit} />}
- onClick={(e) => {
- e.stopPropagation();
- onEdit(dataSource);
- }}
- >
- Edit Data Source
- </DropdownMenuItem>
- )}
- </ProjectPermissionCan>
- <ProjectPermissionCan
- I={ProjectPermissionSecretScanningDataSourceActions.Delete}
- a={ProjectPermissionSub.SecretScanningDataSources}
- >
- {(isAllowed: boolean) => (
- <DropdownMenuItem
- isDisabled={!isAllowed}
- icon={<FontAwesomeIcon icon={faTrash} />}
- onClick={(e) => {
- e.stopPropagation();
- onDelete(dataSource);
- }}
- >
- Delete Data Source
- </DropdownMenuItem>
- )}
- </ProjectPermissionCan>
- </DropdownMenuContent>
- </DropdownMenu>
- </Tooltip>
- </Td>
- </Tr>
+ </TableCell>
+ <TableCell isTruncatable>
+ <p className="truncate">{name}</p>
+ {description && <p className="truncate text-xs text-muted">{description}</p>}
+ </TableCell>
+ <TableCell>
+ {resourceCount}{" "}
+ {resourceCount === 1 ? resourceDescription.singularTitle : resourceDescription.pluralTitle}
+ </TableCell>
+ <TableCell>
+ {lastScannedAt ? (unresolvedFindings ?? 0) : <span className="text-muted">-</span>}
+ </TableCell>
+ <TableCell>{renderLastScan()}</TableCell>
+ <TableCell>{renderStatus()}</TableCell>
+ </TableRow>
);
};
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx
index 8bb9df6d88..c808f9118c 100644
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx
@@ -1,17 +1,96 @@
-import { faPlus } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useMemo, useState } from "react";
+import { ChevronDownIcon, DatabaseIcon, FilterIcon, PlusIcon, SearchIcon } from "lucide-react";
+import { twMerge } from "tailwind-merge";
import { SecretScanningUpgradeIntent, UpgradeGate } from "@app/components/license/UpgradeGate";
import { ProjectPermissionCan } from "@app/components/permissions";
import { CreateSecretScanningDataSourceModal } from "@app/components/secret-scanning";
-import { Button, Spinner } from "@app/components/v2";
-import { DocumentationLinkBadge } from "@app/components/v3";
+import {
+ Button,
+ Card,
+ CardAction,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ DocumentationLinkBadge,
+ DropdownMenu,
+ DropdownMenuCheckboxItem,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuTrigger,
+ Empty,
+ EmptyDescription,
+ EmptyHeader,
+ EmptyMedia,
+ EmptyTitle,
+ IconButton,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
+ Pagination,
+ ProviderIcon,
+ Skeleton,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ type TableSortDirection
+} from "@app/components/v3";
import { ProjectPermissionSub, useProject, useSubscription } from "@app/context";
import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
-import { usePopUp } from "@app/hooks";
-import { useListSecretScanningDataSources } from "@app/hooks/api/secretScanningV2";
+import { SECRET_SCANNING_DATA_SOURCE_MAP } from "@app/helpers/secretScanningV2";
+import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
+import { OrderByDirection } from "@app/hooks/api/generic/types";
+import {
+ SecretScanningDataSource,
+ SecretScanningScanStatus,
+ TSecretScanningDataSourceWithDetails,
+ useListSecretScanningDataSources
+} from "@app/hooks/api/secretScanningV2";
-import { SecretScanningDataSourcesTable } from "./SecretScanningDataSourcesTable";
+import { SecretScanningDataSourceRow } from "./SecretScanningDataSourceRow";
+
+enum DataSourcesOrderBy {
+ Findings = "findings",
+ Name = "name",
+ LastScan = "last-scan"
+}
+
+const SKELETON_ROWS = ["first", "second", "third"];
+const SKELETON_CELLS = ["type", "name", "resources", "findings", "last-scan", "status"];
+
+const sortDataSources = (
+ a: TSecretScanningDataSourceWithDetails,
+ b: TSecretScanningDataSourceWithDetails,
+ orderBy: DataSourcesOrderBy
+) => {
+ switch (orderBy) {
+ case DataSourcesOrderBy.LastScan:
+ if (a.lastScannedAt === null && b.lastScannedAt === null) return 0;
+ if (a.lastScannedAt === null) return 1;
+ if (b.lastScannedAt === null) return -1;
+
+ return new Date(b.lastScannedAt).getTime() - new Date(a.lastScannedAt).getTime();
+ case DataSourcesOrderBy.Findings:
+ if (a.unresolvedFindings === null && b.unresolvedFindings === null) return 0;
+ if (a.unresolvedFindings === null) return 1;
+ if (b.unresolvedFindings === null) return -1;
+
+ if (a.unresolvedFindings === 0 && a.lastScanStatus === SecretScanningScanStatus.Failed)
+ return 1;
+ if (b.unresolvedFindings === 0 && b.lastScanStatus === SecretScanningScanStatus.Failed)
+ return -1;
+
+ return b.unresolvedFindings - a.unresolvedFindings;
+ case DataSourcesOrderBy.Name:
+ default:
+ return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+ }
+};
export const SecretScanningDataSourcesSection = () => {
const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
@@ -20,63 +99,258 @@ export const SecretScanningDataSourcesSection = () => {
] as const);
const { subscription } = useSubscription();
-
const { currentProject } = useProject();
- const { data: dataSources = [], isPending: isDataSourcesPending } =
- useListSecretScanningDataSources(currentProject.id, {
+ const { data: dataSources = [], isPending } = useListSecretScanningDataSources(
+ currentProject.id,
+ {
refetchInterval: 30000,
enabled: subscription.secretScanning
- });
+ }
+ );
+ const isLoading = subscription.secretScanning && isPending;
+
+ const [typeFilter, setTypeFilter] = useState<SecretScanningDataSource[]>([]);
+
+ const {
+ search,
+ setSearch,
+ setPage,
+ page,
+ perPage,
+ setPerPage,
+ offset,
+ orderDirection,
+ toggleOrderDirection,
+ orderBy,
+ setOrderDirection,
+ setOrderBy
+ } = usePagination<DataSourcesOrderBy>(DataSourcesOrderBy.Name, { initPerPage: 20 });
+
+ const filteredDataSources = useMemo(() => {
+ const searchValue = search.trim().toLowerCase();
+
+ return dataSources
+ .filter(({ type, name, connection }) => {
+ if (typeFilter.length && !typeFilter.includes(type)) return false;
- if (subscription.secretScanning && isDataSourcesPending)
+ return (
+ SECRET_SCANNING_DATA_SOURCE_MAP[type].name.toLowerCase().includes(searchValue) ||
+ name.toLowerCase().includes(searchValue) ||
+ Boolean(connection?.name.toLowerCase().includes(searchValue))
+ );
+ })
+ .sort((a, b) =>
+ orderDirection === OrderByDirection.ASC
+ ? sortDataSources(a, b, orderBy)
+ : sortDataSources(b, a, orderBy)
+ );
+ }, [dataSources, orderDirection, search, orderBy, typeFilter]);
+
+ useResetPageHelper({
+ totalCount: filteredDataSources.length,
+ offset,
+ setPage
+ });
+
+ const availableTypes = [...new Set(dataSources.map(({ type }) => type))];
+
+ const handleSortChange = (column: DataSourcesOrderBy) => {
+ if (column === orderBy) {
+ toggleOrderDirection();
+ return;
+ }
+
+ setOrderBy(column);
+ setOrderDirection(OrderByDirection.ASC);
+ };
+
+ const getSortDirection = (column: DataSourcesOrderBy): TableSortDirection => {
+ if (orderBy !== column) return "none";
+ return orderDirection === OrderByDirection.ASC ? "ascending" : "descending";
+ };
+
+ const renderSortableHead = (column: DataSourcesOrderBy, label: string, className?: string) => {
+ const direction = getSortDirection(column);
return (
- <div className="flex h-[60vh] flex-col items-center justify-center gap-2">
- <Spinner />
- </div>
+ <TableHead
+ className={className}
+ sortDirection={direction}
+ onSortChange={() => handleSortChange(column)}
+ >
+ {label}
+ <ChevronDownIcon
+ className={twMerge(
+ "transition-transform",
+ direction === "descending" && "rotate-180",
+ direction === "none" && "opacity-30"
+ )}
+ />
+ </TableHead>
);
+ };
+
+ const renderEmpty = () => {
+ if (dataSources.length) {
+ return (
+ <Empty className="border">
+ <EmptyHeader>
+ <EmptyMedia variant="icon">
+ <SearchIcon />
+ </EmptyMedia>
+ <EmptyTitle>No data sources match your filters</EmptyTitle>
+ <EmptyDescription>Try a different search term or platform filter.</EmptyDescription>
+ </EmptyHeader>
+ </Empty>
+ );
+ }
+
+ return (
+ <Empty className="border">
+ <EmptyHeader>
+ <EmptyMedia variant="icon">
+ <DatabaseIcon />
+ </EmptyMedia>
+ <EmptyTitle>No data sources yet</EmptyTitle>
+ <EmptyDescription>Add a data source to start scanning it for leaked secrets.</EmptyDescription>
+ </EmptyHeader>
+ </Empty>
+ );
+ };
return (
<>
- <div className="w-full rounded-lg border border-border-control bg-surface-base p-4">
- <div className="mb-4 flex items-center justify-between">
- <div>
- <div className="flex items-center gap-x-2">
- <p className="text-xl font-medium text-foreground">Data Sources</p>
- <DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/secret-scanning/overview" />
- </div>
- <p className="text-sm text-label-secondary">
- Configure Data Sources to scan for secret leaks from third-party services.
- </p>
+ <Card>
+ <CardHeader>
+ <CardTitle>
+ Data Sources
+ <DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/secret-scanning/overview" />
+ </CardTitle>
+ <CardDescription>
+ Connect third-party services to scan them for leaked secrets.
+ </CardDescription>
+ <CardAction>
+ <ProjectPermissionCan
+ I={ProjectPermissionSecretScanningDataSourceActions.Create}
+ a={ProjectPermissionSub.SecretScanningDataSources}
+ >
+ {(isAllowed) => (
+ <Button
+ variant="project"
+ isDisabled={!isAllowed}
+ onClick={() => {
+ if (!subscription.secretScanning) {
+ handlePopUpOpen("upgradePlan", { isEnterpriseFeature: true });
+ return;
+ }
+
+ handlePopUpOpen("addDataSource");
+ }}
+ >
+ <PlusIcon />
+ Add Data Source
+ </Button>
+ )}
+ </ProjectPermissionCan>
+ </CardAction>
+ <div className="col-span-full flex gap-2">
+ <InputGroup className="flex-1">
+ <InputGroupAddon align="inline-start">
+ <SearchIcon />
+ </InputGroupAddon>
+ <InputGroupInput
+ value={search}
+ onChange={(e) => setSearch(e.target.value)}
+ placeholder="Search data sources..."
+ />
+ </InputGroup>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <IconButton
+ aria-label="Filter data sources"
+ variant={typeFilter.length ? "project" : "outline"}
+ >
+ <FilterIcon />
+ </IconButton>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuLabel>Filter by Platform</DropdownMenuLabel>
+ {availableTypes.map((type) => {
+ const { name, image } = SECRET_SCANNING_DATA_SOURCE_MAP[type];
+
+ return (
+ <DropdownMenuCheckboxItem
+ key={type}
+ checked={typeFilter.includes(type)}
+ onClick={(e) => {
+ e.preventDefault();
+ setTypeFilter((prev) =>
+ prev.includes(type) ? prev.filter((t) => t !== type) : [...prev, type]
+ );
+ setPage(1);
+ }}
+ >
+ <ProviderIcon alt={`${name} data source`} icon={image} className="size-4" />
+ {name}
+ </DropdownMenuCheckboxItem>
+ );
+ })}
+ {!availableTypes.length && (
+ <DropdownMenuItem isDisabled>No Data Sources Configured</DropdownMenuItem>
+ )}
+ </DropdownMenuContent>
+ </DropdownMenu>
</div>
- <ProjectPermissionCan
- I={ProjectPermissionSecretScanningDataSourceActions.Create}
- a={ProjectPermissionSub.SecretScanningDataSources}
- >
- {(isAllowed) => (
- <Button
- colorSchema="secondary"
- type="submit"
- leftIcon={<FontAwesomeIcon icon={faPlus} />}
- onClick={() => {
- if (!subscription.secretScanning) {
- handlePopUpOpen("upgradePlan", {
- isEnterpriseFeature: true
- });
- return;
- }
-
- handlePopUpOpen("addDataSource");
- }}
- isDisabled={!isAllowed}
- >
- Add Data Source
- </Button>
- )}
- </ProjectPermissionCan>
- </div>
- <SecretScanningDataSourcesTable dataSources={dataSources} />
- </div>
+ </CardHeader>
+ <CardContent>
+ {!isLoading && !filteredDataSources.length ? (
+ renderEmpty()
+ ) : (
+ <Table>
+ <TableHeader>
+ <TableRow>
+ <TableHead>Type</TableHead>
+ {renderSortableHead(DataSourcesOrderBy.Name, "Name", "w-1/3")}
+ <TableHead>Resources</TableHead>
+ {renderSortableHead(DataSourcesOrderBy.Findings, "Unresolved Findings")}
+ {renderSortableHead(DataSourcesOrderBy.LastScan, "Last Scan")}
+ <TableHead>Status</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {isLoading &&
+ SKELETON_ROWS.map((row) => (
+ <TableRow key={`data-source-skeleton-${row}`}>
+ {SKELETON_CELLS.map((cell) => (
+ <TableCell key={`data-source-skeleton-${row}-${cell}`}>
+ <Skeleton className="h-4 w-full" />
+ </TableCell>
+ ))}
+ </TableRow>
+ ))}
+ {!isLoading &&
+ filteredDataSources
+ .slice(offset, perPage * page)
+ .map((dataSource) => (
+ <SecretScanningDataSourceRow
+ key={dataSource.id}
+ dataSource={dataSource}
+ />
+ ))}
+ </TableBody>
+ </Table>
+ )}
+ {!isLoading && Boolean(filteredDataSources.length) && (
+ <Pagination
+ count={filteredDataSources.length}
+ page={page}
+ perPage={perPage}
+ onChangePage={setPage}
+ onChangePerPage={setPerPage}
+ />
+ )}
+ </CardContent>
+ </Card>
<CreateSecretScanningDataSourceModal
isOpen={popUp.addDataSource.isOpen}
onOpenChange={(isOpen) => handlePopUpToggle("addDataSource", isOpen)}
diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesTable.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesTable.tsx
deleted file mode 100644
index 5d80571471..0000000000
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesTable.tsx
+++ /dev/null
@@ -1,366 +0,0 @@
-import { useMemo, useState } from "react";
-import {
- faArrowDown,
- faArrowUp,
- faCheckCircle,
- faCubesStacked,
- faFilter,
- faMagnifyingGlass,
- faSearch
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { twMerge } from "tailwind-merge";
-
-import { createNotification } from "@app/components/notifications";
-import { EditSecretScanningDataSourceModal } from "@app/components/secret-scanning";
-import { DeleteSecretScanningDataSourceModal } from "@app/components/secret-scanning/DeleteSecretScanningDataSourceModal";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuTrigger,
- EmptyState,
- IconButton,
- Input,
- Pagination,
- Table,
- TableContainer,
- TBody,
- Th,
- THead,
- Tr
-} from "@app/components/v2";
-import { ProviderIcon } from "@app/components/v3";
-import { SECRET_SCANNING_DATA_SOURCE_MAP } from "@app/helpers/secretScanningV2";
-import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
-import { OrderByDirection } from "@app/hooks/api/generic/types";
-import {
- SecretScanningDataSource,
- SecretScanningScanStatus,
- TSecretScanningDataSource,
- TSecretScanningDataSourceWithDetails,
- useTriggerSecretScanningDataSource,
- useUpdateSecretScanningDataSource
-} from "@app/hooks/api/secretScanningV2";
-
-import { SecretScanningDataSourceRow } from "./SecretScanningDataSourceRow";
-
-enum DataSourcesOrderBy {
- Findings = "findings",
- Name = "name",
- LastScan = "last-scan"
-}
-
-type DataSourceFilters = {
- types: SecretScanningDataSource[];
-};
-
-type Props = {
- dataSources: TSecretScanningDataSourceWithDetails[];
-};
-
-export const SecretScanningDataSourcesTable = ({ dataSources }: Props) => {
- const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
- "deleteDataSource",
- "editDataSource",
- "triggerDataSourceScan"
- ] as const);
- const triggerDataSourceScan = useTriggerSecretScanningDataSource();
- const updateDataSource = useUpdateSecretScanningDataSource();
-
- const [filters, setFilters] = useState<DataSourceFilters>({
- types: []
- });
-
- const {
- search,
- setSearch,
- setPage,
- page,
- perPage,
- setPerPage,
- offset,
- orderDirection,
- toggleOrderDirection,
- orderBy,
- setOrderDirection,
- setOrderBy
- } = usePagination<DataSourcesOrderBy>(DataSourcesOrderBy.Name, { initPerPage: 20 });
-
- const filteredDataSources = useMemo(
- () =>
- dataSources
- .filter((dataSource) => {
- const { type, name, connection } = dataSource;
-
- if (filters.types.length && !filters.types.includes(type)) return false;
-
- const searchValue = search.trim().toLowerCase();
-
- return (
- SECRET_SCANNING_DATA_SOURCE_MAP[type].name.toLowerCase().includes(searchValue) ||
- name.toLowerCase().includes(searchValue) ||
- (connection && connection.name.toLowerCase().includes(searchValue))
- );
- })
- .sort((a, b) => {
- const [dataSourceOne, dataSourceTwo] =
- orderDirection === OrderByDirection.ASC ? [a, b] : [b, a];
-
- switch (orderBy) {
- case DataSourcesOrderBy.LastScan:
- if (dataSourceOne.lastScannedAt === null && dataSourceTwo.lastScannedAt === null)
- return 0;
- if (dataSourceOne.lastScannedAt === null) return 1;
- if (dataSourceTwo.lastScannedAt === null) return -1;
-
- return (
- new Date(dataSourceTwo.lastScannedAt).getTime() -
- new Date(dataSourceOne.lastScannedAt).getTime()
- );
- case DataSourcesOrderBy.Findings:
- if (
- dataSourceOne.unresolvedFindings === null &&
- dataSourceTwo.unresolvedFindings === null
- )
- return 0;
- if (dataSourceOne.unresolvedFindings === null) return 1;
- if (dataSourceTwo.unresolvedFindings === null) return -1;
-
- if (
- dataSourceOne.unresolvedFindings === 0 &&
- dataSourceOne.lastScanStatus === SecretScanningScanStatus.Failed
- )
- return 1;
- if (
- dataSourceTwo.unresolvedFindings === 0 &&
- dataSourceTwo.lastScanStatus === SecretScanningScanStatus.Failed
- )
- return -1;
-
- return dataSourceTwo.unresolvedFindings - dataSourceOne.unresolvedFindings;
- case DataSourcesOrderBy.Name:
- default:
- return dataSourceOne.name
- .toLowerCase()
- .localeCompare(dataSourceTwo.name.toLowerCase());
- }
- }),
- [dataSources, orderDirection, search, orderBy, filters]
- );
-
- useResetPageHelper({
- totalCount: filteredDataSources.length,
- offset,
- setPage
- });
-
- const handleSort = (column: DataSourcesOrderBy) => {
- if (column === orderBy) {
- toggleOrderDirection();
- return;
- }
-
- setOrderBy(column);
- setOrderDirection(OrderByDirection.ASC);
- };
-
- const getClassName = (col: DataSourcesOrderBy) =>
- twMerge("ml-2", orderBy === col ? "" : "opacity-30");
-
- const getColSortIcon = (col: DataSourcesOrderBy) =>
- orderDirection === OrderByDirection.DESC && orderBy === col ? faArrowUp : faArrowDown;
-
- const isTableFiltered = Boolean(filters.types.length);
-
- const handleDelete = (dataSource: TSecretScanningDataSource) =>
- handlePopUpOpen("deleteDataSource", dataSource);
-
- const handleEdit = (dataSource: TSecretScanningDataSource) =>
- handlePopUpOpen("editDataSource", dataSource);
-
- const handleToggleEnableAutoScan = async (dataSource: TSecretScanningDataSource) => {
- const destinationName = SECRET_SCANNING_DATA_SOURCE_MAP[dataSource.type].name;
-
- const isAutoScanEnabled = !dataSource.isAutoScanEnabled;
-
- await updateDataSource.mutateAsync({
- dataSourceId: dataSource.id,
- type: dataSource.type,
- isAutoScanEnabled,
- projectId: dataSource.projectId
- });
-
- createNotification({
- text: `Successfully ${isAutoScanEnabled ? "enabled" : "disabled"} auto-scan for ${destinationName} Data Source`,
- type: "success"
- });
- };
-
- const handleTriggerScan = async (dataSource: TSecretScanningDataSource) => {
- await triggerDataSourceScan.mutateAsync({
- dataSourceId: dataSource.id,
- type: dataSource.type,
- projectId: dataSource.projectId
- });
-
- createNotification({
- text: "Successfully triggered scan",
- type: "success"
- });
- };
-
- return (
- <div>
- <div className="flex gap-2">
- <Input
- value={search}
- onChange={(e) => setSearch(e.target.value)}
- leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
- placeholder="Search data sources..."
- className="flex-1"
- />
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <IconButton
- ariaLabel="Filter data sources"
- variant="plain"
- size="sm"
- className={twMerge(
- "flex h-10 w-11 items-center justify-center overflow-hidden border border-border-control bg-surface-raised p-0 transition-all hover:border-project/60 hover:bg-project/10",
- isTableFiltered && "border-project/50 text-project"
- )}
- >
- <FontAwesomeIcon icon={faFilter} />
- </IconButton>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="max-h-[70vh] thin-scrollbar overflow-y-auto" align="end">
- <DropdownMenuLabel>Platform</DropdownMenuLabel>
- {dataSources.length ? (
- [...new Set(dataSources.map(({ type }) => type))].map((type) => {
- const { name, image } = SECRET_SCANNING_DATA_SOURCE_MAP[type];
-
- return (
- <DropdownMenuItem
- onClick={(e) => {
- e.preventDefault();
- setFilters((prev) => ({
- ...prev,
- types: prev.types.includes(type)
- ? prev.types.filter((a) => a !== type)
- : [...prev.types, type]
- }));
- }}
- key={type}
- icon={
- filters.types.includes(type) && (
- <FontAwesomeIcon className="text-project" icon={faCheckCircle} />
- )
- }
- iconPos="right"
- >
- <div className="flex items-center gap-2">
- <ProviderIcon alt={`${name} integration`} icon={image} className="h-4 w-4" />
- <span>{name}</span>
- </div>
- </DropdownMenuItem>
- );
- })
- ) : (
- <DropdownMenuItem isDisabled>No Data Sources Configured</DropdownMenuItem>
- )}
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- <TableContainer className="mt-4">
- <Table>
- <THead>
- <Tr>
- <Th className="min-w-36">Platform</Th>
- <Th className="w-1/3">
- <div className="flex items-center">
- Name
- <IconButton
- variant="plain"
- className={getClassName(DataSourcesOrderBy.Name)}
- ariaLabel="sort"
- onClick={() => handleSort(DataSourcesOrderBy.Name)}
- >
- <FontAwesomeIcon icon={getColSortIcon(DataSourcesOrderBy.Name)} />
- </IconButton>
- </div>
- </Th>
- <Th className="w-1/3">
- <div className="flex items-center">
- Findings
- <IconButton
- variant="plain"
- className={getClassName(DataSourcesOrderBy.Findings)}
- ariaLabel="sort"
- onClick={() => handleSort(DataSourcesOrderBy.Findings)}
- >
- <FontAwesomeIcon icon={getColSortIcon(DataSourcesOrderBy.Findings)} />
- </IconButton>
- </div>
- </Th>
- <Th className="w-1/3">
- <div className="flex items-center">
- Last Scan
- <IconButton
- variant="plain"
- className={getClassName(DataSourcesOrderBy.LastScan)}
- ariaLabel="sort"
- onClick={() => handleSort(DataSourcesOrderBy.LastScan)}
- >
- <FontAwesomeIcon icon={getColSortIcon(DataSourcesOrderBy.LastScan)} />
- </IconButton>
- </div>
- </Th>
- <Th className="w-5" />
- </Tr>
- </THead>
- <TBody>
- {filteredDataSources.slice(offset, perPage * page).map((dataSource) => (
- <SecretScanningDataSourceRow
- key={dataSource.id}
- dataSource={dataSource}
- onDelete={handleDelete}
- onEdit={handleEdit}
- onTriggerScan={handleTriggerScan}
- onToggleEnableAutoScan={handleToggleEnableAutoScan}
- />
- ))}
- </TBody>
- </Table>
- {Boolean(filteredDataSources.length) && (
- <Pagination
- count={filteredDataSources.length}
- page={page}
- perPage={perPage}
- onChangePage={setPage}
- onChangePerPage={setPerPage}
- />
- )}
- {!filteredDataSources?.length && (
- <EmptyState
- title={
- dataSources.length ? "No data sources match search..." : "No data sources configured"
- }
- icon={dataSources.length ? faSearch : faCubesStacked}
- />
- )}
- </TableContainer>
- <DeleteSecretScanningDataSourceModal
- onOpenChange={(isOpen) => handlePopUpToggle("deleteDataSource", isOpen)}
- isOpen={popUp.deleteDataSource.isOpen}
- dataSource={popUp.deleteDataSource.data}
- />
- <EditSecretScanningDataSourceModal
- onOpenChange={(isOpen) => handlePopUpToggle("editDataSource", isOpen)}
- isOpen={popUp.editDataSource.isOpen}
- dataSource={popUp.editDataSource.data}
- />
- </div>
- );
-};