@vendure/dashboard 3.3.6-master-202507050232 → 3.4.0-minor-202506250934

package/src/lib/components/shared/translatable-form-field.tsx

@@ -1,9 +1,13 @@
-import { OverriddenFormComponent } from '@/vdb/framework/form-engine/overridden-form-component.js';
-import { LocationWrapper } from '@/vdb/framework/layout-engine/location-wrapper.js';
-import { useUserSettings } from '@/vdb/hooks/use-user-settings.js';
-import { Controller, ControllerProps, FieldPath, FieldValues } from 'react-hook-form';
-import { FormControl, FormDescription, FormItem, FormLabel, FormMessage } from '../ui/form.js';
+import { Controller } from 'react-hook-form';
+import { FieldPath } from 'react-hook-form';
+import { useUserSettings } from '@/hooks/use-user-settings.js';
+import { ControllerProps } from 'react-hook-form';
+import { FieldValues } from 'react-hook-form';
 import { FormFieldWrapper } from './form-field-wrapper.js';
+import { FormMessage } from '../ui/form.js';
+import { FormControl } from '../ui/form.js';
+import { FormItem } from '../ui/form.js';
+import { FormDescription, FormField, FormLabel } from '../ui/form.js';
 
 export type TranslatableEntity = FieldValues & {
     translations?: Array<{ languageCode: string }> | null;
@@ -51,33 +55,20 @@ export const TranslatableFormFieldWrapper = <
     label,
     description,
     render,
-    renderFormControl,
     ...props
 }: TranslatableFormFieldWrapperProps<TFieldValues>) => {
     return (
-        <LocationWrapper identifier={name as string}>
-            <TranslatableFormField
-                control={props.control}
-                name={name}
-                render={renderArgs => (
-                    <FormItem>
-                        {label && <FormLabel>{label}</FormLabel>}
-                        {renderFormControl ? (
-                            <FormControl>
-                                <OverriddenFormComponent field={renderArgs.field} fieldName={name as string}>
-                                    {render(renderArgs)}
-                                </OverriddenFormComponent>
-                            </FormControl>
-                        ) : (
-                            <OverriddenFormComponent field={renderArgs.field} fieldName={name as string}>
-                                {render(renderArgs)}
-                            </OverriddenFormComponent>
-                        )}
-                        {description && <FormDescription>{description}</FormDescription>}
-                        <FormMessage />
-                    </FormItem>
-                )}
-            />
-        </LocationWrapper>
+        <TranslatableFormField
+            control={props.control}
+            name={name}
+            render={renderArgs => (
+                <FormItem>
+                    {label && <FormLabel>{label}</FormLabel>}
+                    <FormControl>{render(renderArgs)}</FormControl>
+                    {description && <FormDescription>{description}</FormDescription>}
+                    <FormMessage />
+                </FormItem>
+            )}
+        />
     );
 };

package/src/lib/components/shared/vendure-image.tsx

@@ -1,4 +1,4 @@
-import { cn } from '@/vdb/lib/utils.js';
+import { cn } from '@/lib/utils.js';
 import { Image } from 'lucide-react';
 import React from 'react';
 
