Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Replace window.confirm with ConfirmDialog component
Damian Legawiec75ab892827e6
diff --git a/packages/admin/src/components/confirm-dialog.tsx b/packages/admin/src/components/confirm-dialog.tsxnew file mode 100644index 0000000000..5439d5f5c6--- /dev/null+++ b/packages/admin/src/components/confirm-dialog.tsx@@ -0,0 +1,78 @@+import { createContext, useCallback, useContext, useRef, useState, type ReactNode } from 'react'+import { Button } from '@/components/ui/button'+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@/components/ui/dialog'++interface ConfirmOptions {+ title?: string+ message: string+ confirmLabel?: string+ cancelLabel?: string+ variant?: 'default' | 'destructive'+}++type ConfirmFn = (options: ConfirmOptions) => Promise<boolean>++const ConfirmContext = createContext<ConfirmFn | null>(null)++export function useConfirm(): ConfirmFn {+ const ctx = useContext(ConfirmContext)+ if (!ctx) throw new Error('useConfirm must be used within ConfirmProvider')+ return ctx+}++export function ConfirmProvider({ children }: { children: ReactNode }) {+ const [open, setOpen] = useState(false)+ const [options, setOptions] = useState<ConfirmOptions>({+ message: '',+ })+ const resolveRef = useRef<((value: boolean) => void) | null>(null)++ const confirm = useCallback((opts: ConfirmOptions): Promise<boolean> => {+ setOptions(opts)+ setOpen(true)+ return new Promise<boolean>((resolve) => {+ resolveRef.current = resolve+ })+ }, [])++ const handleClose = useCallback((confirmed: boolean) => {+ setOpen(false)+ resolveRef.current?.(confirmed)+ resolveRef.current = null+ }, [])++ return (+ <ConfirmContext.Provider value={confirm}>+ {children}+ <Dialog+ open={open}+ onOpenChange={(o) => { if (!o) handleClose(false) }}+ >+ <DialogContent showCloseButton={false}>+ <DialogHeader>+ <DialogTitle>{options.title ?? 'Are you sure?'}</DialogTitle>+ <DialogDescription>{options.message}</DialogDescription>+ </DialogHeader>+ <DialogFooter>+ <Button variant="outline" onClick={() => handleClose(false)}>+ {options.cancelLabel ?? 'Cancel'}+ </Button>+ <Button+ variant={options.variant === 'destructive' ? 'destructive' : 'default'}+ onClick={() => handleClose(true)}+ >+ {options.confirmLabel ?? 'Confirm'}+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ </ConfirmContext.Provider>+ )+}diff --git a/packages/admin/src/main.tsx b/packages/admin/src/main.tsxindex 7cd2574540..bbfb745b2b 100644--- a/packages/admin/src/main.tsx+++ b/packages/admin/src/main.tsx@@ -2,6 +2,7 @@ import { QueryClientProvider } from '@tanstack/react-query'import { RouterProvider } from '@tanstack/react-router'import { StrictMode } from 'react'import { createRoot } from 'react-dom/client'+import { ConfirmProvider } from '@/components/confirm-dialog'import { TooltipProvider } from '@/components/ui/tooltip'import { useAuth } from '@/hooks/use-auth'import { queryClient } from '@/lib/query-client'@@ -22,7 +23,9 @@ createRoot(document.getElementById('root')!).render(<AuthProvider><PermissionProvider><TooltipProvider>- <InnerApp />+ <ConfirmProvider>+ <InnerApp />+ </ConfirmProvider></TooltipProvider></PermissionProvider></AuthProvider>diff --git a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsxindex 7b0c999892..e367c99e62 100644--- a/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/orders/$orderId.tsx@@ -20,6 +20,7 @@ import {XCircleIcon,} from 'lucide-react'import { type FormEvent, useState } from 'react'+import { useConfirm } from '@/components/confirm-dialog'import { adminClient } from '@/client'import { Badge, StatusBadge } from '@/components/ui/badge'import { Button } from '@/components/ui/button'@@ -159,6 +160,7 @@ function OrderDetailPage() {function OrderHeader({ order }: { order: Order }) {const { orderId } = Route.useParams()+ const confirm = useConfirm()const backFallback = order.completed_at ? 'orders' : 'orders/drafts'@@ -211,8 +213,8 @@ function OrderHeader({ order }: { order: Order }) {{(order as any).state !== 'canceled' && (<DropdownMenuItemclassName="text-destructive focus:text-destructive"- onClick={() => {- if (window.confirm('Are you sure you want to cancel this order?')) {+ onClick={async () => {+ if (await confirm({ message: 'Are you sure you want to cancel this order?', variant: 'destructive', confirmLabel: 'Cancel Order' })) {cancelMutation.mutate(undefined)}}}@@ -355,6 +357,7 @@ function EditQuantityDialog({function LineItemsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()+ const confirm = useConfirm()const items = order.items ?? []const [addOpen, setAddOpen] = useState(false)@@ -448,8 +451,8 @@ function LineItemsCard({ order }: { order: Order }) {<DropdownMenuSeparator /><DropdownMenuItemclassName="text-destructive focus:text-destructive"- onClick={() => {- if (window.confirm('Remove this item from the order?')) {+ onClick={async () => {+ if (await confirm({ message: 'Remove this item from the order?', variant: 'destructive', confirmLabel: 'Remove' })) {deleteMutation.mutate(item.id)}}}@@ -550,6 +553,7 @@ function EditTrackingDialog({function ShipmentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()+ const confirm = useConfirm()const fulfillments = order.fulfillments ?? []const [editTracking, setEditTracking] = useState<{@@ -604,8 +608,8 @@ function ShipmentsCard({ order }: { order: Order }) {</DropdownMenuItem>{fulfillment.status === 'ready' && (<DropdownMenuItem- onClick={() => {- if (window.confirm('Ship this fulfillment?')) {+ onClick={async () => {+ if (await confirm({ message: 'Ship this fulfillment?', variant: 'default', confirmLabel: 'Fulfill' })) {fulfillMutation.mutate(fulfillment.id)}}}@@ -619,8 +623,8 @@ function ShipmentsCard({ order }: { order: Order }) {<DropdownMenuSeparator /><DropdownMenuItemclassName="text-destructive focus:text-destructive"- onClick={() => {- if (window.confirm('Cancel this fulfillment?')) {+ onClick={async () => {+ if (await confirm({ message: 'Cancel this fulfillment?', variant: 'destructive', confirmLabel: 'Cancel Fulfillment' })) {cancelFulfillmentMutation.mutate(fulfillment.id)}}}@@ -695,6 +699,7 @@ function ShipmentsCard({ order }: { order: Order }) {function PaymentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()+ const confirm = useConfirm()const payments = order.payments ?? []@@ -754,8 +759,8 @@ function PaymentsCard({ order }: { order: Order }) {<DropdownMenuContent align="end">{(payment.status === 'checkout' || payment.status === 'pending') && (<DropdownMenuItem- onClick={() => {- if (window.confirm('Capture this payment?')) {+ onClick={async () => {+ if (await confirm({ message: 'Capture this payment?', variant: 'default', confirmLabel: 'Capture' })) {captureMutation.mutate(payment.id)}}}@@ -769,8 +774,8 @@ function PaymentsCard({ order }: { order: Order }) {payment.status === 'completed') && (<DropdownMenuItemclassName="text-destructive focus:text-destructive"- onClick={() => {- if (window.confirm('Void this payment?')) {+ onClick={async () => {+ if (await confirm({ message: 'Void this payment?', variant: 'destructive', confirmLabel: 'Void Payment' })) {voidMutation.mutate(payment.id)}}}@@ -864,6 +869,7 @@ function AddAdjustmentDialog({function AdjustmentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()+ const confirm = useConfirm()const adjustments = (order.adjustments ?? []).filter((a) => a.source_type !== 'Spree::TaxRate' && a.source_type !== 'Spree::PromotionAction',@@ -922,8 +928,8 @@ function AdjustmentsCard({ order }: { order: Order }) {<DropdownMenuContent align="end"><DropdownMenuItemclassName="text-destructive focus:text-destructive"- onClick={() => {- if (window.confirm('Remove this adjustment?')) {+ onClick={async () => {+ if (await confirm({ message: 'Remove this adjustment?', variant: 'destructive', confirmLabel: 'Remove' })) {deleteMutation.mutate(adj.id)}}}diff --git a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsxindex ff131d6130..08c0da76a9 100644--- a/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx+++ b/packages/admin/src/routes/_authenticated/$storeId/products/$productId.tsx@@ -15,6 +15,7 @@ type Product = Omit<BaseProduct, 'master_variant' | 'variants'> & {import { zodResolver } from '@hookform/resolvers/zod'import { createFileRoute, useRouter } from '@tanstack/react-router'import { BackButton } from '@/components/back-button'+import { useConfirm } from '@/components/confirm-dialog'import {ImagePlusIcon,Loader2Icon,@@ -127,6 +128,7 @@ function ProductDetailPage() {// ---------------------------------------------------------------------------function ProductForm({ product }: { product: Product }) {+ const confirm = useConfirm()const { productId, storeId } = Route.useParams()const router = useRouter()const updateProduct = useUpdateProduct()@@ -153,7 +155,8 @@ function ProductForm({ product }: { product: Product }) {}const handleDelete = async () => {- if (!window.confirm('Are you sure you want to delete this product?')) return+ const confirmed = await confirm({ message: 'Are you sure you want to delete this product?', variant: 'destructive', confirmLabel: 'Delete' })+ if (!confirmed) returntry {await deleteProduct.mutateAsync(productId)toast.success('Product deleted')