From dee17733a0f64735ab191b0eee82f91bfc6680a0 Mon Sep 17 00:00:00 2001
From: Pablo Lara <larabjj@gmail.com>
Date: Mon, 3 Feb 2025 16:08:47 +0100
Subject: [PATCH] feat(scans): show scan details right after launch (#6791)

---
 ui/app/(prowler)/scans/page.tsx                |  3 ---
 ui/components/scans/index.ts                   |  1 -
 ui/components/scans/scan-warning-bar.tsx       | 18 ------------------
 ui/components/scans/table/scan-detail.tsx      |  8 +++-----
 .../scans/table/scans/column-get-scans.tsx     |  8 ++++----
 5 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 ui/components/scans/scan-warning-bar.tsx

diff --git a/ui/app/(prowler)/scans/page.tsx b/ui/app/(prowler)/scans/page.tsx
index 9781627118..db38bd4e97 100644
--- a/ui/app/(prowler)/scans/page.tsx
+++ b/ui/app/(prowler)/scans/page.tsx
@@ -8,7 +8,6 @@ import {
   ButtonRefreshData,
   NoProvidersAdded,
   NoProvidersConnected,
-  ScanWarningBar,
 } from "@/components/scans";
 import { LaunchScanWorkflow } from "@/components/scans/launch-workflow";
 import { SkeletonTableScans } from "@/components/scans/table";
@@ -73,8 +72,6 @@ export default async function Scans({
               <Header title="Scans" icon="lucide:scan-search" />
 
               <LaunchScanWorkflow providers={providerInfo} />
-              <Spacer y={4} />
-              <ScanWarningBar />
               <Spacer y={8} />
             </>
           )}
diff --git a/ui/components/scans/index.ts b/ui/components/scans/index.ts
index 98157857ab..aa42edfe3c 100644
--- a/ui/components/scans/index.ts
+++ b/ui/components/scans/index.ts
@@ -2,4 +2,3 @@ export * from "./button-refresh-data";
 export * from "./link-to-findings-from-scan";
 export * from "./no-providers-added";
 export * from "./no-providers-connected";
-export * from "./scan-warning-bar";
diff --git a/ui/components/scans/scan-warning-bar.tsx b/ui/components/scans/scan-warning-bar.tsx
deleted file mode 100644
index 4c9acbb978..0000000000
--- a/ui/components/scans/scan-warning-bar.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-"use client";
-
-import { InfoIcon } from "../icons";
-
-export const ScanWarningBar = () => {
-  return (
-    <div className="flex items-center rounded-lg border border-system-warning bg-system-warning-medium p-4 text-sm dark:text-default-300">
-      <InfoIcon className="mr-4 inline h-4 w-4 flex-shrink-0" />
-      <div className="flex flex-col gap-1">
-        <strong>Waiting for Your Scan to Show Up?</strong>
-        <p>
-          It may take a few minutes for the scan to appear on the table and be
-          displayed.
-        </p>
-      </div>
-    </div>
-  );
-};
diff --git a/ui/components/scans/table/scan-detail.tsx b/ui/components/scans/table/scan-detail.tsx
index 6e9c3e288c..7307ff53f0 100644
--- a/ui/components/scans/table/scan-detail.tsx
+++ b/ui/components/scans/table/scan-detail.tsx
@@ -117,11 +117,9 @@ export const ScanDetail = ({
           <InfoField label="Completed At">
             <DateWithTime inline dateTime={scan.completed_at || "-"} />
           </InfoField>
-          {scan.next_scan_at && (
-            <InfoField label="Scheduled At">
-              <DateWithTime inline dateTime={scan.next_scan_at} />
-            </InfoField>
-          )}
+          <InfoField label="Scheduled At">
+            <DateWithTime inline dateTime={scan.scheduled_at || "-"} />
+          </InfoField>
         </div>
       </Section>
 
diff --git a/ui/components/scans/table/scans/column-get-scans.tsx b/ui/components/scans/table/scans/column-get-scans.tsx
index 55087a0e66..72a70f9311 100644
--- a/ui/components/scans/table/scans/column-get-scans.tsx
+++ b/ui/components/scans/table/scans/column-get-scans.tsx
@@ -123,13 +123,13 @@ export const ColumnGetScans: ColumnDef<ScanProps>[] = [
     },
   },
   {
-    accessorKey: "next_scan_at",
-    header: "Next scan",
+    accessorKey: "scheduled_at",
+    header: "Scheduled at",
     cell: ({ row }) => {
       const {
-        attributes: { next_scan_at },
+        attributes: { scheduled_at },
       } = getScanData(row);
-      return <DateWithTime dateTime={next_scan_at} />;
+      return <DateWithTime dateTime={scheduled_at} />;
     },
   },
   {