diff --git a/actions/services/services.ts b/actions/services/services.ts index dab8b80bb9..c4ab342f01 100644 --- a/actions/services/services.ts +++ b/actions/services/services.ts @@ -2,10 +2,10 @@ import { revalidatePath } from "next/cache"; import { redirect } from "next/navigation"; +import { parse } from "path"; import { auth } from "@/auth.config"; import { getErrorMessage, parseStringify } from "@/lib"; -import { parse } from "path"; export const getServices = async ({}) => { const session = await auth(); @@ -63,10 +63,8 @@ export const getServices = async ({}) => { { id: "trustedadvisor", alias: "AWS Trusted Advisor" }, { id: "vpc", alias: "Amazon VPC" }, { id: "wafv2", alias: "AWS WAF" }, - { id: "wellarchitected", alias: "AWS Well-Architected Tool" } + { id: "wellarchitected", alias: "AWS Well-Architected Tool" }, ]; - - const parsedData = []; diff --git a/components/findings/table/column-findings.tsx b/components/findings/table/column-findings.tsx index 1d3d2a28d5..4d0d7dd3ab 100644 --- a/components/findings/table/column-findings.tsx +++ b/components/findings/table/column-findings.tsx @@ -2,12 +2,13 @@ import { ColumnDef } from "@tanstack/react-table"; +import { DataTableRowDetails } from "@/components/findings/table"; +import { PlusIcon } from "@/components/icons"; +import { TriggerSheet } from "@/components/ui/sheet"; import { SeverityBadge, Status, StatusBadge } from "@/components/ui/table"; import { FindingProps } from "@/types"; -import { TriggerSheet } from "@/components/ui/sheet"; + import { DataTableRowActions } from "./data-table-row-actions"; -import { PlusIcon } from "@/components/icons"; -import { DataTableRowDetails } from "@/components/findings/table"; const statusMap: Record<"PASS" | "FAIL" | "MANUAL" | "MUTED", Status> = { PASS: "completed", diff --git a/components/findings/table/data-table-row-details.tsx b/components/findings/table/data-table-row-details.tsx index b843847e7a..b93c61ec85 100644 --- a/components/findings/table/data-table-row-details.tsx +++ b/components/findings/table/data-table-row-details.tsx @@ -1,11 +1,8 @@ "use client"; -import { useEffect, useState } from "react"; - import { FindingDetail } from "@/components/findings/table"; import { FindingProps } from "@/types"; export const DataTableRowDetails = ({ finding }: { finding: FindingProps }) => { - console.log(finding); return ; }; diff --git a/components/findings/table/finding-detail.tsx b/components/findings/table/finding-detail.tsx index 2aa99a2719..4d2dfac867 100644 --- a/components/findings/table/finding-detail.tsx +++ b/components/findings/table/finding-detail.tsx @@ -1,97 +1,125 @@ "use client"; -import { Card, CardBody, CardHeader, Divider } from "@nextui-org/react"; +import { + Table, + TableBody, + TableCell, + TableColumn, + TableHeader, + TableRow, +} from "@nextui-org/react"; -import { DateWithTime, SnippetId } from "@/components/ui/entities"; -import { StatusBadge } from "@/components/ui/table/status-badge"; import { FindingProps } from "@/types"; -import {Table, TableHeader, TableColumn, TableBody, TableRow, TableCell} from "@nextui-org/react"; -export const FindingDetail = ({ findingDetails }: { findingDetails: FindingProps }) => { +export const FindingDetail = ({ + findingDetails, +}: { + findingDetails: FindingProps; +}) => { const finding = findingDetails; - console.log(finding) return (
- - - Name - Value - - - - Resource ID - {finding.relationships.resource.id} - - - Resource ARN - {finding.relationships.resource.attributes.uid} - - - Check ID - {finding.attributes.check_id} - - - Types - {finding.attributes.check_metadata.checktype} - - - Scan time - {finding.attributes.inserted_at} - - - Prowler Finding ID - {finding.relationships.resource.attributes.uid} - - - Severity - {finding.id} - - - Status - {finding.attributes.status} - - - Region - {finding.relationships.resource.attributes.region} - - - Service - {finding.relationships.resource.attributes.service} - - - Account - {finding.relationships.provider.attributes.uid} - - - Details - {finding.attributes.status_extended} - - - Risk - {finding.attributes.check_metadata.risk} - - - Recommendation - {finding.attributes.check_metadata.remediation.recommendation.text} - - - CLI - {finding.attributes.check_metadata.remediation.code.cli} - - - Other - {finding.attributes.check_metadata.remediation.code.other} - - - Terraform - {finding.attributes.check_metadata.remediation.code.terraform} - - -
- -
+ + Name + Value + + + + Resource ID + {finding.relationships.resource.id} + + + Resource ARN + + {finding.relationships.resource.attributes.uid} + + + + Check ID + {finding.attributes.check_id} + + + Types + + {finding.attributes.check_metadata.checktype} + + + + Scan time + {finding.attributes.inserted_at} + + + Prowler Finding ID + + {finding.relationships.resource.attributes.uid} + + + + Severity + {finding.id} + + + Status + {finding.attributes.status} + + + Region + + {finding.relationships.resource.attributes.region} + + + + Service + + {finding.relationships.resource.attributes.service} + + + + Account + + {finding.relationships.provider.attributes.uid} + + + + Details + {finding.attributes.status_extended} + + + Risk + {finding.attributes.check_metadata.risk} + + + Recommendation + + { + finding.attributes.check_metadata.remediation.recommendation + .text + } + + + + CLI + + {finding.attributes.check_metadata.remediation.code.cli} + + + + Other + + {finding.attributes.check_metadata.remediation.code.other} + + + + Terraform + + {finding.attributes.check_metadata.remediation.code.terraform} + + + + +
); }; diff --git a/components/findings/table/index.ts b/components/findings/table/index.ts index 3aad78e3f4..fe19b5dd6e 100644 --- a/components/findings/table/index.ts +++ b/components/findings/table/index.ts @@ -1,5 +1,5 @@ export * from "./column-findings"; export * from "./data-table-row-actions"; export * from "./data-table-row-details"; -export * from "./skeleton-table-findings"; export * from "./finding-detail"; +export * from "./skeleton-table-findings"; diff --git a/components/scans/table/scans/column-get-scans.tsx b/components/scans/table/scans/column-get-scans.tsx index fccc203ae6..0d8bfb4360 100644 --- a/components/scans/table/scans/column-get-scans.tsx +++ b/components/scans/table/scans/column-get-scans.tsx @@ -45,17 +45,16 @@ export const ColumnGetScans: ColumnDef[] = [ ); }, }, - - { - accessorKey: "scanner_args", - header: "Scanner Args", - cell: ({ row }) => { - const { - attributes: { scanner_args }, - } = getScanData(row); - return

{scanner_args?.only_logs}

; - }, - }, + // { + // accessorKey: "scanner_args", + // header: "Scanner Args", + // cell: ({ row }) => { + // const { + // attributes: { scanner_args }, + // } = getScanData(row); + // return

{scanner_args?.only_logs}

; + // }, + // }, { accessorKey: "resources", header: "Resources", diff --git a/package.json b/package.json index 2d9f0f0ba4..765c868597 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "build": "next build", "start": "next start", "typecheck": "tsc", - "healthcheck": "npm run typecheck && npm run lint:check", + "healthcheck": "npm run typecheck && npm run lint:check && npm run build", "lint:check": "./node_modules/.bin/eslint ./app", "lint:fix": "eslint . --ext .ts,.tsx -c .eslintrc.cjs --fix", "format:check": "./node_modules/.bin/prettier --check ./app",