@vendure/dashboard 3.5.3-master-202601300300 → 3.5.3

package/src/i18n/locales/ar.po

@@ -754,6 +754,31 @@ msgstr "تم حذف الملاحظة بنجاح"
 msgid "Failed to delete note"
 msgstr "فشل حذف الملاحظة"
 
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:43
+#~ msgid "refundReason.CustomerRequest"
+#~ msgstr "طلب العميل"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:44
+#~ msgid "refundReason.NotAvailable"
+#~ msgstr "غير متاح"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:45
+#~ msgid "refundReason.DamagedInShipping"
+#~ msgstr "تضرر أثناء الشحن"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:46
+#~ msgid "refundReason.WrongItem"
+#~ msgstr "منتج خاطئ"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:47
+#~ msgid "refundReason.Other"
+#~ msgstr "أخرى"
+
 #: src/lib/components/data-table/human-readable-operator.tsx:26
 msgid "!="
 msgstr "!="
@@ -885,6 +910,10 @@ msgstr "إضافة مجموعة خيارات أخرى"
 msgid "Add asset"
 msgstr "إضافة ملف"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:25
+msgid "Add at least one item to the order"
+msgstr "أضف عنصرًا واحدًا على الأقل إلى الطلب"
+
 #: src/lib/components/layout/channel-switcher.tsx:212
 msgid "Add channel"
 msgstr "إضافة قناة"
@@ -1827,6 +1856,10 @@ msgstr "اكتمل طلب المسودة"
 msgid "Draft order deleted"
 msgstr "تم حذف طلب المسودة"
 
+#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx:336
+msgid "Draft order status"
+msgstr "حالة طلب المسودة"
+
 #: src/lib/components/data-input/custom-field-list-input.tsx:72
 msgid "Drag to reorder"
 msgstr "اسحب لإعادة الترتيب"
@@ -1893,7 +1926,7 @@ msgstr "تحرير التخطيط"
 msgid "Edit link"
 msgstr "تحرير الرابط"
 
-#: src/app/routes/_authenticated/_zones/zones.tsx:39
+#: src/app/routes/_authenticated/_zones/zones.tsx:40
 msgid "Edit members"
 msgstr "تحرير الأعضاء"
 
@@ -2350,7 +2383,7 @@ msgid "Failed to update global settings"
 msgstr "فشل تحديث الإعدادات العامة"
 
 #: src/app/routes/_authenticated/_orders/components/order-detail-shared.tsx:92
-#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:59
+#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:60
 msgid "Failed to update order"
 msgstr "فشل تحديث الطلب"
 
@@ -3352,6 +3385,10 @@ msgstr "إيقاف"
 msgid "Old email:"
 msgstr "البريد الإلكتروني القديم:"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:29
+msgid "Only draft orders can be completed"
+msgstr "يمكن إكمال طلبات المسودة فقط"
+
 #: src/app/routes/_authenticated/_products/products_.$id_.variants.tsx:269
 msgid "Option"
 msgstr "الخيار"
@@ -3417,6 +3454,14 @@ msgstr "تم تحديث الحقول المخصصة للطلب"
 msgid "Order delivered"
 msgstr "تم تسليم الطلب"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:36
+msgid "Order draft is ready to be completed"
+msgstr "طلب المسودة جاهز للإكمال"
+
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:34
+msgid "Order draft isn't ready to be completed"
+msgstr "طلب المسودة غير جاهز للإكمال"
+
 #: src/app/routes/_authenticated/_orders/components/order-history/order-history-utils.tsx:75
 msgid "Order fulfilled"
 msgstr "تم تنفيذ الطلب"
@@ -3851,7 +3896,7 @@ msgstr "الاستردادات ({0})"
 msgid "Regenerate slug from source field"
 msgstr "إعادة إنشاء الرابط المختصر من الحقل المصدر"
 
-#: src/app/routes/_authenticated/_zones/zones.tsx:36
+#: src/app/routes/_authenticated/_zones/zones.tsx:37
 msgid "Regions"
 msgstr "المناطق"
 
@@ -4089,6 +4134,10 @@ msgstr "حدد بلدًا"
 msgid "Select a currency"
 msgstr "حدد عملة"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:23
+msgid "Select a customer to continue"
+msgstr "اختر عميلاً للمتابعة"
+
 #: src/app/routes/_authenticated/_collections/components/move-collections-dialog.tsx:83
 msgid "Select a destination collection"
 msgstr "حدد مجموعة وجهة"
