diff --git a/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.test.ts b/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.test.ts
index 3e4d1ef540..797676562f 100644
--- a/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.test.ts
+++ b/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.test.ts
@@ -191,7 +191,7 @@ describe("useResourceDetailDrawer — other findings filtering", () => {
id: "other-1",
checkId: "check-other-1",
checkTitle: "Other 1",
- status: "PASS",
+ status: "FAIL",
severity: "critical",
}),
makeDrawerFinding({
@@ -221,6 +221,55 @@ describe("useResourceDetailDrawer — other findings filtering", () => {
]);
});
+ it("should exclude non-FAIL findings from otherFindings", async () => {
+ const resources = [makeResource()];
+
+ getLatestFindingsByResourceUidMock.mockResolvedValue({ data: [] });
+ adaptFindingsByResourceResponseMock.mockReturnValue([
+ makeDrawerFinding({
+ id: "current",
+ checkId: "s3_check",
+ status: "MANUAL",
+ severity: "informational",
+ }),
+ makeDrawerFinding({
+ id: "other-pass",
+ checkId: "check-pass",
+ status: "PASS",
+ severity: "low",
+ }),
+ makeDrawerFinding({
+ id: "other-manual",
+ checkId: "check-manual",
+ status: "MANUAL",
+ severity: "low",
+ }),
+ makeDrawerFinding({
+ id: "other-fail",
+ checkId: "check-fail",
+ status: "FAIL",
+ severity: "high",
+ }),
+ ]);
+
+ const { result } = renderHook(() =>
+ useResourceDetailDrawer({
+ resources,
+ checkId: "s3_check",
+ }),
+ );
+
+ await act(async () => {
+ result.current.openDrawer(0);
+ await Promise.resolve();
+ });
+
+ expect(result.current.currentFinding?.id).toBe("current");
+ expect(result.current.otherFindings.map((f) => f.id)).toEqual([
+ "other-fail",
+ ]);
+ });
+
it("should keep isNavigating true for a cached resource long enough to render skeletons", async () => {
vi.useFakeTimers();
diff --git a/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.ts b/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.ts
index f092c606dc..687d9ac739 100644
--- a/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.ts
+++ b/ui/components/findings/table/resource-detail-drawer/use-resource-detail-drawer.ts
@@ -46,6 +46,7 @@ interface UseResourceDetailDrawerOptions {
checkId: string;
totalResourceCount?: number;
onRequestMoreResources?: () => void;
+ initialIndex?: number | null;
}
interface UseResourceDetailDrawerReturn {
@@ -77,10 +78,11 @@ export function useResourceDetailDrawer({
checkId,
totalResourceCount,
onRequestMoreResources,
+ initialIndex = null,
}: UseResourceDetailDrawerOptions): UseResourceDetailDrawerReturn {
- const [isOpen, setIsOpen] = useState(false);
+ const [isOpen, setIsOpen] = useState(initialIndex !== null);
const [isLoading, setIsLoading] = useState(false);
- const [currentIndex, setCurrentIndex] = useState(0);
+ const [currentIndex, setCurrentIndex] = useState(initialIndex ?? 0);
const [findings, setFindings] = useState
([]);
const [isNavigating, setIsNavigating] = useState(false);
@@ -190,6 +192,22 @@ export function useResourceDetailDrawer({
}
};
+ useEffect(() => {
+ if (initialIndex === null) {
+ return;
+ }
+
+ const resource = resources[initialIndex];
+ if (!resource) {
+ return;
+ }
+
+ fetchFindings(resource.resourceUid);
+ // Only initialize once on mount for deep-link/inline entry points.
+ // User-driven navigations use openDrawer/navigateTo afterwards.
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
const openDrawer = (index: number) => {
const resource = resources[index];
if (!resource) return;
@@ -251,10 +269,13 @@ export function useResourceDetailDrawer({
const currentFinding =
findings.find((f) => f.checkId === checkId) ?? findings[0] ?? null;
- // All other findings for this resource
- const otherFindings = currentFinding
- ? findings.filter((f) => f.id !== currentFinding.id)
- : findings;
+ // "Other Findings For This Resource" intentionally shows only FAIL entries,
+ // while currentFinding (the drilled-down one) can be any status (FAIL, MANUAL, PASS…).
+ const otherFindings = (
+ currentFinding
+ ? findings.filter((f) => f.id !== currentFinding.id)
+ : findings
+ ).filter((f) => f.status === "FAIL");
return {
isOpen,
diff --git a/ui/components/overview/new-findings-table/table/column-latest-findings.tsx b/ui/components/overview/new-findings-table/table/column-latest-findings.tsx
new file mode 100644
index 0000000000..6310e2dc40
--- /dev/null
+++ b/ui/components/overview/new-findings-table/table/column-latest-findings.tsx
@@ -0,0 +1,11 @@
+"use client";
+
+import { ColumnDef } from "@tanstack/react-table";
+
+import { getStandaloneFindingColumns } from "@/components/findings/table/column-standalone-findings";
+import { FindingProps } from "@/types";
+
+export const ColumnLatestFindings: ColumnDef[] =
+ getStandaloneFindingColumns({
+ includeUpdatedAt: true,
+ });
diff --git a/ui/components/overview/new-findings-table/table/column-new-findings-to-date.tsx b/ui/components/overview/new-findings-table/table/column-new-findings-to-date.tsx
deleted file mode 100644
index 94eeca391d..0000000000
--- a/ui/components/overview/new-findings-table/table/column-new-findings-to-date.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-"use client";
-
-import { ColumnDef, RowSelectionState } from "@tanstack/react-table";
-
-import { getColumnFindings } from "@/components/findings/table/column-findings";
-import { FindingProps } from "@/types";
-
-const baseColumns: ColumnDef[] = getColumnFindings(
- {} as RowSelectionState,
- 0,
-).filter((column) => column.id !== "select" && column.id !== "actions");
-
-export const ColumnNewFindingsToDate: ColumnDef[] = baseColumns;
diff --git a/ui/components/overview/new-findings-table/table/index.ts b/ui/components/overview/new-findings-table/table/index.ts
index 5f8e56989e..7065a82bf8 100644
--- a/ui/components/overview/new-findings-table/table/index.ts
+++ b/ui/components/overview/new-findings-table/table/index.ts
@@ -1,2 +1,2 @@
-export * from "./column-new-findings-to-date";
+export * from "./column-latest-findings";
export * from "./skeleton-table-new-findings";
diff --git a/ui/components/resources/resource-details-sheet.test.ts b/ui/components/resources/resource-details-sheet.test.ts
new file mode 100644
index 0000000000..9f630ee352
--- /dev/null
+++ b/ui/components/resources/resource-details-sheet.test.ts
@@ -0,0 +1,16 @@
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { describe, expect, it } from "vitest";
+
+describe("resource details sheet", () => {
+ const currentDir = path.dirname(fileURLToPath(import.meta.url));
+ const filePath = path.join(currentDir, "resource-details-sheet.tsx");
+ const source = readFileSync(filePath, "utf8");
+
+ it("forces a remount when switching resources so local drawer state resets without effects", () => {
+ expect(source).toContain("key={resource.id}");
+ expect(source).toContain("resourceDetails={resource}");
+ });
+});
diff --git a/ui/components/resources/resource-details-sheet.tsx b/ui/components/resources/resource-details-sheet.tsx
index 1581f36520..1ae3ec0e74 100644
--- a/ui/components/resources/resource-details-sheet.tsx
+++ b/ui/components/resources/resource-details-sheet.tsx
@@ -36,7 +36,9 @@ export const ResourceDetailsSheet = ({
Close
- {open && }
+ {open && (
+
+ )}
);
diff --git a/ui/components/resources/skeleton/skeleton-finding-details.tsx b/ui/components/resources/skeleton/skeleton-finding-details.tsx
deleted file mode 100644
index 062a5fb7c7..0000000000
--- a/ui/components/resources/skeleton/skeleton-finding-details.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React from "react";
-
-export const SkeletonFindingDetails = () => {
- return (
-
- {/* Header */}
-
-
- {/* Metadata Section */}
-
- {Array.from({ length: 6 }).map((_, index) => (
-
- ))}
-
-
- {/* InfoField Blocks */}
- {Array.from({ length: 3 }).map((_, index) => (
-
- ))}
-
- {/* Risk and Description Sections */}
-
-
-
-
-
-
-
-
- {/* Additional Resources */}
-
-
- {/* Categories */}
-
-
- {/* Provider Info Section */}
-
-
-
-
- Loading finding details...
-
-