@@ -112,7 +67,6 @@ const FindingTitleCell = ({ row }: { row: { original: FindingProps } }) => {
}
/>
->>>>>>> 1bf49747adaefcb19db66274478f6933342112c1
);
};
diff --git a/ui/components/findings/table/finding-detail.tsx b/ui/components/findings/table/finding-detail.tsx
index bd71891a23..439188a20c 100644
--- a/ui/components/findings/table/finding-detail.tsx
+++ b/ui/components/findings/table/finding-detail.tsx
@@ -1,17 +1,5 @@
"use client";
-<<<<<<< HEAD
-import { ExternalLink, Link } from "lucide-react";
-import ReactMarkdown from "react-markdown";
-
-import {
- Card,
- CardAction,
- CardContent,
- CardHeader,
- CardTitle,
-=======
-import { Snippet } from "@heroui/snippet";
import { ExternalLink, Link, X } from "lucide-react";
import { usePathname, useSearchParams } from "next/navigation";
import type { ReactNode } from "react";
@@ -30,7 +18,6 @@ import {
TabsContent,
TabsList,
TabsTrigger,
->>>>>>> 1bf49747adaefcb19db66274478f6933342112c1
Tooltip,
TooltipContent,
TooltipTrigger,
@@ -122,27 +109,6 @@ export const FindingDetail = ({
const content = (
{/* Header */}
-<<<<<<< HEAD
-
-
-
- {renderValue(attributes.check_metadata.checktitle)}
-
-
-
-
- Copy finding link to clipboard
-
-
-
-
-=======
{/* Row 1: Status badges */}
@@ -156,7 +122,6 @@ export const FindingDetail = ({
)}
->>>>>>> 1bf49747adaefcb19db66274478f6933342112c1
{providerDetails.provider === "iac" && gitUrl && (
-<<<<<<< HEAD
-
-=======
->>>>>>> 1bf49747adaefcb19db66274478f6933342112c1
-
-=======
className="text-bg-data-info inline-flex items-center gap-1 text-sm"
aria-label="Open resource in repository"
>
View in Repository
->>>>>>> 1bf49747adaefcb19db66274478f6933342112c1
diff --git a/ui/components/ui/table/status-badge.tsx b/ui/components/ui/table/status-badge.tsx
index 90b8658768..9d55589cf8 100644
--- a/ui/components/ui/table/status-badge.tsx
+++ b/ui/components/ui/table/status-badge.tsx
@@ -1,24 +1,8 @@
import { Chip } from "@heroui/chip";
-<<<<<<< HEAD
-import clsx from "clsx";
-=======
->>>>>>> 1bf49747adaefcb19db66274478f6933342112c1
import { SpinnerIcon } from "@/components/icons";
import { cn } from "@/lib/utils";
-<<<<<<< HEAD
-const STATUS = {
- available: "available",
- scheduled: "scheduled",
- executing: "executing",
- completed: "completed",
- failed: "failed",
- cancelled: "cancelled",
-} as const;
-
-export type Status = (typeof STATUS)[keyof typeof STATUS];
-=======
export type Status =
| "available"
| "queued"
@@ -27,7 +11,6 @@ export type Status =
| "completed"
| "failed"
| "cancelled";
->>>>>>> 1bf49747adaefcb19db66274478f6933342112c1
const statusDisplayMap: Record = {
available: "Queued",
@@ -52,15 +35,6 @@ const statusColorMap: Record<
cancelled: "danger",
};
-const statusDisplayMap: Record = {
- available: "queued",
- scheduled: "scheduled",
- executing: "executing",
- completed: "completed",
- failed: "failed",
- cancelled: "cancelled",
-};
-
export const StatusBadge = ({
status,
size = "sm",
@@ -97,13 +71,7 @@ export const StatusBadge = ({
executing