@@ -4213,7 +4262,11 @@ msgstr "طلبات البائعين"
 msgid "Sellers"
 msgstr "البائعون"
 
-#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx:394
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:27
+msgid "Set a shipping address and select a shipping method"
+msgstr "قم بتعيين عنوان الشحن واختيار طريقة الشحن"
+
+#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx:414
 msgid "Set custom fields"
 msgstr "تعيين الحقول المخصصة"
 
@@ -4594,7 +4647,7 @@ msgid "Successfully updated global settings"
 msgstr "تم تحديث الإعدادات العامة بنجاح"
 
 #: src/app/routes/_authenticated/_orders/components/order-detail-shared.tsx:88
-#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:55
+#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:56
 msgid "Successfully updated order"
 msgstr "تم تحديث الطلب بنجاح"
 

package/src/i18n/locales/en.po

@@ -754,6 +754,31 @@ msgstr "Note deleted successfully"
 msgid "Failed to delete note"
 msgstr "Failed to delete note"
 
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:43
+#~ msgid "refundReason.CustomerRequest"
+#~ msgstr "Customer request"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:44
+#~ msgid "refundReason.NotAvailable"
+#~ msgstr "Item not available"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:45
+#~ msgid "refundReason.DamagedInShipping"
+#~ msgstr "Damaged in shipping"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:46
+#~ msgid "refundReason.WrongItem"
+#~ msgstr "Wrong item shipped"
+
+#. js-lingui-explicit-id
+#: src/i18n/common-strings.ts:47
+#~ msgid "refundReason.Other"
+#~ msgstr "Other"
+
 #: src/lib/components/data-table/human-readable-operator.tsx:26
 msgid "!="
 msgstr "!="
@@ -885,6 +910,10 @@ msgstr "Add another option group"
 msgid "Add asset"
 msgstr "Add asset"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:25
+msgid "Add at least one item to the order"
+msgstr "Add at least one item to the order"
+
 #: src/lib/components/layout/channel-switcher.tsx:212
 msgid "Add channel"
 msgstr "Add channel"
@@ -1827,6 +1856,10 @@ msgstr "Draft order completed"
 msgid "Draft order deleted"
 msgstr "Draft order deleted"
 
+#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx:336
+msgid "Draft order status"
+msgstr "Draft order status"
+
 #: src/lib/components/data-input/custom-field-list-input.tsx:72
 msgid "Drag to reorder"
 msgstr "Drag to reorder"
@@ -1893,7 +1926,7 @@ msgstr "Edit Layout"
 msgid "Edit link"
 msgstr "Edit link"
 
-#: src/app/routes/_authenticated/_zones/zones.tsx:39
+#: src/app/routes/_authenticated/_zones/zones.tsx:40
 msgid "Edit members"
 msgstr "Edit members"
 
@@ -2350,7 +2383,7 @@ msgid "Failed to update global settings"
 msgstr "Failed to update global settings"
 
 #: src/app/routes/_authenticated/_orders/components/order-detail-shared.tsx:92
-#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:59
+#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:60
 msgid "Failed to update order"
 msgstr "Failed to update order"
 
@@ -3352,6 +3385,10 @@ msgstr "Off"
 msgid "Old email:"
 msgstr "Old email:"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:29
+msgid "Only draft orders can be completed"
+msgstr "Only draft orders can be completed"
+
 #: src/app/routes/_authenticated/_products/products_.$id_.variants.tsx:269
 msgid "Option"
 msgstr "Option"
@@ -3417,6 +3454,14 @@ msgstr "Order custom fields updated"
 msgid "Order delivered"
 msgstr "Order delivered"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:36
+msgid "Order draft is ready to be completed"
+msgstr "Order draft is ready to be completed"
+
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:34
+msgid "Order draft isn't ready to be completed"
+msgstr "Order draft isn't ready to be completed"
+
 #: src/app/routes/_authenticated/_orders/components/order-history/order-history-utils.tsx:75
 msgid "Order fulfilled"
 msgstr "Order fulfilled"
@@ -3851,7 +3896,7 @@ msgstr "Refunds ({0})"
 msgid "Regenerate slug from source field"
 msgstr "Regenerate slug from source field"
 
-#: src/app/routes/_authenticated/_zones/zones.tsx:36
+#: src/app/routes/_authenticated/_zones/zones.tsx:37
 msgid "Regions"
 msgstr "Regions"
 
