From 896c466889a874486f6d0d02cfeaffe3d98ed35c Mon Sep 17 00:00:00 2001 From: Pablo Lara Date: Wed, 23 Apr 2025 15:13:05 +0200 Subject: [PATCH] chore: remove deprecated launch scan page from old 4-step workflow (#7592) --- .../(set-up-provider)/launch-scan/page.tsx | 50 ------ .../providers/workflow/forms/index.ts | 1 - .../workflow/forms/launch-scan-form.tsx | 160 ------------------ 3 files changed, 211 deletions(-) delete mode 100644 ui/app/(prowler)/providers/(set-up-provider)/launch-scan/page.tsx delete mode 100644 ui/components/providers/workflow/forms/launch-scan-form.tsx diff --git a/ui/app/(prowler)/providers/(set-up-provider)/launch-scan/page.tsx b/ui/app/(prowler)/providers/(set-up-provider)/launch-scan/page.tsx deleted file mode 100644 index cdfba93dbd..0000000000 --- a/ui/app/(prowler)/providers/(set-up-provider)/launch-scan/page.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import { redirect } from "next/navigation"; -import React, { Suspense } from "react"; - -import { getProvider } from "@/actions/providers"; -import { LaunchScanForm } from "@/components/providers/workflow/forms"; -import { SkeletonProviderWorkflow } from "@/components/providers/workflow/skeleton-provider-workflow"; - -interface Props { - searchParams: { type: string; id: string }; -} - -export default async function LaunchScanPage({ searchParams }: Props) { - const providerId = searchParams.id; - - if (!providerId) { - redirect("/providers/connect-account"); - } - - const formData = new FormData(); - formData.append("id", providerId); - - const providerData = await getProvider(formData); - - const isConnected = providerData?.data?.attributes?.connection?.connected; - - if (!isConnected) { - redirect("/providers/connect-account"); - } - - return ( - }> - - - ); -} - -async function SSRLaunchScan({ - searchParams, -}: { - searchParams: { type: string; id: string }; -}) { - const formData = new FormData(); - formData.append("id", searchParams.id); - - const providerData = await getProvider(formData); - - return ( - - ); -} diff --git a/ui/components/providers/workflow/forms/index.ts b/ui/components/providers/workflow/forms/index.ts index d7f0d07134..72e1624f77 100644 --- a/ui/components/providers/workflow/forms/index.ts +++ b/ui/components/providers/workflow/forms/index.ts @@ -1,5 +1,4 @@ export * from "./connect-account-form"; -export * from "./launch-scan-form"; export * from "./radio-group-aws-via-credentials-form"; export * from "./test-connection-form"; export * from "./update-via-credentials-form"; diff --git a/ui/components/providers/workflow/forms/launch-scan-form.tsx b/ui/components/providers/workflow/forms/launch-scan-form.tsx deleted file mode 100644 index 968fb8ffb9..0000000000 --- a/ui/components/providers/workflow/forms/launch-scan-form.tsx +++ /dev/null @@ -1,160 +0,0 @@ -"use client"; - -import { zodResolver } from "@hookform/resolvers/zod"; -import { useRouter } from "next/navigation"; -import { useState } from "react"; -import { useForm } from "react-hook-form"; -import { z } from "zod"; - -import { scanOnDemand } from "@/actions/scans/scans"; -import { AddIcon } from "@/components/icons"; -import { CustomButton } from "@/components/ui/custom"; -import { Form } from "@/components/ui/form"; -import { ProviderProps } from "@/types"; // Asegúrate de importar la interfaz correcta -import { launchScanFormSchema } from "@/types/formSchemas"; - -import { ProviderInfo } from "../../provider-info"; - -type FormValues = z.infer>; - -interface LaunchScanFormProps { - searchParams: { type: string; id: string }; - providerData: { - data: { - type: string; - id: string; - attributes: ProviderProps["attributes"]; - }; - }; -} - -export const LaunchScanForm = ({ - searchParams, - providerData, -}: LaunchScanFormProps) => { - const providerType = searchParams.type; - const providerId = searchParams.id; - - const [apiErrorMessage, setApiErrorMessage] = useState(null); - const router = useRouter(); - - const formSchema = launchScanFormSchema(); - - const form = useForm({ - resolver: zodResolver(formSchema), - defaultValues: { - providerId, - providerType, - scannerArgs: { - checksToExecute: [], - }, - }, - }); - - // const isLoading = form.formState.isSubmitting; - - const onSubmitClient = async (values: FormValues) => { - const formData = new FormData(); - formData.append("providerId", values.providerId); - - // Generate default scan name using provider type and current date - const date = new Date(); - const month = (date.getMonth() + 1).toString().padStart(2, "0"); - const day = date.getDate().toString().padStart(2, "0"); - const year = date.getFullYear(); - const defaultScanName = `${providerType}:${month}/${day}/${year}`; - - formData.append("scanName", defaultScanName); - - try { - const data = await scanOnDemand(formData); - - if (data.error) { - setApiErrorMessage(data.error); - form.setError("providerId", { - type: "server", - message: data.error, - }); - } else { - router.push("/scans"); - } - } catch (error) { - form.setError("providerId", { - type: "server", - message: "An unexpected error occurred. Please try again.", - }); - } - }; - - return ( -
- -
-
Scan started
-
- The scan has just started. From now on, a new scan will be launched - every 24 hours, starting from this moment. -
-
- - {apiErrorMessage && ( -
-

{apiErrorMessage.toLowerCase()}

-
- )} - - - - - - - {/*
- } - isDisabled={true} - > - Schedule - - } - > - {isLoading ? <>Loading : Start now} - -
*/} -
- } - > - Go to Scans - -
- - - ); -};