@@ -43,11 +43,7 @@ export function VendureImage({
     ...imgProps
 }: VendureImageProps) {
     if (!asset) {
-        return fallback ? (
-            <>{fallback}</>
-        ) : (
-            <PlaceholderImage preset={preset} width={width} height={height} className={className} />
-        );
+        return fallback ? <>{fallback}</> : <PlaceholderImage preset={preset} width={width} height={height} className={className} />;
     }
 
     // Build the URL with query parameters
@@ -79,15 +75,11 @@ export function VendureImage({
         url.searchParams.set('fpy', asset.focalPoint.y.toString());
     }
 
-    const minDimensions = getMinDimensions(preset, width, height);
-
     return (
         <img
             src={url.toString()}
             alt={alt || asset.name || ''}
             className={cn(className, 'rounded-sm')}
-            width={minDimensions.width}
-            height={minDimensions.height}
             style={style}
             loading="lazy"
             ref={ref}
@@ -96,27 +88,6 @@ export function VendureImage({
     );
 }
 
-function getMinDimensions(preset?: ImagePreset, width?: number, height?: number) {
-    if (preset) {
-        switch (preset) {
-            case 'tiny':
-                return { width: 50, height: 50 };
-            case 'thumb':
-                return { width: 150, height: 150 };
-            case 'small':
-                return { width: 300, height: 300 };
-            case 'medium':
-                return { width: 500, height: 500 };
-        }
-    }
-
-    if (width && height) {
-        return { width, height };
-    }
-
-    return { width: 100, height: 100 };
-}
-
 export function PlaceholderImage({
     width = 100,
     height = 100,

package/src/lib/components/shared/zone-selector.tsx

@@ -5,10 +5,10 @@ import {
     SelectItem,
     SelectTrigger,
     SelectValue,
-} from '@/vdb/components/ui/select.js';
-import { api } from '@/vdb/graphql/api.js';
-import { graphql } from '@/vdb/graphql/graphql.js';
-import { Trans } from '@/vdb/lib/trans.js';
+} from '@/components/ui/select.js';
+import { api } from '@/graphql/api.js';
+import { graphql } from '@/graphql/graphql.js';
+import { Trans } from '@/lib/trans.js';
 import { useQuery } from '@tanstack/react-query';
 import { Skeleton } from '../ui/skeleton.js';
 
@@ -28,7 +28,7 @@ export interface ZoneSelectorProps {
     onChange: (value: string) => void;
 }
 
-export function ZoneSelector({ value, onChange }: Readonly<ZoneSelectorProps>) {
+export function ZoneSelector({ value, onChange }: ZoneSelectorProps) {
     const { data, isLoading, isPending } = useQuery({
         queryKey: ['zones'],
         staleTime: 1000 * 60 * 5,
@@ -63,3 +63,4 @@ export function ZoneSelector({ value, onChange }: Readonly<ZoneSelectorProps>) {
         </Select>
     );
 }
+

package/src/lib/components/ui/accordion.tsx

@@ -1,8 +1,8 @@
+import * as React from 'react';
 import * as AccordionPrimitive from '@radix-ui/react-accordion';
 import { ChevronDownIcon } from 'lucide-react';
-import * as React from 'react';
 
-import { cn } from '@/vdb/lib/utils.js';
+import { cn } from '@/lib/utils.js';
 
 function Accordion({ ...props }: React.ComponentProps<typeof AccordionPrimitive.Root>) {
     return <AccordionPrimitive.Root data-slot="accordion" {...props} />;
@@ -56,4 +56,4 @@ function AccordionContent({
     );
 }
 
-export { Accordion, AccordionContent, AccordionItem, AccordionTrigger };
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };

package/src/lib/components/ui/alert-dialog.tsx

@@ -1,8 +1,8 @@
-import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
 import * as React from 'react';
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
 
-import { buttonVariants } from '@/vdb/components/ui/button.js';
-import { cn } from '@/vdb/lib/utils.js';
+import { cn } from '@/lib/utils.js';
+import { buttonVariants } from '@/components/ui/button.js';
 
 function AlertDialog({ ...props }: React.ComponentProps<typeof AlertDialogPrimitive.Root>) {
     return <AlertDialogPrimitive.Root data-slot="alert-dialog" {...props} />;
@@ -115,14 +115,14 @@ function AlertDialogCancel({
 
 export {
     AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
+    AlertDialogPortal,
+    AlertDialogOverlay,
+    AlertDialogTrigger,
     AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
     AlertDialogHeader,
-    AlertDialogOverlay,
-    AlertDialogPortal,
+    AlertDialogFooter,
     AlertDialogTitle,
-    AlertDialogTrigger,
+    AlertDialogDescription,
+    AlertDialogAction,
+    AlertDialogCancel,
 };

package/src/lib/components/ui/alert.tsx

@@ -1,7 +1,7 @@
-import { cva, type VariantProps } from 'class-variance-authority';
 import * as React from 'react';
+import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '@/vdb/lib/utils.js';
+import { cn } from '@/lib/utils.js';
 
 const alertVariants = cva(
     'relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current',
@@ -57,4 +57,4 @@ function AlertDescription({ className, ...props }: React.ComponentProps<'div'>)
     );
 }
 
-export { Alert, AlertDescription, AlertTitle };
+export { Alert, AlertTitle, AlertDescription };

package/src/lib/components/ui/badge.tsx

@@ -1,8 +1,8 @@
+import * as React from 'react';
 import { Slot } from '@radix-ui/react-slot';
 import { cva, type VariantProps } from 'class-variance-authority';
-import * as React from 'react';
 
-import { cn } from '@/vdb/lib/utils.js';
+import { cn } from '@/lib/utils.js';
 
 const badgeVariants = cva(
     'inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-auto',

package/src/lib/components/ui/breadcrumb.tsx

@@ -1,8 +1,8 @@
+import * as React from 'react';
 import { Slot } from '@radix-ui/react-slot';
 import { ChevronRight, MoreHorizontal } from 'lucide-react';
-import * as React from 'react';
 
-import { cn } from '@/vdb/lib/utils.js';
+import { cn } from '@/lib/utils.js';
 
 function Breadcrumb({ ...props }: React.ComponentProps<'nav'>) {
     return <nav aria-label="breadcrumb" data-slot="breadcrumb" {...props} />;
@@ -93,10 +93,10 @@ function BreadcrumbEllipsis({ className, ...props }: React.ComponentProps<'span'
 
 export {
     Breadcrumb,
-    BreadcrumbEllipsis,
+    BreadcrumbList,
     BreadcrumbItem,
     BreadcrumbLink,
-    BreadcrumbList,
     BreadcrumbPage,
     BreadcrumbSeparator,
+    BreadcrumbEllipsis,
 };

package/src/lib/components/ui/button.tsx

@@ -1,8 +1,8 @@
+import * as React from 'react';
 import { Slot } from '@radix-ui/react-slot';
 import { cva, type VariantProps } from 'class-variance-authority';
-import * as React from 'react';
 
-import { cn } from '@/vdb/lib/utils.js';
+import { cn } from '@/lib/utils.js';
 
 const buttonVariants = cva(
     'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
@@ -43,14 +43,7 @@ export interface ButtonProps
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
     ({ className, variant, size, asChild = false, ...props }, ref) => {
         const Comp = asChild ? Slot : 'button';
-        return (
-            <Comp
-                className={cn(buttonVariants({ variant, size, className }))}
-                type={props.type ?? 'button'}
-                ref={ref}
-                {...props}
-            />
-        );
+        return <Comp className={cn(buttonVariants({ variant, size, className }))} type={props.type ?? 'button'} ref={ref} {...props} />;
     },
 );
 Button.displayName = 'Button';