@vendure/dashboard 3.5.3-master-202601300300 → 3.5.3

package/dist/vite/utils/plugin-discovery.js

@@ -323,9 +323,9 @@ export async function findVendurePluginFiles({ outputPath, vendureConfigPath, lo
     const globStart = Date.now();
     const files = await glob(patterns, {
         ignore: [
-            // Skip nested node_modules (transitive deps) but not .pnpm directory.
-            // [!.] ensures .pnpm paths are kept since pnpm stores all packages there.
-            '**/node_modules/[!.pnpm]*/**/node_modules/**',
+            // Skip nested node_modules (transitive deps) but not .pnpm or .bun directories.
+            // [!.] excludes paths starting with . since pnpm and bun store packages there.
+            '**/node_modules/[!.]*/**/node_modules/**',
             '**/*.spec.js',
             '**/*.test.js',
         ],

package/dist/vite/vite-plugin-lingui-babel.d.ts

@@ -1,4 +1,14 @@
 import type { Plugin } from 'vite';
+/**
+ * Options for the linguiBabelPlugin.
+ */
+export interface LinguiBabelPluginOptions {
+    /**
+     * For testing: manually specify package paths that should have Lingui macros transformed.
+     * In production, these are automatically discovered from the VendureConfig plugins.
+     */
+    additionalPackagePaths?: string[];
+}
 /**
  * @description
  * A custom Vite plugin that transforms Lingui macros in files using Babel instead of SWC.
@@ -17,11 +27,14 @@ import type { Plugin } from 'vite';
  * - `@vendure/dashboard/src` files (in node_modules for external projects)
  * - `packages/dashboard/src` files (in monorepo development)
  * - User's dashboard extension files (e.g., custom plugins using Lingui)
+ * - Third-party npm packages that provide dashboard extensions (discovered automatically)
  *
  * Files NOT processed:
- * - Other node_modules packages (they shouldn't contain Lingui macros)
+ * - Files that don't contain Lingui macro imports (fast check via string matching)
+ * - Non-JS/TS files
+ * - node_modules packages that are not discovered as Vendure plugins
  *
  * @see https://github.com/vendurehq/vendure/issues/3929
  * @see https://github.com/lingui/swc-plugin/issues/179
  */
-export declare function linguiBabelPlugin(): Plugin;
+export declare function linguiBabelPlugin(options?: LinguiBabelPluginOptions): Plugin;

package/dist/vite/vite-plugin-lingui-babel.js

@@ -1,4 +1,5 @@
 import * as babel from '@babel/core';
+import { getConfigLoaderApi } from './vite-plugin-config-loader.js';
 /**
  * @description
  * A custom Vite plugin that transforms Lingui macros in files using Babel instead of SWC.
@@ -17,19 +18,40 @@ import * as babel from '@babel/core';
  * - `@vendure/dashboard/src` files (in node_modules for external projects)
  * - `packages/dashboard/src` files (in monorepo development)
  * - User's dashboard extension files (e.g., custom plugins using Lingui)
+ * - Third-party npm packages that provide dashboard extensions (discovered automatically)
  *
  * Files NOT processed:
- * - Other node_modules packages (they shouldn't contain Lingui macros)
+ * - Files that don't contain Lingui macro imports (fast check via string matching)
+ * - Non-JS/TS files
+ * - node_modules packages that are not discovered as Vendure plugins
  *
  * @see https://github.com/vendurehq/vendure/issues/3929
  * @see https://github.com/lingui/swc-plugin/issues/179
  */
-export function linguiBabelPlugin() {
+export function linguiBabelPlugin(options) {
+    var _a;
+    // Paths of npm packages that should have Lingui macros transformed.
+    // This is populated from plugin discovery when transform is first called.
+    const allowedNodeModulesPackages = new Set((_a = options === null || options === void 0 ? void 0 : options.additionalPackagePaths) !== null && _a !== void 0 ? _a : []);
+    // API reference to the config loader plugin (set in configResolved)
+    let configLoaderApi;
+    // Cached result from config loader (set on first transform that needs it)
+    let configResult;
     return {
         name: 'vendure:lingui-babel',
         // Run BEFORE @vitejs/plugin-react so the macros are already transformed
         // when the react plugin processes the file
         enforce: 'pre',
+        configResolved({ plugins }) {
+            // Get reference to the config loader API.
+            // This doesn't load the config yet - that happens lazily in transform.
+            try {
+                configLoaderApi = getConfigLoaderApi(plugins);
+            }
+            catch (_a) {
+                // configLoaderPlugin not available (e.g., plugin used standalone for testing)
+            }
+        },
         async transform(code, id) {
             // Strip query params for path matching (Vite adds ?v=xxx for cache busting)
             const cleanId = id.split('?')[0];
@@ -42,15 +64,42 @@ export function linguiBabelPlugin() {
             if (!code.includes('@lingui/') || !code.includes('/macro')) {
                 return null;
             }
-            // Skip node_modules files EXCEPT for @vendure/dashboard source
-            // This ensures:
-            // 1. Dashboard source files get transformed (both in monorepo and external projects)
-            // 2. User's extension files get transformed (not in node_modules)
-            // 3. Other node_modules packages are left alone
+            // Check if this file should be transformed
             if (cleanId.includes('node_modules')) {
+                // Always allow @vendure/dashboard source files
                 const isVendureDashboard = cleanId.includes('@vendure/dashboard/src') || cleanId.includes('packages/dashboard/src');
                 if (!isVendureDashboard) {
-                    return null;
+                    // Load discovered plugins on first need (lazy loading with caching)
+                    if (configLoaderApi && !configResult) {
+                        try {
+                            configResult = await configLoaderApi.getVendureConfig();
+                            // Extract package paths from discovered npm plugins
+                            for (const plugin of configResult.pluginInfo) {
+                                if (!plugin.sourcePluginPath && plugin.pluginPath.includes('node_modules')) {
+                                    const packagePath = extractPackagePath(plugin.pluginPath);
+                                    if (packagePath) {
+                                        allowedNodeModulesPackages.add(packagePath);
+                                    }
+                                }
+                            }
+                        }
+                        catch (error) {
+                            // Log but continue - will use only manually specified paths
+                            // eslint-disable-next-line no-console
+                            console.warn('[vendure:lingui-babel] Failed to load plugin config:', error);
+                        }
+                    }
+                    // Check if this is from a discovered Vendure plugin package
+                    let isDiscoveredPlugin = false;
+                    for (const pkgPath of allowedNodeModulesPackages) {
+                        if (cleanId.includes(pkgPath)) {
+                            isDiscoveredPlugin = true;
+                            break;
+                        }
+                    }
+                    if (!isDiscoveredPlugin) {
+                        return null;
+                    }
                 }
             }
             try {
@@ -84,3 +133,36 @@ export function linguiBabelPlugin() {
         },
     };
 }
+/**
+ * Extracts the npm package name from a full file path.
+ *
+ * Examples:
+ * - /path/to/node_modules/@vendure-ee/plugin/dist/index.js -> @vendure-ee/plugin
+ * - /path/to/node_modules/some-plugin/lib/index.js -> some-plugin
+ * - /path/to/node_modules/.pnpm/@vendure-ee+plugin@1.0.0/node_modules/@vendure-ee/plugin/dist/index.js -> @vendure-ee/plugin
+ */
+function extractPackagePath(filePath) {
+    // Normalize path separators
+    const normalizedPath = filePath.replace(/\\/g, '/');
+    // Find the last occurrence of node_modules (handles pnpm structure)
+    const lastNodeModulesIndex = normalizedPath.lastIndexOf('node_modules/');
+    if (lastNodeModulesIndex === -1) {
+        return undefined;
+    }
+    const afterNodeModules = normalizedPath.slice(lastNodeModulesIndex + 'node_modules/'.length);
+    // Handle scoped packages (@scope/package)
+    if (afterNodeModules.startsWith('@')) {
+        const parts = afterNodeModules.split('/');
+        if (parts.length >= 2) {
+            return `${parts[0]}/${parts[1]}`;
+        }
+    }
+    else {
+        // Unscoped package
+        const parts = afterNodeModules.split('/');
+        if (parts.length >= 1) {
+            return parts[0];
+        }
+    }
+    return undefined;
+}

package/dist/vite/vite-plugin-translations.js

@@ -91,8 +91,8 @@ async function getPluginTranslations(pluginInfo) {
         const poPatterns = path.join(dashboardPath, '**/*.po');
         const translations = await glob(poPatterns, {
             ignore: [
-                // Standard test & doc files
-                '**/node_modules/**/node_modules/**',
+                // Skip nested node_modules (transitive deps) but not .pnpm or .bun directories.
+                '**/node_modules/[!.]*/**/node_modules/**',
                 '**/*.spec.js',
                 '**/*.test.js',
             ],

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@vendure/dashboard",
     "private": false,
-    "version": "3.5.3-master-202601300300",
+    "version": "3.5.3",
     "type": "module",
     "repository": {
         "type": "git",
@@ -157,8 +157,8 @@
         "@storybook/addon-vitest": "^10.0.0-beta.9",
         "@storybook/react-vite": "^10.0.0-beta.9",
         "@types/node": "^22.13.4",
-        "@vendure/common": "^3.5.3-master-202601300300",
-        "@vendure/core": "^3.5.3-master-202601300300",
+        "@vendure/common": "3.5.3",
+        "@vendure/core": "3.5.3",
         "@vitest/browser": "^3.2.4",
         "@vitest/coverage-v8": "^3.2.4",
         "eslint": "^9.19.0",

package/src/app/routes/_authenticated/_collections/collections_.$id.tsx

@@ -22,7 +22,9 @@ import {
 } from '@/vdb/framework/layout-engine/page-layout.js';
 import { detailPageRouteLoader } from '@/vdb/framework/page/detail-page-route-loader.js';
 import { useDetailPage } from '@/vdb/framework/page/use-detail-page.js';
+import { useJobQueuePolling } from '@/vdb/hooks/use-job-queue-polling.js';
 import { Trans, useLingui } from '@lingui/react/macro';
+import { useQueryClient } from '@tanstack/react-query';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { toast } from 'sonner';
 import {
@@ -54,6 +56,12 @@ function CollectionDetailPage() {
     const navigate = useNavigate();
     const creatingNewEntity = params.id === NEW_ENTITY_PATH;
     const { t } = useLingui();
+    const queryClient = useQueryClient();
+
+    const { isPolling: pendingFilterApplication, startPolling } = useJobQueuePolling(
+        'apply-collection-filters',
+        () => queryClient.invalidateQueries({ queryKey: ['PaginatedListDataTable'] }),
+    );
 
     const { form, submitHandler, entity, isPending, resetForm } = useDetailPage({
         pageId,
@@ -79,6 +87,7 @@ function CollectionDetailPage() {
                     name: translation.name,
                     slug: translation.slug,
                     description: translation.description,
+                    customFields: (translation as any).customFields,
                 })),
                 filters: entity.filters.map(f => ({
                     code: f.code,
@@ -90,12 +99,20 @@ function CollectionDetailPage() {
         },
         params: { id: params.id },
         onSuccess: async data => {
+            const filtersWereDirty =
+                form.getFieldState('inheritFilters').isDirty || form.getFieldState('filters').isDirty;
             toast(
                 creatingNewEntity ? t`Successfully created collection` : t`Successfully updated collection`,
             );
             resetForm();
+            if (filtersWereDirty) {
+                startPolling();
+            }
             if (creatingNewEntity) {
-                await navigate({ to: `../$id`, params: { id: data.id } });
+                await navigate({
+                    to: `../$id`,
+                    params: { id: data.id },
+                });
             }
         },
         onError: err => {
@@ -106,7 +123,9 @@ function CollectionDetailPage() {
     });
 
     const shouldPreviewContents =
-        form.getFieldState('inheritFilters').isDirty || form.getFieldState('filters').isDirty;
+        form.getFieldState('inheritFilters').isDirty ||
+        form.getFieldState('filters').isDirty ||
+        pendingFilterApplication;
 
     const currentFiltersValue = form.watch('filters');
     const currentInheritFiltersValue = form.watch('inheritFilters');
@@ -220,7 +239,7 @@ function CollectionDetailPage() {
                     </FormItem>
                 </PageBlock>
                 <PageBlock column="main" blockId="contents" title={<Trans>Contents</Trans>}>
-                    {shouldPreviewContents || creatingNewEntity ? (
+                    {pendingFilterApplication || shouldPreviewContents || creatingNewEntity ? (
                         <CollectionContentsPreviewTable
                             parentId={entity?.parent?.id}
                             filters={currentFiltersValue ?? []}

package/src/app/routes/_authenticated/_customers/customers.graphql.ts

@@ -10,6 +10,7 @@ export const customerListDocument = graphql(`
                 firstName
                 lastName
                 emailAddress
+                phoneNumber
                 groups {
                     id
                     name

package/src/app/routes/_authenticated/_customers/customers.tsx

@@ -30,6 +30,9 @@ function CustomerListPage() {
                     emailAddress: {
                         contains: searchTerm,
                     },
+                    phoneNumber: {
+                        contains: searchTerm,
+                    },
                 };
             }}
             transformVariables={variables => {

package/src/app/routes/_authenticated/_orders/components/draft-order-status.tsx

@@ -0,0 +1,48 @@
+import { Alert, AlertDescription, AlertTitle } from '@/vdb/components/ui/alert.js';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { AlertTriangle, CheckCircle } from 'lucide-react';
+
+export type DraftOrderStatusProps = Readonly<{
+    hasCustomer: boolean;
+    hasLines: boolean;
+    hasShippingMethod: boolean;
+    isDraftState: boolean;
+}>;
+
+export function DraftOrderStatus({
+    hasCustomer,
+    hasLines,
+    hasShippingMethod,
+    isDraftState,
+}: DraftOrderStatusProps) {
+    const { t } = useLingui();
+    const isCompleteDraftDisabled = !hasCustomer || !hasLines || !hasShippingMethod || !isDraftState;
+
+    let completeDraftDisabledReason: string | null = null;
+    if (!hasCustomer) {
+        completeDraftDisabledReason = t`Select a customer to continue`;
+    } else if (!hasLines) {
+        completeDraftDisabledReason = t`Add at least one item to the order`;
+    } else if (!hasShippingMethod) {
+        completeDraftDisabledReason = t`Set a shipping address and select a shipping method`;
+    } else if (!isDraftState) {
+        completeDraftDisabledReason = t`Only draft orders can be completed`;
+    }
+
+    const Icon = isCompleteDraftDisabled ? AlertTriangle : CheckCircle;
+    const title = isCompleteDraftDisabled ? (
+        <Trans>Order draft isn't ready to be completed</Trans>
+    ) : (
+        <Trans>Order draft is ready to be completed</Trans>
+    );
+
+    return (
+        <Alert variant={isCompleteDraftDisabled ? 'destructive' : 'default'}>
+            <Icon className={isCompleteDraftDisabled ? '' : 'stroke-success'} />
+            <AlertTitle className={isCompleteDraftDisabled ? '' : 'text-success'}>{title}</AlertTitle>
+            {completeDraftDisabledReason ? (
+                <AlertDescription>{completeDraftDisabledReason}</AlertDescription>
+            ) : null}
+        </Alert>
+    );
+}

package/src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx

@@ -24,6 +24,7 @@ import { ResultOf } from 'gql.tada';
 import { User } from 'lucide-react';
 import { toast } from 'sonner';
 import { CustomerAddressSelector } from './components/customer-address-selector.js';
+import { DraftOrderStatus } from './components/draft-order-status.js';
 import { EditOrderTable } from './components/edit-order-table.js';
 import { OrderAddress } from './components/order-address.js';
 import {
@@ -289,6 +290,13 @@ function DraftOrderPage() {
         });
     };
 
+    const hasCustomer = !!entity.customer;
+    const hasLines = entity.lines.length > 0;
+    const hasShippingMethod = entity.shippingLines.length > 0;
+    const isDraftState = entity.state === 'Draft';
+
+    const isCompleteDraftDisabled = !hasCustomer || !hasLines || !hasShippingMethod || !isDraftState;
+
     return (
         <Page pageId="draft-order-detail" form={form} entity={entity}>
             <PageTitle>
@@ -312,12 +320,7 @@ function DraftOrderPage() {
                     <PermissionGuard requires={['UpdateOrder']}>
                         <Button
                             type="button"
-                            disabled={
-                                !entity.customer ||
-                                entity.lines.length === 0 ||
-                                entity.shippingLines.length === 0 ||
-                                entity.state !== 'Draft'
-                            }
+                            disabled={isCompleteDraftDisabled}
                             onClick={() => completeDraftOrder({ id: entity.id, state: 'ArrangingPayment' })}
                         >
                             <Trans>Complete draft</Trans>
@@ -325,7 +328,20 @@ function DraftOrderPage() {
                     </PermissionGuard>
                 </PageActionBarRight>
             </PageActionBar>
+
             <PageLayout>
+                <PageBlock
+                    column="side"
+                    blockId="draft-order-status"
+                    title={<Trans>Draft order status</Trans>}
+                >
+                    <DraftOrderStatus
+                        hasCustomer={hasCustomer}
+                        hasLines={hasLines}
+                        hasShippingMethod={hasShippingMethod}
+                        isDraftState={isDraftState}
+                    />
+                </PageBlock>
                 <PageBlock column="main" blockId="order-table">
                     <EditOrderTable
                         order={entity}

package/src/app/routes/_authenticated/_payment-methods/payment-methods_.$id.tsx

@@ -82,6 +82,7 @@ function PaymentMethodDetailPage() {
                     languageCode: translation.languageCode,
                     name: translation.name,
                     description: translation.description,
+                    customFields: (translation as any).customFields,
                 })),
                 customFields: entity.customFields,
             };

package/src/app/routes/_authenticated/_product-variants/product-variants.graphql.ts

@@ -32,6 +32,13 @@ export const productVariantListDocument = graphql(
     [assetFragment],
 );
 
+export const productVariantPriceFragment = graphql(`
+    fragment ProductVariantPrice on ProductVariantPrice {
+        currencyCode
+        price
+    }
+`);
+
 export const productVariantDetailDocument = graphql(
     `
         query ProductVariantDetail($id: ID!) {
@@ -86,8 +93,7 @@ export const productVariantDetailDocument = graphql(
                 price
                 priceWithTax
                 prices {
-                    currencyCode
-                    price
+                    ...ProductVariantPrice
                 }
                 trackInventory
                 outOfStockThreshold
@@ -105,7 +111,7 @@ export const productVariantDetailDocument = graphql(
             }
         }
     `,
-    [assetFragment],
+    [assetFragment, productVariantPriceFragment],
 );
 
 export const createProductVariantDocument = graphql(`

package/src/app/routes/_authenticated/_product-variants/product-variants_.$id.tsx

@@ -1,6 +1,7 @@
 import { MoneyInput } from '@/vdb/components/data-input/money-input.js';
 import { NumberInput } from '@/vdb/components/data-input/number-input.js';
 import { AssignedFacetValues } from '@/vdb/components/shared/assigned-facet-values.js';
+import { CustomFieldsForm } from '@/vdb/components/shared/custom-fields-form.js';
 import { DetailPageButton } from '@/vdb/components/shared/detail-page-button.js';
 import { EntityAssets } from '@/vdb/components/shared/entity-assets.js';
 import { ErrorPage } from '@/vdb/components/shared/error-page.js';
@@ -12,8 +13,10 @@ import { Button } from '@/vdb/components/ui/button.js';
 import { FormControl, FormDescription, FormItem, FormLabel, FormMessage } from '@/vdb/components/ui/form.js';
 import { Input } from '@/vdb/components/ui/input.js';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/vdb/components/ui/select.js';
+import { Separator } from '@/vdb/components/ui/separator.js';
 import { Switch } from '@/vdb/components/ui/switch.js';
 import { NEW_ENTITY_PATH } from '@/vdb/constants.js';
+import { addCustomFields } from '@/vdb/framework/document-introspection/add-custom-fields.js';
 import {
     CustomFieldsPageBlock,
     DetailFormGrid,
@@ -34,6 +37,7 @@ import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { VariablesOf } from 'gql.tada';
 import { Trash } from 'lucide-react';
 import { toast } from 'sonner';
+
 import { AddCurrencyDropdown } from './components/add-currency-dropdown.js';
 import { AddStockLocationDropdown } from './components/add-stock-location-dropdown.js';
 import { VariantPriceDetail } from './components/variant-price-detail.js';
@@ -50,7 +54,10 @@ export const Route = createFileRoute('/_authenticated/_product-variants/product-
     component: ProductVariantDetailPage,
     loader: detailPageRouteLoader({
         pageId,
-        queryDocument: productVariantDetailDocument,
+        queryDocument: () =>
+            addCustomFields(productVariantDetailDocument, {
+                includeNestedFragments: ['ProductVariantPrice'],
+            }),
         breadcrumb(_isNew, entity, location) {
             if ((location.search as any).from === 'product') {
                 return [
@@ -81,7 +88,9 @@ function ProductVariantDetailPage() {
 
     const { form, submitHandler, entity, isPending, resetForm } = useDetailPage({
         pageId,
-        queryDocument: productVariantDetailDocument,
+        queryDocument: addCustomFields(productVariantDetailDocument, {
+            includeNestedFragments: ['ProductVariantPrice'],
+        }),
         createDocument: createProductVariantDocument,
         updateDocument: updateProductVariantDocument,
         setValuesForUpdate: entity => {
@@ -169,6 +178,7 @@ function ProductVariantDetailPage() {
                 currencyCode,
                 price: 0,
                 delete: false,
+                customFields: {},
             } as PriceInput;
             form.setValue('prices', [...currentPrices, newPrice], {
                 shouldDirty: true,
@@ -274,37 +284,46 @@ function ProductVariantDetailPage() {
                             </div>
                         );
                         return (
-                            <DetailFormGrid key={price.currencyCode}>
-                                <div className="flex gap-1 items-end">
-                                    <FormFieldWrapper
-                                        control={form.control}
-                                        name={`prices.${actualIndex}.price`}
-                                        label={priceLabel}
-                                        render={({ field }) => (
-                                            <MoneyInput {...field} currency={price.currencyCode} />
+                            <div key={price.currencyCode} className="space-y-6">
+                                {displayIndex > 0 && <Separator className="my-4" />}
+                                <DetailFormGrid key={price.currencyCode}>
+                                    <div className="flex gap-1 items-end">
+                                        <FormFieldWrapper
+                                            control={form.control}
+                                            name={`prices.${actualIndex}.price`}
+                                            label={priceLabel}
+                                            render={({ field }) => (
+                                                <MoneyInput {...field} currency={price.currencyCode} />
+                                            )}
+                                        />
+                                        {activePrices.length > 1 && (
+                                            <Button
+                                                type="button"
+                                                variant="ghost"
+                                                size="sm"
+                                                onClick={() => handleRemoveCurrency(actualIndex)}
+                                                className="h-6 w-6 p-0 mb-2 hover:text-destructive hover:bg-destructive-100"
+                                            >
+                                                <Trash className="size-4" />
+                                            </Button>
                                         )}
+                                    </div>
+                                    <VariantPriceDetail
+                                        priceIncludesTax={activeChannel?.pricesIncludeTax ?? false}
+                                        price={price.price}
+                                        currencyCode={
+                                            price.currencyCode ?? activeChannel?.defaultCurrencyCode ?? ''
+                                        }
+                                        taxCategoryId={taxCategoryId}
                                     />
-                                    {activePrices.length > 1 && (
-                                        <Button
-                                            type="button"
-                                            variant="ghost"
-                                            size="sm"
-                                            onClick={() => handleRemoveCurrency(actualIndex)}
-                                            className="h-6 w-6 p-0 mb-2 hover:text-destructive hover:bg-destructive-100"
-                                        >
-                                            <Trash className="size-4" />
-                                        </Button>
-                                    )}
-                                </div>
-                                <VariantPriceDetail
-                                    priceIncludesTax={activeChannel?.pricesIncludeTax ?? false}
-                                    price={price.price}
-                                    currencyCode={
-                                        price.currencyCode ?? activeChannel?.defaultCurrencyCode ?? ''
-                                    }
-                                    taxCategoryId={taxCategoryId}
+                                </DetailFormGrid>
+                                {/* Custom fields for ProductVariantPrice */}
+                                <CustomFieldsForm
+                                    entityType="ProductVariantPrice"
+                                    control={form.control}
+                                    formPathPrefix={`prices.${actualIndex}`}
                                 />
-                            </DetailFormGrid>
+                            </div>
                         );
                     })}
                     {unusedCurrencies.length ? (

package/src/app/routes/_authenticated/_promotions/promotions_.$id.tsx

@@ -93,6 +93,7 @@ function PromotionDetailPage() {
                     languageCode: translation.languageCode,
                     name: translation.name,
                     description: translation.description,
+                    customFields: (translation as any).customFields,
                 })),
                 customFields: entity.customFields,
             };

package/src/app/routes/_authenticated/_shipping-methods/shipping-methods_.$id.tsx

@@ -79,6 +79,7 @@ function ShippingMethodDetailPage() {
                     languageCode: translation.languageCode,
                     name: translation.name,
                     description: translation.description,
+                    customFields: (translation as any).customFields,
                 })),
                 customFields: entity.customFields,
             };