@vendure/dashboard 3.3.6-master-202507020959 → 3.3.6-master-202507030234

package/src/app/routes/_authenticated/_orders/components/order-tax-summary.tsx

@@ -1,39 +1,41 @@
-import { Table, TableHeader, TableRow, TableHead, TableBody, TableCell } from "@/components/ui/table.js";
-import { Trans } from "@/lib/trans";
-import { orderDetailFragment } from "../orders.graphql.js";
-import { ResultOf } from "gql.tada";
-import { useLocalFormat } from "@/hooks/use-local-format.js";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/vdb/components/ui/table.js';
+import { useLocalFormat } from '@/vdb/hooks/use-local-format.js';
+import { Trans } from '@/vdb/lib/trans.js';
+import { ResultOf } from 'gql.tada';
+import { orderDetailFragment } from '../orders.graphql.js';
 
-export function OrderTaxSummary({ order }: { order: ResultOf<typeof orderDetailFragment> }) {
+export function OrderTaxSummary({ order }: Readonly<{ order: ResultOf<typeof orderDetailFragment> }>) {
     const { formatCurrency } = useLocalFormat();
-    return <div>
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead>
-                        <Trans>Description</Trans>
-                    </TableHead>
-                    <TableHead>
-                        <Trans>Tax rate</Trans>
-                    </TableHead>
-                    <TableHead>
-                        <Trans>Tax base</Trans>
-                    </TableHead>
-                    <TableHead>
-                        <Trans>Tax total</Trans>
-                    </TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                {order.taxSummary.map(taxLine => (
-                    <TableRow key={taxLine.description}>
-                        <TableCell>{taxLine.description}</TableCell>
-                        <TableCell>{taxLine.taxRate}%</TableCell>
-                        <TableCell>{formatCurrency(taxLine.taxBase, order.currencyCode)}</TableCell>
-                        <TableCell>{formatCurrency(taxLine.taxTotal, order.currencyCode)}</TableCell>
+    return (
+        <div>
+            <Table>
+                <TableHeader>
+                    <TableRow>
+                        <TableHead>
+                            <Trans>Description</Trans>
+                        </TableHead>
+                        <TableHead>
+                            <Trans>Tax rate</Trans>
+                        </TableHead>
+                        <TableHead>
+                            <Trans>Tax base</Trans>
+                        </TableHead>
+                        <TableHead>
+                            <Trans>Tax total</Trans>
+                        </TableHead>
                     </TableRow>
-                ))}
-            </TableBody>
-        </Table>
-    </div>
-}
+                </TableHeader>
+                <TableBody>
+                    {order.taxSummary.map(taxLine => (
+                        <TableRow key={taxLine.description}>
+                            <TableCell>{taxLine.description}</TableCell>
+                            <TableCell>{taxLine.taxRate}%</TableCell>
+                            <TableCell>{formatCurrency(taxLine.taxBase, order.currencyCode)}</TableCell>
+                            <TableCell>{formatCurrency(taxLine.taxTotal, order.currencyCode)}</TableCell>
+                        </TableRow>
+                    ))}
+                </TableBody>
+            </Table>
+        </div>
+    );
+}

package/src/app/routes/_authenticated/_orders/components/payment-details.tsx

