diff --git a/ui/app/(prowler)/lighthouse/config/(connect-llm)/layout.tsx b/ui/app/(prowler)/lighthouse/config/(connect-llm)/layout.tsx index fa058f9c09..61579abcb0 100644 --- a/ui/app/(prowler)/lighthouse/config/(connect-llm)/layout.tsx +++ b/ui/app/(prowler)/lighthouse/config/(connect-llm)/layout.tsx @@ -14,8 +14,8 @@ import { import { DeleteLLMProviderForm } from "@/components/lighthouse/forms/delete-llm-provider-form"; import { WorkflowConnectLLM } from "@/components/lighthouse/workflow"; import { Button } from "@/components/shadcn"; +import { Modal } from "@/components/shadcn/modal"; import { NavigationHeader } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import type { LighthouseProvider } from "@/types/lighthouse"; interface ConnectLLMLayoutProps { @@ -63,8 +63,8 @@ export default function ConnectLLMLayout({ children }: ConnectLLMLayoutProps) { return ( <> - - + {/* Delete Confirmation Modal */} - - +
diff --git a/ui/app/(prowler)/mutelist/_components/simple/mute-rules-table-client.tsx b/ui/app/(prowler)/mutelist/_components/simple/mute-rules-table-client.tsx index a88d57972a..b5e9e45e74 100644 --- a/ui/app/(prowler)/mutelist/_components/simple/mute-rules-table-client.tsx +++ b/ui/app/(prowler)/mutelist/_components/simple/mute-rules-table-client.tsx @@ -8,8 +8,8 @@ import { useActionState, useEffect, useRef, useState } from "react"; import { deleteMuteRule } from "@/actions/mute-rules"; import { MuteRuleData } from "@/actions/mute-rules/types"; import { Button } from "@/components/shadcn"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import { DataTable } from "@/components/ui/table"; import { MetaDataProps } from "@/types"; @@ -82,8 +82,8 @@ export function MuteRulesTableClient({ {/* Edit Modal */} {selectedMuteRule && ( - - + )} {/* Delete Confirmation Modal */} {selectedMuteRule && ( - - + )} ); diff --git a/ui/components/findings/mute-findings-modal.tsx b/ui/components/findings/mute-findings-modal.tsx index 0f4b95e6ad..c1ffa774d8 100644 --- a/ui/components/findings/mute-findings-modal.tsx +++ b/ui/components/findings/mute-findings-modal.tsx @@ -11,8 +11,8 @@ import { import { createMuteRule } from "@/actions/mute-rules"; import { MuteRuleActionState } from "@/actions/mute-rules/types"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import { FormButtons } from "@/components/ui/form"; interface MuteFindingsModalProps { @@ -44,6 +44,7 @@ export function MuteFindingsModal({ useEffect(() => { if (state?.success) { + console.log("[MuteFindingsModal] success, calling onComplete:", !!onCompleteRef.current); toast({ title: "Success", description: state.success, @@ -65,8 +66,8 @@ export function MuteFindingsModal({ }; return ( - -
+ ); } diff --git a/ui/components/findings/send-to-jira-modal.tsx b/ui/components/findings/send-to-jira-modal.tsx index aae94afe4d..a692fe20b7 100644 --- a/ui/components/findings/send-to-jira-modal.tsx +++ b/ui/components/findings/send-to-jira-modal.tsx @@ -15,8 +15,8 @@ import { sendFindingToJira, } from "@/actions/integrations/jira-dispatch"; import { JiraIcon } from "@/components/icons/services/IconServices"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import { CustomBanner } from "@/components/ui/custom/custom-banner"; import { Form, @@ -215,8 +215,8 @@ export const SendToJiraModal = ({ // }, [issueTypes, searchIssueTypeValue]); return ( - - + ); }; diff --git a/ui/components/integrations/jira/jira-integrations-manager.tsx b/ui/components/integrations/jira/jira-integrations-manager.tsx index 0ad5f58f9a..3802ad4080 100644 --- a/ui/components/integrations/jira/jira-integrations-manager.tsx +++ b/ui/components/integrations/jira/jira-integrations-manager.tsx @@ -16,8 +16,8 @@ import { IntegrationSkeleton, } from "@/components/integrations/shared"; import { Button } from "@/components/shadcn"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import { DataTablePagination } from "@/components/ui/table/data-table-pagination"; import { triggerTestConnectionWithDelay } from "@/lib/integrations/test-connection-helper"; import { MetaDataProps } from "@/types"; @@ -209,8 +209,8 @@ export const JiraIntegrationsManager = ({ return ( <> - - + - - +
{/* Header with Add Button */} diff --git a/ui/components/integrations/s3/s3-integrations-manager.tsx b/ui/components/integrations/s3/s3-integrations-manager.tsx index 6246f941fe..493ae6fc70 100644 --- a/ui/components/integrations/s3/s3-integrations-manager.tsx +++ b/ui/components/integrations/s3/s3-integrations-manager.tsx @@ -16,8 +16,8 @@ import { IntegrationSkeleton, } from "@/components/integrations/shared"; import { Button } from "@/components/shadcn"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import { DataTablePagination } from "@/components/ui/table/data-table-pagination"; import { triggerTestConnectionWithDelay } from "@/lib/integrations/test-connection-helper"; import { MetaDataProps } from "@/types"; @@ -209,8 +209,8 @@ export const S3IntegrationsManager = ({ return ( <> -
- + - - +
{/* Header with Add Button */} diff --git a/ui/components/integrations/saml/saml-integration-card.tsx b/ui/components/integrations/saml/saml-integration-card.tsx index ca5c752154..f1b5c2c966 100644 --- a/ui/components/integrations/saml/saml-integration-card.tsx +++ b/ui/components/integrations/saml/saml-integration-card.tsx @@ -5,8 +5,8 @@ import { useState } from "react"; import { deleteSamlConfig } from "@/actions/integrations"; import { Button } from "@/components/shadcn"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import { CustomLink } from "@/components/ui/custom/custom-link"; import { Card, CardContent, CardHeader } from "../../shadcn"; @@ -53,8 +53,8 @@ export const SamlIntegrationCard = ({ samlConfig }: { samlConfig?: any }) => { return ( <> {/* Configure SAML Modal */} - @@ -62,11 +62,11 @@ export const SamlIntegrationCard = ({ samlConfig }: { samlConfig?: any }) => { setIsOpen={setIsSamlModalOpen} samlConfig={samlConfig} /> - + {/* Delete Confirmation Modal */} - {
- + diff --git a/ui/components/integrations/security-hub/security-hub-integrations-manager.tsx b/ui/components/integrations/security-hub/security-hub-integrations-manager.tsx index 270318008a..40f8c9dc9c 100644 --- a/ui/components/integrations/security-hub/security-hub-integrations-manager.tsx +++ b/ui/components/integrations/security-hub/security-hub-integrations-manager.tsx @@ -17,8 +17,8 @@ import { IntegrationSkeleton, } from "@/components/integrations/shared"; import { Button } from "@/components/shadcn"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; -import { CustomAlertModal } from "@/components/ui/custom"; import { DataTablePagination } from "@/components/ui/table/data-table-pagination"; import { triggerTestConnectionWithDelay } from "@/lib/integrations/test-connection-helper"; import { MetaDataProps } from "@/types"; @@ -259,8 +259,8 @@ export const SecurityHubIntegrationsManager = ({ return ( <> - - + - - +
diff --git a/ui/components/invitations/table/data-table-row-actions.tsx b/ui/components/invitations/table/data-table-row-actions.tsx index 320f84fc35..4ec5f50e79 100644 --- a/ui/components/invitations/table/data-table-row-actions.tsx +++ b/ui/components/invitations/table/data-table-row-actions.tsx @@ -19,7 +19,7 @@ import { useState } from "react"; import { VerticalDotsIcon } from "@/components/icons"; import { Button } from "@/components/shadcn"; -import { CustomAlertModal } from "@/components/ui/custom"; +import { Modal } from "@/components/shadcn/modal"; import { DeleteForm, EditForm } from "../forms"; @@ -44,8 +44,8 @@ export function DataTableRowActions({ return ( <> - @@ -56,15 +56,15 @@ export function DataTableRowActions({ roles={roles || []} setIsOpen={setIsEditOpen} /> - - + - +
({ return ( <> - - +
({ return ( <> - @@ -71,15 +71,15 @@ export function DataTableRowActions({ providerAlias={providerAlias} setIsOpen={setIsEditOpen} /> - - + - +
{ @@ -34,14 +34,14 @@ export function DataTableRowActions({ const roleId = (row.original as { id: string }).id; return ( <> - - +
({ return ( <> - @@ -49,7 +49,7 @@ export function DataTableRowActions({ scanName={scanName} setIsOpen={setIsEditOpen} /> - +
void; - title?: string; - description?: string; - children: ReactNode; - size?: "sm" | "md" | "lg" | "xl" | "2xl" | "3xl" | "4xl" | "5xl"; -} - -const sizeClasses = { - sm: "sm:max-w-sm", - md: "sm:max-w-md", - lg: "sm:max-w-lg", - xl: "sm:max-w-xl", - "2xl": "sm:max-w-2xl", - "3xl": "sm:max-w-3xl", - "4xl": "sm:max-w-4xl", - "5xl": "sm:max-w-5xl", -} as const; - -export const CustomAlertModal = ({ - isOpen, - onOpenChange, - title, - description, - children, - size = "xl", -}: CustomAlertModalProps) => { - return ( - - - {title && ( - - {title} - {description && ( - - {description} - - )} - - )} - {children} - - - ); -}; diff --git a/ui/components/ui/custom/index.ts b/ui/components/ui/custom/index.ts index 19e8fef2f4..0007e08580 100644 --- a/ui/components/ui/custom/index.ts +++ b/ui/components/ui/custom/index.ts @@ -1,4 +1,3 @@ -export * from "./custom-alert-modal"; export * from "./custom-banner"; export * from "./custom-dropdown-selection"; export * from "./custom-input"; diff --git a/ui/components/users/profile/api-key-success-modal.tsx b/ui/components/users/profile/api-key-success-modal.tsx index 4379b0b076..c3e039cab8 100644 --- a/ui/components/users/profile/api-key-success-modal.tsx +++ b/ui/components/users/profile/api-key-success-modal.tsx @@ -3,8 +3,8 @@ import { Snippet } from "@heroui/snippet"; import { Button } from "@/components/shadcn"; +import { Modal } from "@/components/shadcn/modal"; import { Alert, AlertDescription } from "@/components/ui/alert/Alert"; -import { CustomAlertModal } from "@/components/ui/custom/custom-alert-modal"; interface ApiKeySuccessModalProps { isOpen: boolean; @@ -18,8 +18,8 @@ export const ApiKeySuccessModal = ({ apiKey, }: ApiKeySuccessModalProps) => { return ( - !open && onClose()} title="API Key Created Successfully" > @@ -56,6 +56,6 @@ export const ApiKeySuccessModal = ({ Acknowledged
- + ); }; diff --git a/ui/components/users/profile/create-api-key-modal.tsx b/ui/components/users/profile/create-api-key-modal.tsx index 5f99c1d0fb..a76fe8d53b 100644 --- a/ui/components/users/profile/create-api-key-modal.tsx +++ b/ui/components/users/profile/create-api-key-modal.tsx @@ -5,9 +5,9 @@ import { useForm } from "react-hook-form"; import * as z from "zod"; import { createApiKey } from "@/actions/api-keys/api-keys"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; import { CustomInput } from "@/components/ui/custom"; -import { CustomAlertModal } from "@/components/ui/custom/custom-alert-modal"; import { CustomLink } from "@/components/ui/custom/custom-link"; import { Form, FormButtons } from "@/components/ui/form"; @@ -86,8 +86,8 @@ export const CreateApiKeyModal = ({ }; return ( - !open && handleClose()} title="Create API Key" size="lg" @@ -139,6 +139,6 @@ export const CreateApiKeyModal = ({ /> - + ); }; diff --git a/ui/components/users/profile/edit-api-key-name-modal.tsx b/ui/components/users/profile/edit-api-key-name-modal.tsx index 460c39419e..b015f7b732 100644 --- a/ui/components/users/profile/edit-api-key-name-modal.tsx +++ b/ui/components/users/profile/edit-api-key-name-modal.tsx @@ -6,9 +6,9 @@ import { useForm } from "react-hook-form"; import * as z from "zod"; import { updateApiKey } from "@/actions/api-keys/api-keys"; +import { Modal } from "@/components/shadcn/modal"; import { useToast } from "@/components/ui"; import { CustomInput } from "@/components/ui/custom"; -import { CustomAlertModal } from "@/components/ui/custom/custom-alert-modal"; import { Form, FormButtons } from "@/components/ui/form"; import { EnrichedApiKey } from "./api-keys/types"; @@ -92,8 +92,8 @@ export const EditApiKeyNameModal = ({ }; return ( - !open && handleClose()} title="Edit API Key Name" size="lg" @@ -129,6 +129,6 @@ export const EditApiKeyNameModal = ({ /> - + ); }; diff --git a/ui/components/users/profile/membership-item.tsx b/ui/components/users/profile/membership-item.tsx index 1099e326ae..b13574ad8e 100644 --- a/ui/components/users/profile/membership-item.tsx +++ b/ui/components/users/profile/membership-item.tsx @@ -4,7 +4,7 @@ import { Chip } from "@heroui/chip"; import { useState } from "react"; import { Button, Card } from "@/components/shadcn"; -import { CustomAlertModal } from "@/components/ui/custom"; +import { Modal } from "@/components/shadcn/modal"; import { DateWithTime, InfoField } from "@/components/ui/entities"; import { MembershipDetailData } from "@/types/users"; @@ -25,17 +25,13 @@ export const MembershipItem = ({ return ( <> - + - +
diff --git a/ui/components/users/profile/revoke-api-key-modal.tsx b/ui/components/users/profile/revoke-api-key-modal.tsx index ff5bf507fa..781440bc92 100644 --- a/ui/components/users/profile/revoke-api-key-modal.tsx +++ b/ui/components/users/profile/revoke-api-key-modal.tsx @@ -4,12 +4,12 @@ import { Snippet } from "@heroui/snippet"; import { Trash2Icon } from "lucide-react"; import { revokeApiKey } from "@/actions/api-keys/api-keys"; +import { Modal } from "@/components/shadcn/modal"; import { Alert, AlertDescription, AlertTitle, } from "@/components/ui/alert/Alert"; -import { CustomAlertModal } from "@/components/ui/custom/custom-alert-modal"; import { ModalButtons } from "@/components/ui/custom/custom-modal-buttons"; import { FALLBACK_VALUES } from "./api-keys/constants"; @@ -49,8 +49,8 @@ export const RevokeApiKeyModal = ({ }); return ( - !open && handleClose()} title="Revoke API Key" size="lg" @@ -95,6 +95,6 @@ export const RevokeApiKeyModal = ({ submitColor="danger" submitIcon={} /> - + ); }; diff --git a/ui/components/users/table/data-table-row-actions.tsx b/ui/components/users/table/data-table-row-actions.tsx index 23b673cf98..41f81290da 100644 --- a/ui/components/users/table/data-table-row-actions.tsx +++ b/ui/components/users/table/data-table-row-actions.tsx @@ -17,7 +17,7 @@ import { useState } from "react"; import { VerticalDotsIcon } from "@/components/icons"; import { Button } from "@/components/shadcn"; -import { CustomAlertModal } from "@/components/ui/custom"; +import { Modal } from "@/components/shadcn/modal"; import { DeleteForm, EditForm } from "../forms"; @@ -41,8 +41,8 @@ export function DataTableRowActions({ return ( <> - @@ -55,15 +55,15 @@ export function DataTableRowActions({ roles={roles || []} setIsOpen={setIsEditOpen} /> - - + - +