@@ -4089,6 +4134,10 @@ msgstr "Select a country"
 msgid "Select a currency"
 msgstr "Select a currency"
 
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:23
+msgid "Select a customer to continue"
+msgstr "Select a customer to continue"
+
 #: src/app/routes/_authenticated/_collections/components/move-collections-dialog.tsx:83
 msgid "Select a destination collection"
 msgstr "Select a destination collection"
@@ -4213,7 +4262,11 @@ msgstr "Seller orders"
 msgid "Sellers"
 msgstr "Sellers"
 
-#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx:394
+#: src/app/routes/_authenticated/_orders/components/draft-order-status.tsx:27
+msgid "Set a shipping address and select a shipping method"
+msgstr "Set a shipping address and select a shipping method"
+
+#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx:414
 msgid "Set custom fields"
 msgstr "Set custom fields"
 
@@ -4594,7 +4647,7 @@ msgid "Successfully updated global settings"
 msgstr "Successfully updated global settings"
 
 #: src/app/routes/_authenticated/_orders/components/order-detail-shared.tsx:88
-#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:55
+#: src/app/routes/_authenticated/_orders/orders_.$id_.modify.tsx:56
 msgid "Successfully updated order"
 msgstr "Successfully updated order"
 

package/src/lib/components/data-input/index.ts

@@ -4,6 +4,7 @@ export * from './customer-group-input.js';
 export * from './datetime-input.js';
 export * from './facet-value-input.js';
 export * from './money-input.js';
+export * from './number-input.js';
 export * from './rich-text-input.js';
 export * from './select-with-options.js';
 

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

@@ -19,6 +19,8 @@ const alertVariants = cva(
     },
 );
 
