@@ -156,7 +160,7 @@ export const ScanDetail = ({ scanDetails }: ScanDetailsProps) => {
diff --git a/components/scans/table/scans/column-get-scans.tsx b/components/scans/table/scans/column-get-scans.tsx
index 3e2d940e8e..0d8bfb4360 100644
--- a/components/scans/table/scans/column-get-scans.tsx
+++ b/components/scans/table/scans/column-get-scans.tsx
@@ -4,7 +4,7 @@ import { ColumnDef } from "@tanstack/react-table";
import { useSearchParams } from "next/navigation";
import { InfoIcon } from "@/components/icons";
-import { DateWithTime, EntityInfoShort } from "@/components/ui/entities";
+import { DateWithTime, SnippetId } from "@/components/ui/entities";
import { TriggerSheet } from "@/components/ui/sheet";
import { DataTableColumnHeader, StatusBadge } from "@/components/ui/table";
import { ScanProps } from "@/types";
@@ -18,30 +18,16 @@ const getScanData = (row: { original: ScanProps }) => {
export const ColumnGetScans: ColumnDef
[] = [
{
- accessorKey: "name",
- header: ({ column }) => (
-
- ),
+ accessorKey: "started_at",
+ header: () => Started at
,
cell: ({ row }) => {
const {
- attributes: { name },
+ attributes: { started_at },
} = getScanData(row);
- return ;
- },
- },
- {
- accessorKey: "trigger",
- header: ({ column }) => (
-
- ),
- cell: ({ row }) => {
- const {
- attributes: { trigger },
- } = getScanData(row);
- return {trigger}
;
- },
- },
+ return ;
+ },
+ },
{
accessorKey: "status",
header: ({ column }) => (
@@ -51,7 +37,32 @@ export const ColumnGetScans: ColumnDef[] = [
const {
attributes: { state },
} = getScanData(row);
- return ;
+ return (
+
+ );
+ },
+ },
+ // {
+ // accessorKey: "scanner_args",
+ // header: "Scanner Args",
+ // cell: ({ row }) => {
+ // const {
+ // attributes: { scanner_args },
+ // } = getScanData(row);
+ // return {scanner_args?.only_logs}
;
+ // },
+ // },
+ {
+ accessorKey: "resources",
+ header: "Resources",
+ cell: ({ row }) => {
+ const {
+ attributes: { unique_resource_count },
+ } = getScanData(row);
+ return {unique_resource_count}
;
},
},
{
@@ -70,29 +81,14 @@ export const ColumnGetScans: ColumnDef[] = [
return ;
},
},
- {
- accessorKey: "started_at",
- header: ({ column }) => (
-
- ),
- cell: ({ row }) => {
- const {
- attributes: { started_at },
- } = getScanData(row);
- return ;
- },
- },
+
{
accessorKey: "completed_at",
header: ({ column }) => (
),
cell: ({ row }) => {
@@ -103,23 +99,38 @@ export const ColumnGetScans: ColumnDef[] = [
},
},
{
- accessorKey: "scanner_args",
- header: "Scanner Args",
+ accessorKey: "trigger",
+ header: ({ column }) => (
+
+ ),
cell: ({ row }) => {
const {
- attributes: { scanner_args },
+ attributes: { trigger },
} = getScanData(row);
- return {scanner_args?.only_logs}
;
+ return {trigger}
;
+ },
+ },
+
+ {
+ accessorKey: "id",
+ header: () => ID,
+ cell: ({ row }) => {
+ return ;
},
},
{
- accessorKey: "resources",
- header: "Resources",
+ accessorKey: "name",
+ header: ({ column }) => (
+
+ ),
cell: ({ row }) => {
const {
- attributes: { unique_resource_count },
+ attributes: { name },
} = getScanData(row);
- return {unique_resource_count}
;
+ if (name.length === 0) {
+ return -;
+ }
+ return {name};
},
},
{
diff --git a/components/ui/table/status-badge.tsx b/components/ui/table/status-badge.tsx
index 932d4105d6..3639e3a8a1 100644
--- a/components/ui/table/status-badge.tsx
+++ b/components/ui/table/status-badge.tsx
@@ -1,4 +1,4 @@
-import { Chip } from "@nextui-org/react";
+import { Chip, CircularProgress } from "@nextui-org/react";
import React from "react";
export type Status =
@@ -24,22 +24,41 @@ const statusColorMap: Record<
export const StatusBadge = ({
status,
size = "sm",
+ loadingProgress,
...props
}: {
status: Status;
size?: "sm" | "md" | "lg";
+ loadingProgress?: number;
}) => {
const color = statusColorMap[status as keyof typeof statusColorMap];
return (
- {status}
+ {status === "executing" ? (
+
+
+ executing
+
+ ) : (
+ status
+ )}
);
};
diff --git a/lib/helper.ts b/lib/helper.ts
index aed48d9478..5b6d2ec8f2 100644
--- a/lib/helper.ts
+++ b/lib/helper.ts
@@ -30,7 +30,6 @@ export async function checkTaskStatus(
await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY));
break;
default:
- console.warn(`Unexpected task state: ${state}`);
return { completed: false, error: "Unexpected task state" };
}
}