@@ -1,6 +1,6 @@
-import { ResultOf } from '@/graphql/graphql.js';
-import { useLocalFormat } from '@/hooks/use-local-format.js';
-import { Trans } from '@/lib/trans.js';
+import { ResultOf } from '@/vdb/graphql/graphql.js';
+import { useLocalFormat } from '@/vdb/hooks/use-local-format.js';
+import { Trans } from '@/vdb/lib/trans.js';
 import { paymentWithRefundsFragment } from '../orders.graphql.js';
 
 type PaymentDetailsProps = {
@@ -8,7 +8,7 @@ type PaymentDetailsProps = {
     currencyCode: string;
 };
 
-export function PaymentDetails({ payment, currencyCode }: PaymentDetailsProps) {
+export function PaymentDetails({ payment, currencyCode }: Readonly<PaymentDetailsProps>) {
     const { formatCurrency, formatDate } = useLocalFormat();
     const t = (key: string) => key;
 

package/src/app/routes/_authenticated/_orders/components/shipping-method-selector.tsx

@@ -1,10 +1,12 @@
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card.js';
-import { Money } from '@/components/data-display/money.js';
-import { Trans } from '@/lib/trans.js';
+import { Money } from '@/vdb/components/data-display/money.js';
+import { Card, CardContent, CardHeader, CardTitle } from '@/vdb/components/ui/card.js';
+import { ResultOf } from '@/vdb/graphql/graphql.js';
+import { Trans } from '@/vdb/lib/trans.js';
 import { draftOrderEligibleShippingMethodsDocument } from '../orders.graphql.js';
-import { ResultOf } from '@/graphql/graphql.js';
 
-type ShippingMethodQuote = ResultOf<typeof draftOrderEligibleShippingMethodsDocument>['eligibleShippingMethodsForDraftOrder'][number];
+type ShippingMethodQuote = ResultOf<
+    typeof draftOrderEligibleShippingMethodsDocument
+>['eligibleShippingMethodsForDraftOrder'][number];
 
 interface ShippingMethodSelectorProps {
     eligibleShippingMethods: ShippingMethodQuote[];
@@ -13,53 +15,50 @@ interface ShippingMethodSelectorProps {
     onSelect: (shippingMethodId: string) => void;
 }
 
-export function ShippingMethodSelector({ 
-    eligibleShippingMethods, 
+export function ShippingMethodSelector({
+    eligibleShippingMethods,
     selectedShippingMethodId,
     currencyCode,
-    onSelect 
-}: ShippingMethodSelectorProps) {
+    onSelect,
+}: Readonly<ShippingMethodSelectorProps>) {
     return (
         <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-            {eligibleShippingMethods?.length ? eligibleShippingMethods.map(method => (
-                <Card 
-                    key={method.id} 
-                    className={`cursor-pointer hover:bg-muted/50 transition-colors border-2 border-transparent ${
-                        selectedShippingMethodId === method.id 
-                            ? 'border-primary' 
-                            : ''
-                    }`}
-                    onClick={() => onSelect(method.id)}
-                >
-                    <CardHeader className="pb-2">
-                        <CardTitle className="">
-                            <Trans>{method.name}</Trans>
-                        </CardTitle>
-                    </CardHeader>
-                    <CardContent>
-                        <div className="space-y-2">
-                            {method.description && (
-                                <p className="text-sm text-muted-foreground">
-                                    <Trans>{method.description}</Trans>
-                                </p>
-                            )}
-                            <div className="flex items-center justify-between">
-                                <span className="text-sm font-medium">
-                                    <Trans>Price</Trans>
-                                </span>
-                                <Money 
-                                    value={method.priceWithTax} 
-                                    currencyCode={currencyCode} 
-                                />
+            {eligibleShippingMethods?.length ? (
+                eligibleShippingMethods.map(method => (
+                    <Card
+                        key={method.id}
+                        className={`cursor-pointer hover:bg-muted/50 transition-colors border-2 border-transparent ${
+                            selectedShippingMethodId === method.id ? 'border-primary' : ''
+                        }`}
+                        onClick={() => onSelect(method.id)}
+                    >
+                        <CardHeader className="pb-2">
+                            <CardTitle className="">
+                                <Trans>{method.name}</Trans>
+                            </CardTitle>
+                        </CardHeader>
+                        <CardContent>
+                            <div className="space-y-2">
+                                {method.description && (
+                                    <p className="text-sm text-muted-foreground">
+                                        <Trans>{method.description}</Trans>
+                                    </p>
+                                )}
+                                <div className="flex items-center justify-between">
+                                    <span className="text-sm font-medium">
+                                        <Trans>Price</Trans>
+                                    </span>
+                                    <Money value={method.priceWithTax} currencyCode={currencyCode} />
+                                </div>
                             </div>
-                        </div>
-                    </CardContent>
-                </Card>
-            )) : (
+                        </CardContent>
+                    </Card>
+                ))
+            ) : (
                 <div className="col-span-full text-center text-muted-foreground">
                     <Trans>No shipping methods available</Trans>
                 </div>
             )}
         </div>
     );
-} 
+}

package/src/app/routes/_authenticated/_orders/orders.graphql.ts

@@ -1,5 +1,5 @@
-import { assetFragment, errorResultFragment } from '@/graphql/fragments.js';
-import { graphql } from '@/graphql/graphql.js';
+import { assetFragment, errorResultFragment } from '@/vdb/graphql/fragments.js';
+import { graphql } from '@/vdb/graphql/graphql.js';
 
 export const orderListDocument = graphql(`
     query GetOrders($options: OrderListOptions) {

package/src/app/routes/_authenticated/_orders/orders.tsx

@@ -1,17 +1,17 @@
-import { Money } from '@/components/data-display/money.js';
-import { DetailPageButton } from '@/components/shared/detail-page-button.js';
-import { Badge } from '@/components/ui/badge.js';
-import { Button } from '@/components/ui/button.js';
-import { ListPage } from '@/framework/page/list-page.js';
-import { Trans } from '@/lib/trans.js';
+import { Money } from '@/vdb/components/data-display/money.js';
+import { DetailPageButton } from '@/vdb/components/shared/detail-page-button.js';
+import { Badge } from '@/vdb/components/ui/badge.js';
+import { Button } from '@/vdb/components/ui/button.js';
+import { PageActionBarRight } from '@/vdb/framework/layout-engine/page-layout.js';
+import { ListPage } from '@/vdb/framework/page/list-page.js';
+import { api } from '@/vdb/graphql/api.js';
+import { ResultOf } from '@/vdb/graphql/graphql.js';
+import { useServerConfig } from '@/vdb/hooks/use-server-config.js';
+import { Trans } from '@/vdb/lib/trans.js';
+import { useMutation } from '@tanstack/react-query';
 import { createFileRoute, Link, useNavigate } from '@tanstack/react-router';
-import { createDraftOrderDocument, orderListDocument } from './orders.graphql.js';
-import { useServerConfig } from '@/hooks/use-server-config.js';
-import { PageActionBarRight } from '@/framework/layout-engine/page-layout.js';
 import { PlusIcon } from 'lucide-react';
-import { useMutation } from '@tanstack/react-query';
-import { api } from '@/graphql/api.js';
-import { ResultOf } from '@/graphql/graphql.js';
+import { createDraftOrderDocument, orderListDocument } from './orders.graphql.js';
 
 export const Route = createFileRoute('/_authenticated/_orders/orders')({
     component: OrderListPage,
@@ -25,8 +25,8 @@ function OrderListPage() {
         mutationFn: api.mutate(createDraftOrderDocument),
         onSuccess: (result: ResultOf<typeof createDraftOrderDocument>) => {
             navigate({ to: '/orders/draft/$id', params: { id: result.createDraftOrder.id } });
-        }
-    })
+        },
+    });
     return (
         <ListPage
             pageId="order-list"
@@ -121,12 +121,13 @@ function OrderListPage() {
             facetedFilters={{
                 state: {
                     title: 'State',
-                    options: serverConfig?.orderProcess.map(state => {
-                        return {
-                            label: state.name,
-                            value: state.name,
-                        }
-                    }) ?? [],
+                    options:
+                        serverConfig?.orderProcess.map(state => {
+                            return {
+                                label: state.name,
+                                value: state.name,
+                            };
+                        }) ?? [],
                 },
             }}
         >

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

@@ -1,8 +1,8 @@
-import { ErrorPage } from '@/components/shared/error-page.js';
-import { PermissionGuard } from '@/components/shared/permission-guard.js';
-import { Badge } from '@/components/ui/badge.js';
-import { Button } from '@/components/ui/button.js';
-import { addCustomFields } from '@/framework/document-introspection/add-custom-fields.js';
+import { ErrorPage } from '@/vdb/components/shared/error-page.js';
+import { PermissionGuard } from '@/vdb/components/shared/permission-guard.js';
+import { Badge } from '@/vdb/components/ui/badge.js';
+import { Button } from '@/vdb/components/ui/button.js';
+import { addCustomFields } from '@/vdb/framework/document-introspection/add-custom-fields.js';
 import {
     CustomFieldsPageBlock,
     Page,
@@ -11,10 +11,10 @@ import {
     PageBlock,
     PageLayout,
     PageTitle,
-} from '@/framework/layout-engine/page-layout.js';
-import { getDetailQueryOptions, useDetailPage } from '@/framework/page/use-detail-page.js';
-import { ResultOf } from '@/graphql/graphql.js';
-import { Trans, useLingui } from '@/lib/trans.js';
+} from '@/vdb/framework/layout-engine/page-layout.js';
+import { getDetailQueryOptions, useDetailPage } from '@/vdb/framework/page/use-detail-page.js';
+import { ResultOf } from '@/vdb/graphql/graphql.js';
+import { Trans, useLingui } from '@/vdb/lib/trans.js';
 import { Link, createFileRoute, redirect } from '@tanstack/react-router';
 import { User } from 'lucide-react';
 import { toast } from 'sonner';