diff --git a/ui/CHANGELOG.md b/ui/CHANGELOG.md
index 583ef7d78a..4500c57bd4 100644
--- a/ui/CHANGELOG.md
+++ b/ui/CHANGELOG.md
@@ -13,12 +13,12 @@ All notable changes to the **Prowler UI** are documented in this file.
- Accepted invitations can no longer be edited. [(#7198)](https://github.com/prowler-cloud/prowler/pull/7198)
- Added download column in scans table to download reports for completed scans. [(#7353)](https://github.com/prowler-cloud/prowler/pull/7353)
-
#### 🔄 Changed
- Tweak styles for compliance cards. [(#7148)](https://github.com/prowler-cloud/prowler/pull/7148).
- Upgrade Next.js to v14.2.25 to fix a middleware authorization vulnerability. [(#7339)](https://github.com/prowler-cloud/prowler/pull/7339)
- Apply default filter to show only failed items when coming from scan table. [(#7356)](https://github.com/prowler-cloud/prowler/pull/7356)
+- Fix link behavior in scan cards: only disable "View Findings" when scan is not completed or executing. [(#7368)](https://github.com/prowler-cloud/prowler/pull/7368)
---
diff --git a/ui/components/scans/link-to-findings-from-scan.tsx b/ui/components/scans/link-to-findings-from-scan.tsx
index 41a5eff38a..07bc16ecd1 100644
--- a/ui/components/scans/link-to-findings-from-scan.tsx
+++ b/ui/components/scans/link-to-findings-from-scan.tsx
@@ -4,16 +4,22 @@ import { CustomButton } from "@/components/ui/custom";
interface LinkToFindingsProps {
scanId?: string;
+ isDisabled?: boolean;
}
-export const LinkToFindingsFromScan = ({ scanId }: LinkToFindingsProps) => {
+export const LinkToFindingsFromScan = ({
+ scanId,
+ isDisabled,
+}: LinkToFindingsProps) => {
return (
See Findings
diff --git a/ui/components/scans/table/scans/column-get-scans.tsx b/ui/components/scans/table/scans/column-get-scans.tsx
index b81ffd6287..c931cde668 100644
--- a/ui/components/scans/table/scans/column-get-scans.tsx
+++ b/ui/components/scans/table/scans/column-get-scans.tsx
@@ -107,7 +107,13 @@ export const ColumnGetScans: ColumnDef[] = [
header: "Findings",
cell: ({ row }) => {
const { id } = getScanData(row);
- return ;
+ const scanState = row.original.attributes?.state;
+ return (
+
+ );
},
},
{