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

package/src/app/routes/_authenticated/_stock-locations/stock-locations_.$id.tsx

@@ -1,10 +1,10 @@
-import { ErrorPage } from '@/vdb/components/shared/error-page.js';
-import { FormFieldWrapper } from '@/vdb/components/shared/form-field-wrapper.js';
-import { PermissionGuard } from '@/vdb/components/shared/permission-guard.js';
-import { Button } from '@/vdb/components/ui/button.js';
-import { Input } from '@/vdb/components/ui/input.js';
-import { Textarea } from '@/vdb/components/ui/textarea.js';
-import { NEW_ENTITY_PATH } from '@/vdb/constants.js';
+import { ErrorPage } from '@/components/shared/error-page.js';
+import { FormFieldWrapper } from '@/components/shared/form-field-wrapper.js';
+import { PermissionGuard } from '@/components/shared/permission-guard.js';
+import { Button } from '@/components/ui/button.js';
+import { Input } from '@/components/ui/input.js';
+import { Textarea } from '@/components/ui/textarea.js';
+import { NEW_ENTITY_PATH } from '@/constants.js';
 import {
     CustomFieldsPageBlock,
     DetailFormGrid,
@@ -14,10 +14,10 @@ import {
     PageBlock,
     PageLayout,
     PageTitle,
-} 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 { Trans, useLingui } from '@/vdb/lib/trans.js';
+} from '@/framework/layout-engine/page-layout.js';
+import { detailPageRouteLoader } from '@/framework/page/detail-page-route-loader.js';
+import { useDetailPage } from '@/framework/page/use-detail-page.js';
+import { Trans, useLingui } from '@/lib/trans.js';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { toast } from 'sonner';
 import {
@@ -26,12 +26,9 @@ import {
     updateStockLocationDocument,
 } from './stock-locations.graphql.js';
 
-const pageId = 'stock-location-detail';
-
 export const Route = createFileRoute('/_authenticated/_stock-locations/stock-locations_/$id')({
     component: StockLocationDetailPage,
     loader: detailPageRouteLoader({
-        pageId,
         queryDocument: stockLocationDetailQuery,
         breadcrumb(isNew, entity) {
             return [
@@ -50,7 +47,6 @@ function StockLocationDetailPage() {
     const { i18n } = useLingui();
 
     const { form, submitHandler, entity, isPending, resetForm } = useDetailPage({
-        pageId,
         queryDocument: stockLocationDetailQuery,
         createDocument: createStockLocationDocument,
         updateDocument: updateStockLocationDocument,
@@ -78,7 +74,7 @@ function StockLocationDetailPage() {
     });
 
     return (
-        <Page pageId={pageId} form={form} submitHandler={submitHandler} entity={entity}>
+        <Page pageId="stock-location-detail" form={form} submitHandler={submitHandler}>
             <PageTitle>
                 {creatingNewEntity ? <Trans>New stock location</Trans> : (entity?.name ?? '')}
             </PageTitle>

package/src/app/routes/_authenticated/_system/components/payload-dialog.tsx

@@ -4,9 +4,9 @@ import {
     DialogDescription,
     DialogHeader,
     DialogTitle,
-    DialogTrigger,
-} from '@/vdb/components/ui/dialog.js';
-import { ScrollArea } from '@/vdb/components/ui/scroll-area.js';
+} from '@/components/ui/dialog.js';
+import { DialogTrigger } from '@/components/ui/dialog.js';
+import { ScrollArea } from '@/components/ui/scroll-area.js';
 import { JsonEditor } from 'json-edit-react';
 
 type PayloadDialogProps = {
@@ -16,7 +16,7 @@ type PayloadDialogProps = {
     description?: string | React.ReactNode;
 };
 
-export function PayloadDialog({ payload, trigger, title, description }: Readonly<PayloadDialogProps>) {
+export function PayloadDialog({ payload, trigger, title, description }: PayloadDialogProps) {
     return (
         <Dialog>
             <DialogTrigger asChild>{trigger}</DialogTrigger>

package/src/app/routes/_authenticated/_system/healthchecks.tsx

@@ -1,7 +1,7 @@
-import { Button } from '@/vdb/components/ui/button.js';
-import { Card, CardContent, CardHeader, CardTitle } from '@/vdb/components/ui/card.js';
-import { Page, PageActionBar, PageTitle } from '@/vdb/framework/layout-engine/page-layout.js';
-import { Trans } from '@/vdb/lib/trans.js';
+import { Button } from '@/components/ui/button.js';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card.js';
+import { Page, PageActionBar, PageLayout, PageTitle } from '@/framework/layout-engine/page-layout.js';
+import { Trans } from '@/lib/trans.js';
 import { useQuery } from '@tanstack/react-query';
 import { createFileRoute } from '@tanstack/react-router';
 import { formatRelative } from 'date-fns';

package/src/app/routes/_authenticated/_system/job-queue.graphql.ts

@@ -1,4 +1,4 @@
-import { graphql } from '@/vdb/graphql/graphql.js';
+import { graphql } from '@/graphql/graphql.js';
 
 export const jobInfoFragment = graphql(`
     fragment JobInfo on Job {

package/src/app/routes/_authenticated/_system/job-queue.tsx

@@ -1,8 +1,8 @@
-import { Badge } from '@/vdb/components/ui/badge.js';
-import { Button } from '@/vdb/components/ui/button.js';
-import { ListPage } from '@/vdb/framework/page/list-page.js';
-import { api } from '@/vdb/graphql/api.js';
-import { Trans } from '@/vdb/lib/trans.js';
+import { Badge } from '@/components/ui/badge.js';
+import { Button } from '@/components/ui/button.js';
+import { ListPage } from '@/framework/page/list-page.js';
+import { api } from '@/graphql/api.js';
+import { Trans } from '@/lib/trans.js';
 import { createFileRoute } from '@tanstack/react-router';
 import { formatRelative } from 'date-fns';
 import { Ban, CheckCircle2Icon, CircleXIcon, ClockIcon, LoaderIcon, RotateCcw } from 'lucide-react';
@@ -57,11 +57,7 @@ function JobQueuePage() {
             customizeColumns={{
                 createdAt: {
                     header: 'Created At',
-                    cell: ({ row }) => (
-                        <div title={row.original.createdAt}>
-                            {formatRelative(new Date(row.original.createdAt), new Date())}
-                        </div>
-                    ),
+                    cell: ({ row }) => <div title={row.original.createdAt}>{formatRelative(new Date(row.original.createdAt), new Date())}</div>,
                 },
                 data: {
                     header: 'Data',

package/src/app/routes/_authenticated/_system/scheduled-tasks.tsx

@@ -1,28 +1,24 @@
-import { DataTable } from '@/vdb/components/data-table/data-table.js';
-import { Badge } from '@/vdb/components/ui/badge.js';
-import { Button } from '@/vdb/components/ui/button.js';
+import { FullWidthPageBlock, Page, PageLayout, PageTitle } from '@/framework/layout-engine/page-layout.js';
+import { api } from '@/graphql/api.js';
+import { graphql } from '@/graphql/graphql.js';
+import { DataTable } from '@/components/data-table/data-table.js';
+import { Trans, useLingui } from '@/lib/trans.js';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { createFileRoute } from '@tanstack/react-router';
+import { createColumnHelper } from '@tanstack/react-table';
+import { ResultOf } from '@/graphql/graphql.js';
+import { PayloadDialog } from './components/payload-dialog.js';
+import { Button } from '@/components/ui/button.js';
+import { Badge } from '@/components/ui/badge.js';
+import { useLocalFormat } from '@/hooks/use-local-format.js';
 import {
     DropdownMenu,
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
-} from '@/vdb/components/ui/dropdown-menu.js';
-import {
-    FullWidthPageBlock,
-    Page,
-    PageLayout,
-    PageTitle,
-} from '@/vdb/framework/layout-engine/page-layout.js';
-import { api } from '@/vdb/graphql/api.js';
-import { graphql, ResultOf } from '@/vdb/graphql/graphql.js';
-import { useLocalFormat } from '@/vdb/hooks/use-local-format.js';
-import { Trans, useLingui } from '@/vdb/lib/trans.js';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { createFileRoute } from '@tanstack/react-router';
-import { createColumnHelper } from '@tanstack/react-table';
+} from '@/components/ui/dropdown-menu.js';
 import { CirclePlay, EllipsisIcon } from 'lucide-react';
 import { toast } from 'sonner';
-import { PayloadDialog } from './components/payload-dialog.js';
 
 export const Route = createFileRoute('/_authenticated/_system/scheduled-tasks')({
     component: ScheduledTasksPage,
@@ -57,7 +53,7 @@ const updateScheduledTaskDocument = graphql(`
 const runScheduledTaskDocument = graphql(`
     mutation RunScheduledTask($id: String!) {
         runScheduledTask(id: $id) {
-            success
+          success
         }
     }
 `);
@@ -73,16 +69,16 @@ function ScheduledTasksPage() {
     const queryClient = useQueryClient();
     const { mutate: updateScheduledTask } = useMutation({
         mutationFn: api.mutate(updateScheduledTaskDocument),
-        onSuccess: result => {
+        onSuccess: (result) => {
             refreshScheduledTasks();
         },
     });
     const refreshScheduledTasks = () => {
         queryClient.invalidateQueries({ queryKey: ['scheduledTasks'] });
-    };
+    }
     const { mutate: runScheduledTask } = useMutation({
         mutationFn: api.mutate(runScheduledTaskDocument),
-        onSuccess: result => {
+        onSuccess: (result) => {
             if ((result as ResultOf<typeof runScheduledTaskDocument>).runScheduledTask.success) {
                 toast.success(i18n.t(`Scheduled task will be executed`));
                 queryClient.invalidateQueries({ queryKey: ['scheduledTasks'] });
@@ -198,18 +194,16 @@ function ScheduledTasksPage() {
                             </Button>
                         </DropdownMenuTrigger>
                         <DropdownMenuContent>
-                            {row.original.enabled && (
-                                <DropdownMenuItem
-                                    onClick={() =>
-                                        runScheduledTask({
-                                            id: row.original.id,
-                                        })
-                                    }
-                                >
-                                    <CirclePlay className="w-4 h-4" />
-                                    <Trans>Run</Trans>
-                                </DropdownMenuItem>
-                            )}
+                            {row.original.enabled && <DropdownMenuItem
+                                onClick={() =>
+                                    runScheduledTask({
+                                        id: row.original.id,
+                                    })
+                                }
+                            >
+                                <CirclePlay className="w-4 h-4" />
+                                <Trans>Run</Trans>
+                            </DropdownMenuItem>}
                             <DropdownMenuItem
                                 onClick={() =>
                                     updateScheduledTask({

package/src/app/routes/_authenticated/_tax-categories/tax-categories.graphql.ts

@@ -1,4 +1,4 @@
-import { graphql } from '@/vdb/graphql/graphql.js';
+import { graphql } from '@/graphql/graphql.js';
 
 export const taxCategoryItemFragment = graphql(`
     fragment TaxCategoryItem on TaxCategory {
@@ -24,7 +24,7 @@ export const taxCategoryListQuery = graphql(
     [taxCategoryItemFragment],
 );
 
-export const taxCategoryDetailDocument = graphql(`
+export const taxCategoryDetailQuery = graphql(`
     query TaxCategoryDetail($id: ID!) {
         taxCategory(id: $id) {
             id
@@ -61,12 +61,3 @@ export const deleteTaxCategoryDocument = graphql(`
         }
     }
 `);
-
-export const deleteTaxCategoriesDocument = graphql(`
-    mutation DeleteTaxCategories($ids: [ID!]!) {
-        deleteTaxCategories(ids: $ids) {
-            result
-            message
-        }
-    }
-`);

package/src/app/routes/_authenticated/_tax-categories/tax-categories.tsx

@@ -1,13 +1,12 @@
-import { DetailPageButton } from '@/vdb/components/shared/detail-page-button.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 { PageActionBarRight } from '@/vdb/framework/layout-engine/page-layout.js';
-import { ListPage } from '@/vdb/framework/page/list-page.js';
-import { Trans } from '@/vdb/lib/trans.js';
+import { DetailPageButton } from '@/components/shared/detail-page-button.js';
+import { PermissionGuard } from '@/components/shared/permission-guard.js';
+import { Badge } from '@/components/ui/badge.js';
+import { Button } from '@/components/ui/button.js';
+import { PageActionBarRight } from '@/framework/layout-engine/page-layout.js';
+import { ListPage } from '@/framework/page/list-page.js';
+import { Trans } from '@/lib/trans.js';
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { PlusIcon } from 'lucide-react';
-import { DeleteTaxCategoriesBulkAction } from './components/tax-category-bulk-actions.js';
 import { deleteTaxCategoryDocument, taxCategoryListQuery } from './tax-categories.graphql.js';
 
 export const Route = createFileRoute('/_authenticated/_tax-categories/tax-categories')({
@@ -50,12 +49,6 @@ function TaxCategoryListPage() {
                     ),
                 },
             }}
-            bulkActions={[
-                {
-                    component: DeleteTaxCategoriesBulkAction,
-                    order: 500,
-                },
-            ]}
         >
             <PageActionBarRight>
                 <PermissionGuard requires={['CreateTaxCategory']}>

package/src/app/routes/_authenticated/_tax-categories/tax-categories_.$id.tsx

@@ -1,10 +1,10 @@
-import { ErrorPage } from '@/vdb/components/shared/error-page.js';
-import { FormFieldWrapper } from '@/vdb/components/shared/form-field-wrapper.js';
-import { PermissionGuard } from '@/vdb/components/shared/permission-guard.js';
-import { Button } from '@/vdb/components/ui/button.js';
-import { Input } from '@/vdb/components/ui/input.js';
-import { Switch } from '@/vdb/components/ui/switch.js';
-import { NEW_ENTITY_PATH } from '@/vdb/constants.js';
+import { ErrorPage } from '@/components/shared/error-page.js';
+import { FormFieldWrapper } from '@/components/shared/form-field-wrapper.js';
+import { PermissionGuard } from '@/components/shared/permission-guard.js';
+import { Button } from '@/components/ui/button.js';
+import { Input } from '@/components/ui/input.js';
+import { Switch } from '@/components/ui/switch.js';
+import { NEW_ENTITY_PATH } from '@/constants.js';
 import {
     CustomFieldsPageBlock,
     DetailFormGrid,
@@ -14,25 +14,22 @@ import {
     PageBlock,
     PageLayout,
     PageTitle,
-} 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 { Trans, useLingui } from '@/vdb/lib/trans.js';
+} from '@/framework/layout-engine/page-layout.js';
+import { detailPageRouteLoader } from '@/framework/page/detail-page-route-loader.js';
+import { useDetailPage } from '@/framework/page/use-detail-page.js';
+import { Trans, useLingui } from '@/lib/trans.js';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { toast } from 'sonner';
 import {
     createTaxCategoryDocument,
-    taxCategoryDetailDocument,
+    taxCategoryDetailQuery,
     updateTaxCategoryDocument,
 } from './tax-categories.graphql.js';
 
-const pageId = 'tax-category-detail';
-
 export const Route = createFileRoute('/_authenticated/_tax-categories/tax-categories_/$id')({
     component: TaxCategoryDetailPage,
     loader: detailPageRouteLoader({
-        pageId,
-        queryDocument: taxCategoryDetailDocument,
+        queryDocument: taxCategoryDetailQuery,
         breadcrumb(isNew, entity) {
             return [
                 { path: '/tax-categories', label: 'Tax categories' },
@@ -49,9 +46,8 @@ function TaxCategoryDetailPage() {
     const creatingNewEntity = params.id === NEW_ENTITY_PATH;
     const { i18n } = useLingui();
 
-    const { form, submitHandler, entity, isPending, resetForm } = useDetailPage({
-        pageId,
-        queryDocument: taxCategoryDetailDocument,
+    const { form, submitHandler, entity, isPending } = useDetailPage({
+        queryDocument: taxCategoryDetailQuery,
         createDocument: createTaxCategoryDocument,
         updateDocument: updateTaxCategoryDocument,
         setValuesForUpdate: entity => {
@@ -77,7 +73,7 @@ function TaxCategoryDetailPage() {
     });
 
     return (
-        <Page pageId={pageId} form={form} submitHandler={submitHandler} entity={entity}>
+        <Page pageId="tax-category-detail" form={form} submitHandler={submitHandler}>
             <PageTitle>
                 {creatingNewEntity ? <Trans>New tax category</Trans> : (entity?.name ?? '')}
             </PageTitle>

package/src/app/routes/_authenticated/_tax-rates/tax-rates.graphql.ts

@@ -1,4 +1,4 @@
-import { graphql } from '@/vdb/graphql/graphql.js';
+import { graphql } from '@/graphql/graphql.js';
 
 export const taxRateItemFragment = graphql(`
     fragment TaxRateItem on TaxRate {
@@ -37,7 +37,7 @@ export const taxRateListQuery = graphql(
     [taxRateItemFragment],
 );
 
-export const taxRateDetailDocument = graphql(
+export const taxRateDetailQuery = graphql(
     `
         query TaxRateDetail($id: ID!) {
             taxRate(id: $id) {
@@ -73,12 +73,3 @@ export const deleteTaxRateDocument = graphql(`
         }
     }
 `);
-
-export const deleteTaxRatesDocument = graphql(`
-    mutation DeleteTaxRates($ids: [ID!]!) {
-        deleteTaxRates(ids: $ids) {
-            result
-            message
-        }
-    }
-`);

package/src/app/routes/_authenticated/_tax-rates/tax-rates.tsx

@@ -1,16 +1,15 @@
-import { BooleanDisplayBadge } from '@/vdb/components/data-display/boolean.js';
-import { DetailPageButton } from '@/vdb/components/shared/detail-page-button.js';
-import { PermissionGuard } from '@/vdb/components/shared/permission-guard.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 { Trans } from '@/vdb/lib/trans.js';
+import { BooleanDisplayBadge } from '@/components/data-display/boolean.js';
+import { DetailPageButton } from '@/components/shared/detail-page-button.js';
+import { PermissionGuard } from '@/components/shared/permission-guard.js';
+import { Button } from '@/components/ui/button.js';
+import { PageActionBarRight } from '@/framework/layout-engine/page-layout.js';
+import { ListPage } from '@/framework/page/list-page.js';
+import { api } from '@/graphql/api.js';
+import { Trans } from '@/lib/trans.js';
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { PlusIcon } from 'lucide-react';
 import { taxCategoryListQuery } from '../_tax-categories/tax-categories.graphql.js';
 import { zoneListQuery } from '../_zones/zones.graphql.js';
-import { DeleteTaxRatesBulkAction } from './components/tax-rate-bulk-actions.js';
 import { deleteTaxRateDocument, taxRateListQuery } from './tax-rates.graphql.js';
 
 export const Route = createFileRoute('/_authenticated/_tax-rates/tax-rates')({
@@ -93,12 +92,6 @@ function TaxRateListPage() {
                     cell: ({ row }) => `${row.original.value}%`,
                 },
             }}
-            bulkActions={[
-                {
-                    component: DeleteTaxRatesBulkAction,
-                    order: 500,
-                },
-            ]}
         >
             <PageActionBarRight>
                 <PermissionGuard requires={['CreateTaxRate']}>

package/src/app/routes/_authenticated/_tax-rates/tax-rates_.$id.tsx

@@ -1,13 +1,13 @@
-import { AffixedInput } from '@/vdb/components/data-input/affixed-input.js';
-import { ErrorPage } from '@/vdb/components/shared/error-page.js';
-import { FormFieldWrapper } from '@/vdb/components/shared/form-field-wrapper.js';
-import { PermissionGuard } from '@/vdb/components/shared/permission-guard.js';
-import { TaxCategorySelector } from '@/vdb/components/shared/tax-category-selector.js';
-import { ZoneSelector } from '@/vdb/components/shared/zone-selector.js';
-import { Button } from '@/vdb/components/ui/button.js';
-import { Input } from '@/vdb/components/ui/input.js';
-import { Switch } from '@/vdb/components/ui/switch.js';
-import { NEW_ENTITY_PATH } from '@/vdb/constants.js';
+import { AffixedInput } from '@/components/data-input/affixed-input.js';
+import { ErrorPage } from '@/components/shared/error-page.js';
+import { FormFieldWrapper } from '@/components/shared/form-field-wrapper.js';
+import { PermissionGuard } from '@/components/shared/permission-guard.js';
+import { TaxCategorySelector } from '@/components/shared/tax-category-selector.js';
+import { ZoneSelector } from '@/components/shared/zone-selector.js';
+import { Button } from '@/components/ui/button.js';
+import { Input } from '@/components/ui/input.js';
+import { Switch } from '@/components/ui/switch.js';
+import { NEW_ENTITY_PATH } from '@/constants.js';
 import {
     CustomFieldsPageBlock,
     DetailFormGrid,
@@ -17,21 +17,18 @@ import {
     PageBlock,
     PageLayout,
     PageTitle,
-} 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 { Trans, useLingui } from '@/vdb/lib/trans.js';
+} from '@/framework/layout-engine/page-layout.js';
+import { detailPageRouteLoader } from '@/framework/page/detail-page-route-loader.js';
+import { useDetailPage } from '@/framework/page/use-detail-page.js';
+import { Trans, useLingui } from '@/lib/trans.js';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { toast } from 'sonner';
-import { createTaxRateDocument, taxRateDetailDocument, updateTaxRateDocument } from './tax-rates.graphql.js';
-
-const pageId = 'tax-rate-detail';
+import { createTaxRateDocument, taxRateDetailQuery, updateTaxRateDocument } from './tax-rates.graphql.js';
 
 export const Route = createFileRoute('/_authenticated/_tax-rates/tax-rates_/$id')({
     component: TaxRateDetailPage,
     loader: detailPageRouteLoader({
-        pageId,
-        queryDocument: taxRateDetailDocument,
+        queryDocument: taxRateDetailQuery,
         breadcrumb(isNew, entity) {
             return [
                 { path: '/tax-rates', label: 'Tax rates' },
@@ -49,8 +46,7 @@ function TaxRateDetailPage() {
     const { i18n } = useLingui();
 
     const { form, submitHandler, entity, isPending, resetForm } = useDetailPage({
-        pageId,
-        queryDocument: taxRateDetailDocument,
+        queryDocument: taxRateDetailQuery,
         createDocument: createTaxRateDocument,
         updateDocument: updateTaxRateDocument,
         setValuesForUpdate: entity => {
@@ -81,7 +77,7 @@ function TaxRateDetailPage() {
     });
 
     return (
-        <Page pageId={pageId} form={form} submitHandler={submitHandler} entity={entity}>
+        <Page pageId="tax-rate-detail" form={form} submitHandler={submitHandler}>
             <PageTitle>{creatingNewEntity ? <Trans>New tax rate</Trans> : (entity?.name ?? '')}</PageTitle>
             <PageActionBar>
                 <PageActionBarRight>

package/src/app/routes/_authenticated/_zones/components/zone-countries-sheet.tsx

@@ -1,6 +1,6 @@
-import { Button } from '@/vdb/components/ui/button.js';
-import { ScrollArea } from '@/vdb/components/ui/scroll-area.js';
-import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetTrigger } from '@/vdb/components/ui/sheet.js';
+import { Button } from '@/components/ui/button.js';
+import { ScrollArea } from '@/components/ui/scroll-area.js';
+import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetTrigger } from '@/components/ui/sheet.js';
 import { ZoneCountriesTable } from './zone-countries-table.js';
 
 interface ZoneCountriesSheetProps {
@@ -9,7 +9,7 @@ interface ZoneCountriesSheetProps {
     children?: React.ReactNode;
 }
 
-export function ZoneCountriesSheet({ zoneId, zoneName, children }: Readonly<ZoneCountriesSheetProps>) {
+export function ZoneCountriesSheet({ zoneId, zoneName, children }: ZoneCountriesSheetProps) {
     return (
         <Sheet>
             <SheetTrigger asChild>

package/src/app/routes/_authenticated/_zones/components/zone-countries-table.tsx

@@ -1,21 +1,17 @@
-import { DataTable } from '@/vdb/components/data-table/data-table.js';
-import { CountrySelector } from '@/vdb/components/shared/country-selector.js';
-import { api } from '@/vdb/graphql/api.js';
+import { DataTable } from '@/components/data-table/data-table.js';
+import { api } from '@/graphql/api.js';
 import { useMutation, useQuery } from '@tanstack/react-query';
 import { ColumnDef } from '@tanstack/react-table';
 import { useMemo, useState } from 'react';
-import {
-    addCountryToZoneMutation,
-    removeCountryFromZoneMutation,
-    zoneMembersQuery,
-} from '../zones.graphql.js';
+import { addCountryToZoneMutation, removeCountryFromZoneMutation, zoneMembersQuery } from '../zones.graphql.js';
+import { CountrySelector } from '@/components/shared/country-selector.js';
 
 interface ZoneCountriesTableProps {
     zoneId: string;
     canAddCountries?: boolean;
 }
 
-export function ZoneCountriesTable({ zoneId, canAddCountries = false }: Readonly<ZoneCountriesTableProps>) {
+export function ZoneCountriesTable({ zoneId, canAddCountries = false }: ZoneCountriesTableProps) {
     const { data, refetch } = useQuery({
         queryKey: ['zone', zoneId],
         queryFn: () => api.query(zoneMembersQuery, { zoneId }),
@@ -63,9 +59,9 @@ export function ZoneCountriesTable({ zoneId, canAddCountries = false }: Readonly
                 columns={columns}
                 data={paginatedItems ?? []}
                 onPageChange={(table, page, itemsPerPage) => {
-                    setPage(page);
-                    setPageSize(itemsPerPage);
-                }}
+                setPage(page);
+                setPageSize(itemsPerPage);
+            }}
                 totalItems={data?.zone?.members?.length ?? 0}
             />
             {canAddCountries && (

package/src/app/routes/_authenticated/_zones/zones.graphql.ts

@@ -1,4 +1,4 @@
-import { graphql } from '@/vdb/graphql/graphql.js';
+import { graphql } from '@/graphql/graphql.js';
 
 export const zoneItemFragment = graphql(`
     fragment ZoneItem on Zone {
@@ -42,7 +42,7 @@ export const zoneMembersQuery = graphql(`
     }
 `);
 
-export const zoneDetailDocument = graphql(
+export const zoneDetailQuery = graphql(
     `
         query ZoneDetail($id: ID!) {
             zone(id: $id) {
@@ -94,12 +94,3 @@ export const deleteZoneDocument = graphql(`
         }
     }
 `);
-
-export const deleteZonesDocument = graphql(`
-    mutation DeleteZones($ids: [ID!]!) {
-        deleteZones(ids: $ids) {
-            result
-            message
-        }
-    }
-`);

package/src/app/routes/_authenticated/_zones/zones.tsx

@@ -1,12 +1,11 @@
-import { DetailPageButton } from '@/vdb/components/shared/detail-page-button.js';
-import { PermissionGuard } from '@/vdb/components/shared/permission-guard.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 { Trans } from '@/vdb/lib/trans.js';
+import { DetailPageButton } from '@/components/shared/detail-page-button.js';
+import { PermissionGuard } from '@/components/shared/permission-guard.js';
+import { Button } from '@/components/ui/button.js';
+import { PageActionBarRight } from '@/framework/layout-engine/page-layout.js';
+import { ListPage } from '@/framework/page/list-page.js';
+import { Trans } from '@/lib/trans.js';
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { PlusIcon } from 'lucide-react';
-import { DeleteZonesBulkAction } from './components/zone-bulk-actions.js';
 import { ZoneCountriesSheet } from './components/zone-countries-sheet.js';
 import { deleteZoneDocument, zoneListQuery } from './zones.graphql.js';
 
@@ -42,12 +41,6 @@ function ZoneListPage() {
                     ),
                 },
             }}
-            bulkActions={[
-                {
-                    component: DeleteZonesBulkAction,
-                    order: 500,
-                },
-            ]}
         >
             <PageActionBarRight>
                 <PermissionGuard requires={['CreateZone']}>