+export type AlertVariants = NonNullable<VariantProps<typeof alertVariants>>['variant'];
+
 function Alert({
     className,
     variant,

package/src/lib/framework/extension-api/input-component-extensions.tsx

@@ -4,6 +4,7 @@ import {
     CustomerGroupInput,
     FacetValueInput,
     MoneyInput,
+    NumberInput,
     ProductMultiInput,
     RichTextInput,
     SelectWithOptions,
@@ -39,6 +40,7 @@ inputComponents.set('relation-form-input', DefaultRelationInput);
 inputComponents.set('select-form-input', SelectWithOptions);
 inputComponents.set('product-multi-form-input', ProductMultiInput);
 inputComponents.set('combination-mode-form-input', CombinationModeInput);
+inputComponents.set('number-form-input', NumberInput);
 inputComponents.set('text-form-input', TextInput);
 
 export function getInputComponent(id: string | undefined): DashboardFormComponent | undefined {

package/src/lib/framework/form-engine/form-schema-tools.ts

@@ -309,7 +309,10 @@ export function createFormSchemaFromFields(
                 customFieldConfigs && customFieldConfigs.length > 0
                     ? processCustomFieldsSchema(customFieldConfigs, isTranslationContext)
                     : {};
-            schemaConfig[field.name] = z.object(customFieldsSchema).optional();
+            // Use .passthrough() to preserve custom field values that aren't in the schema
+            // This is essential for nested entities (e.g., ProductVariantPrice) whose custom
+            // field configs aren't passed to the parent form schema builder
+            schemaConfig[field.name] = z.object(customFieldsSchema).passthrough().optional();
         } else if (field.typeInfo) {
             const isNestedTranslationContext = field.name === 'translations' || isTranslationContext;
             let nestedType: ZodType = createFormSchemaFromFields(

package/src/lib/framework/page/detail-page-route-loader.tsx

@@ -16,7 +16,7 @@ export interface DetailPageRouteLoaderConfig<T extends TypedDocumentNode<any, an
      * the detail query document) get correctly applied at the route loader level.
      */
     pageId?: string;
-    queryDocument: T;
+    queryDocument: T | (() => T);
     breadcrumb: (
         isNew: boolean,
         entity: DetailEntity<T>,
@@ -38,12 +38,14 @@ export function detailPageRouteLoader<T extends TypedDocumentNode<any, any>>({
         params: any;
         location: ParsedLocation;
     }) => {
+        const resolvedQueryDocument = typeof queryDocument === 'function' ? queryDocument() : queryDocument;
+
         if (!params.id) {
             throw new Error('ID param is required');
         }
         const isNew = params.id === NEW_ENTITY_PATH;
         const { extendedQuery: extendedQueryDocument } = extendDetailFormQuery(
-            addCustomFields(queryDocument),
+            addCustomFields(resolvedQueryDocument),
             pageId,
         );
         const result = isNew
@@ -53,8 +55,8 @@ export function detailPageRouteLoader<T extends TypedDocumentNode<any, any>>({
                   { id: params.id },
               );
 
-        const entityField = getQueryName(queryDocument);
-        const entityName = getQueryTypeFieldInfo(queryDocument)?.type;
+        const entityField = getQueryName(resolvedQueryDocument);
+        const entityName = getQueryTypeFieldInfo(resolvedQueryDocument)?.type;
 
         if (!isNew && !result[entityField]) {
             throw new Error(`${entityName} with the ID ${params.id} was not found`);

package/src/lib/framework/page/detail-page.tsx

@@ -1,25 +1,20 @@
-import { DateTimeInput } from '@/vdb/components/data-input/datetime-input.js';
 import { FormFieldWrapper } from '@/vdb/components/shared/form-field-wrapper.js';
+import { TranslatableFormFieldWrapper } from '@/vdb/components/shared/translatable-form-field.js';
 import { Button } from '@/vdb/components/ui/button.js';
-import { Checkbox } from '@/vdb/components/ui/checkbox.js';
-import { Input } from '@/vdb/components/ui/input.js';
 import { NEW_ENTITY_PATH } from '@/vdb/constants.js';
+import { DefaultInputForType } from '@/vdb/framework/form-engine/default-input-for-type.js';
 import { useDetailPage } from '@/vdb/framework/page/use-detail-page.js';
 import type { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import { Trans } from '@lingui/react/macro';
 import { AnyRoute, useNavigate } from '@tanstack/react-router';
 import { ResultOf, VariablesOf } from 'gql.tada';
 import { toast } from 'sonner';
+import { ControllerRenderProps, FieldPath, FieldValues } from 'react-hook-form';
 import {
     FieldInfo,
     getEntityName,
     getOperationVariablesFields,
 } from '../document-introspection/get-document-structure.js';
-
-import { NumberInput } from '@/vdb/components/data-input/number-input.js';
-import { TranslatableFormFieldWrapper } from '@/vdb/components/shared/translatable-form-field.js';
-import { FormControl } from '@/vdb/components/ui/form.js';
-import { ControllerRenderProps, FieldPath, FieldValues } from 'react-hook-form';
 import {
     CustomFieldsPageBlock,
     DetailFormGrid,
@@ -97,6 +92,18 @@ export interface DetailPageFieldProps<
     field: ControllerRenderProps<TFieldValues, TName>;
 }
 
+/**
+ * Maps GraphQL schema types (PascalCase) to form engine types (lowercase)
+ */
+const graphqlTypeMap: Record<string, string> = {
+    Int: 'int',
+    Float: 'float',
+    Boolean: 'boolean',
+    DateTime: 'datetime',
+    String: 'string',
+    ID: 'string',
+};
+
 /**
  * Renders form input components based on field type
  */
@@ -104,33 +111,13 @@ function FieldInputRenderer<
     TFieldValues extends FieldValues = FieldValues,
     TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
 >({ fieldInfo, field }: DetailPageFieldProps<TFieldValues, TName>) {
-    switch (fieldInfo.type) {
-        case 'Int':
-        case 'Float':
-            return (
-                <FormControl>
-                    <NumberInput {...field} />
-                </FormControl>
-            );
-        case 'DateTime':
-            return (
-                <FormControl>
-                    <DateTimeInput {...field} />
-                </FormControl>
-            );
-        case 'Boolean':
-            return (
-                <FormControl>
-                    <Checkbox value={field.value} onCheckedChange={field.onChange} />
-                </FormControl>
-            );
-        default:
-            return (
-                <FormControl>
-                    <Input {...field} />
-                </FormControl>
-            );
-    }
+    const type = graphqlTypeMap[fieldInfo.type] ?? 'string';
+    return (
+        <DefaultInputForType
+            {...field}
+            fieldDef={{ type, name: fieldInfo.name } as any}
+        />
+    );
 }
 
 /**
@@ -219,7 +206,6 @@ export function DetailPage<
                                         control={form.control}
                                         name={fieldInfo.name as never}
                                         label={fieldInfo.name}
-                                        renderFormControl={false}
                                         render={({ field }) => (
                                             <FieldInputRenderer fieldInfo={fieldInfo} field={field} />
                                         )}
@@ -237,7 +223,6 @@ export function DetailPage<
                                         control={form.control}
                                         name={fieldInfo.name as never}
                                         label={fieldInfo.name}
-                                        renderFormControl={false}
                                         render={({ field }) => (
                                             <FieldInputRenderer fieldInfo={fieldInfo} field={field} />
                                         )}