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

package/src/app/routes/_authenticated/_customers/components/customer-order-table.tsx

@@ -1,90 +1,88 @@
-import { Money } from '@/vdb/components/data-display/money.js';
-import { PaginatedListDataTable } from '@/vdb/components/shared/paginated-list-data-table.js';
-import { Badge } from '@/vdb/components/ui/badge.js';
-import { Button } from '@/vdb/components/ui/button.js';
-import { Link } from '@tanstack/react-router';
-import { ColumnFiltersState, SortingState } from '@tanstack/react-table';
-import { useState } from 'react';
-import { customerOrderListDocument } from '../customers.graphql.js';
+import { Money } from "@/components/data-display/money.js";
+import { PaginatedListDataTable } from "@/components/shared/paginated-list-data-table.js";
+import { Badge } from "@/components/ui/badge.js";
+import { Button } from "@/components/ui/button.js";
+import { Link } from "@tanstack/react-router";
+import { ColumnFiltersState, SortingState } from "@tanstack/react-table";
+import { useState } from "react";
+import { customerOrderListDocument } from "../customers.graphql.js";
 
 interface CustomerOrderTableProps {
     customerId: string;
 }
 
-export function CustomerOrderTable({ customerId }: Readonly<CustomerOrderTableProps>) {
+export function CustomerOrderTable({ customerId }: CustomerOrderTableProps) {
     const [page, setPage] = useState(1);
     const [pageSize, setPageSize] = useState(10);
     const [sorting, setSorting] = useState<SortingState>([{ id: 'orderPlacedAt', desc: true }]);
     const [filters, setFilters] = useState<ColumnFiltersState>([]);
 
-    return (
-        <PaginatedListDataTable
-            listQuery={customerOrderListDocument}
-            transformVariables={variables => {
-                return {
-                    ...variables,
-                    customerId,
-                };
-            }}
-            defaultVisibility={{
-                id: false,
-                createdAt: false,
-                updatedAt: false,
-                type: false,
-                currencyCode: false,
-                total: false,
-            }}
-            customizeColumns={{
-                total: {
-                    header: 'Total',
-                    cell: ({ cell, row }) => {
-                        const value = cell.getValue();
-                        const currencyCode = row.original.currencyCode;
-                        return <Money value={value} currencyCode={currencyCode} />;
-                    },
+    return <PaginatedListDataTable
+        listQuery={customerOrderListDocument}
+        transformVariables={variables => {
+            return {
+                ...variables,
+                customerId,
+            };
+        }}
+        defaultVisibility={{
+            id: false,
+            createdAt: false,
+            updatedAt: false,
+            type: false,
+            currencyCode: false,
+            total: false,
+        }}
+        customizeColumns={{
+            total: {
+                header: 'Total',
+                cell: ({ cell, row }) => {
+                    const value = cell.getValue();
+                    const currencyCode = row.original.currencyCode;
+                    return <Money value={value} currencyCode={currencyCode} />;
                 },
-                totalWithTax: {
-                    header: 'Total with Tax',
-                    cell: ({ cell, row }) => {
-                        const value = cell.getValue();
-                        const currencyCode = row.original.currencyCode;
-                        return <Money value={value} currencyCode={currencyCode} />;
-                    },
+            },
+            totalWithTax: {
+                header: 'Total with Tax',
+                cell: ({ cell, row }) => {
+                    const value = cell.getValue();
+                    const currencyCode = row.original.currencyCode;
+                    return <Money value={value} currencyCode={currencyCode} />;
                 },
-                state: {
-                    header: 'State',
-                    cell: ({ cell }) => {
-                        const value = cell.getValue() as string;
-                        return <Badge variant="outline">{value}</Badge>;
-                    },
+            },
+            state: {
+                header: 'State',
+                cell: ({ cell }) => {
+                    const value = cell.getValue() as string;
+                    return <Badge variant="outline">{value}</Badge>;
                 },
-                code: {
-                    header: 'Code',
-                    cell: ({ cell, row }) => {
-                        const value = cell.getValue() as string;
-                        const id = row.original.id;
-                        return (
-                            <Button asChild variant="ghost">
-                                <Link to={`/orders/${id}`}>{value}</Link>
-                            </Button>
-                        );
-                    },
+            },
+            code: {
+                header: 'Code',
+                cell: ({ cell, row }) => {
+                    const value = cell.getValue() as string;
+                    const id = row.original.id;
+                    return (
+                        <Button asChild variant="ghost">
+                            <Link to={`/orders/${id}`}>{value}</Link>
+                        </Button>
+                    );
                 },
-            }}
-            page={page}
-            itemsPerPage={pageSize}
-            sorting={sorting}
-            columnFilters={filters}
-            onPageChange={(_, page, perPage) => {
-                setPage(page);
-                setPageSize(perPage);
-            }}
-            onSortChange={(_, sorting) => {
-                setSorting(sorting);
-            }}
-            onFilterChange={(_, filters) => {
-                setFilters(filters);
-            }}
-        />
-    );
+            },
+        }}
+        page={page}
+        itemsPerPage={pageSize}
+        sorting={sorting}
+        columnFilters={filters}
+        onPageChange={(_, page, perPage) => {
+            setPage(page);
+            setPageSize(perPage);
+        }}
+        onSortChange={(_, sorting) => {
+            setSorting(sorting);
+        }}
+        onFilterChange={(_, filters) => {
+            setFilters(filters);
+        }}
+    />;
 }

package/src/app/routes/_authenticated/_customers/components/customer-status-badge.tsx

@@ -1,6 +1,6 @@
-import { Badge } from '@/vdb/components/ui/badge.js';
-import { Trans } from '@/vdb/lib/trans.js';
-import { BadgeCheck, BadgeX } from 'lucide-react';
+import { Badge } from '@/components/ui/badge.js';
+import { BadgeX, BadgeCheck } from 'lucide-react';
+import { Trans } from '@/lib/trans.js';
 
 export type CustomerStatus = 'guest' | 'registered' | 'verified';
 
@@ -8,7 +8,7 @@ export interface CustomerStatusBadgeProps {
     user?: { verified: boolean } | null;
 }
 
-export function CustomerStatusBadge({ user }: Readonly<CustomerStatusBadgeProps>) {
+export function CustomerStatusBadge({ user }: CustomerStatusBadgeProps) {
     const status = user ? (user.verified ? 'verified' : 'registered') : 'guest';
     return (
         <Badge variant="outline">

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

@@ -1,4 +1,5 @@
-import { graphql } from '@/vdb/graphql/graphql.js';
+import { graphql } from '@/graphql/graphql.js';
+import { gql } from 'awesome-graphql-client';
 
 export const customerListDocument = graphql(`
     query GetCustomerList($options: CustomerListOptions) {
@@ -201,12 +202,3 @@ export const removeCustomerFromGroupDocument = graphql(`
         }
     }
 `);
-
-export const deleteCustomersDocument = graphql(`
-    mutation DeleteCustomers($ids: [ID!]!) {
-        deleteCustomers(ids: $ids) {
-            result
-            message
-        }
-    }
-`);

package/src/app/routes/_authenticated/_customers/customers.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 { DeleteCustomersBulkAction } from './components/customer-bulk-actions.js';
 import { CustomerStatusBadge } from './components/customer-status-badge.js';
 import { customerListDocument, deleteCustomerDocument } from './customers.graphql.js';
 
@@ -67,12 +66,6 @@ function CustomerListPage() {
                 firstName: false,
                 lastName: false,
             }}
-            bulkActions={[
-                {
-                    component: DeleteCustomersBulkAction,
-                    order: 500,
-                },
-            ]}
         >
             <PageActionBarRight>
                 <PermissionGuard requires={['CreateCustomer']}>

package/src/app/routes/_authenticated/_customers/customers_.$id.tsx

@@ -1,9 +1,9 @@
-import { CustomerGroupChip } from '@/vdb/components/shared/customer-group-chip.js';
-import { CustomerGroupSelector } from '@/vdb/components/shared/customer-group-selector.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 { Button } from '@/vdb/components/ui/button.js';
+import { CustomerGroupChip } from '@/components/shared/customer-group-chip.js';
+import { CustomerGroupSelector } from '@/components/shared/customer-group-selector.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 {
     Dialog,
     DialogContent,
@@ -11,9 +11,9 @@ import {
     DialogHeader,
     DialogTitle,
     DialogTrigger,
-} from '@/vdb/components/ui/dialog.js';
-import { Input } from '@/vdb/components/ui/input.js';
-import { NEW_ENTITY_PATH } from '@/vdb/constants.js';
+} from '@/components/ui/dialog.js';
+import { Input } from '@/components/ui/input.js';
+import { NEW_ENTITY_PATH } from '@/constants.js';
 import {
     CustomFieldsPageBlock,
     DetailFormGrid,
@@ -23,11 +23,11 @@ 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 { api } from '@/vdb/graphql/api.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 { api } from '@/graphql/api.js';
+import { Trans, useLingui } from '@/lib/trans.js';
 import { useMutation } from '@tanstack/react-query';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { Plus } from 'lucide-react';
@@ -47,12 +47,9 @@ import {
     updateCustomerDocument,
 } from './customers.graphql.js';
 
-const pageId = 'customer-detail';
-
 export const Route = createFileRoute('/_authenticated/_customers/customers_/$id')({
     component: CustomerDetailPage,
     loader: detailPageRouteLoader({
-        pageId,
         queryDocument: customerDetailDocument,
         breadcrumb: (isNew, entity) => [
             { path: '/customers', label: 'Customers' },
@@ -70,7 +67,6 @@ function CustomerDetailPage() {
     const [newAddressOpen, setNewAddressOpen] = useState(false);
 
     const { form, submitHandler, entity, isPending, refreshEntity, resetForm } = useDetailPage({
-        pageId,
         queryDocument: customerDetailDocument,
         createDocument: createCustomerDocument,
         updateDocument: updateCustomerDocument,
@@ -141,7 +137,7 @@ function CustomerDetailPage() {
     const customerName = entity ? `${entity.firstName} ${entity.lastName}` : '';
 
     return (
-        <Page pageId={pageId} form={form} submitHandler={submitHandler} entity={entity}>
+        <Page pageId="customer-detail" form={form} submitHandler={submitHandler}>
             <PageTitle>{creatingNewEntity ? <Trans>New customer</Trans> : customerName}</PageTitle>
             <PageActionBar>
                 <PageActionBarRight>

package/src/app/routes/_authenticated/_facets/components/edit-facet-value.tsx

@@ -1,11 +1,11 @@
-import { usePaginatedList } from '@/vdb/components/shared/paginated-list-data-table.js';
-import { Button } from '@/vdb/components/ui/button.js';
-import { Form, FormControl, FormItem, FormLabel, FormMessage } from '@/vdb/components/ui/form.js';
-import { Input } from '@/vdb/components/ui/input.js';
-import { api } from '@/vdb/graphql/api.js';
-import { graphql } from '@/vdb/graphql/graphql.js';
-import { useUserSettings } from '@/vdb/hooks/use-user-settings.js';
-import { Trans } from '@/vdb/lib/trans.js';
+import { usePaginatedList } from '@/components/shared/paginated-list-data-table.js';
+import { Button } from '@/components/ui/button.js';
+import { Form, FormControl, FormItem, FormLabel, FormMessage } from '@/components/ui/form.js';
+import { Input } from '@/components/ui/input.js';
+import { api } from '@/graphql/api.js';
+import { graphql } from '@/graphql/graphql.js';
+import { useUserSettings } from '@/hooks/use-user-settings.js';
+import { Trans } from '@/lib/trans.js';
 import { useMutation, useQuery } from '@tanstack/react-query';
 import { useForm } from 'react-hook-form';
 
@@ -40,7 +40,7 @@ export interface EditFacetValueProps {
     onSuccess?: () => void;
 }
 
-export function EditFacetValue({ facetValueId, onSuccess }: Readonly<EditFacetValueProps>) {
+export function EditFacetValue({ facetValueId, onSuccess }: EditFacetValueProps) {
     const {
         settings: { contentLanguage },
     } = useUserSettings();

package/src/app/routes/_authenticated/_facets/components/facet-values-sheet.tsx

@@ -1,4 +1,3 @@
-import { Button } from '@/vdb/components/ui/button.js';
 import {
     Sheet,
     SheetContent,
@@ -6,10 +5,11 @@ import {
     SheetHeader,
     SheetTitle,
     SheetTrigger,
-} from '@/vdb/components/ui/sheet.js';
-import { Trans } from '@/vdb/lib/trans.js';
+} from '@/components/ui/sheet.js';
+import { Trans } from '@/lib/trans.js';
 import { PanelLeftOpen } from 'lucide-react';
 import { FacetValuesTable } from './facet-values-table.js';
+import { Button } from '@/components/ui/button.js';
 
 export interface FacetValuesSheetProps {
     facetName: string;
@@ -17,7 +17,7 @@ export interface FacetValuesSheetProps {
     children?: React.ReactNode;
 }
 
-export function FacetValuesSheet({ facetName, facetId, children }: Readonly<FacetValuesSheetProps>) {
+export function FacetValuesSheet({ facetName, facetId, children }: FacetValuesSheetProps) {
     return (
         <Sheet>
             <SheetTrigger asChild>

package/src/app/routes/_authenticated/_facets/components/facet-values-table.tsx

@@ -1,9 +1,9 @@
-import { PaginatedListDataTable } from '@/vdb/components/shared/paginated-list-data-table.js';
-import { Button } from '@/vdb/components/ui/button.js';
-import { Popover, PopoverContent, PopoverTrigger } from '@/vdb/components/ui/popover.js';
-import { addCustomFields } from '@/vdb/framework/document-introspection/add-custom-fields.js';
-import { graphql } from '@/vdb/graphql/graphql.js';
-import { Trans } from '@/vdb/lib/trans.js';
+import { PaginatedListDataTable } from '@/components/shared/paginated-list-data-table.js';
+import { Button } from '@/components/ui/button.js';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover.js';
+import { addCustomFields } from '@/framework/document-introspection/add-custom-fields.js';
+import { graphql } from '@/graphql/graphql.js';
+import { Trans } from '@/lib/trans.js';
 import { ColumnFiltersState, SortingState } from '@tanstack/react-table';
 import { useState } from 'react';
 import { EditFacetValue } from './edit-facet-value.js';
@@ -24,16 +24,17 @@ export const facetValueListDocument = graphql(`
     }
 `);
 
+
 export interface FacetValuesTableProps {
     facetId: string;
 }
 
-export function FacetValuesTable({ facetId }: Readonly<FacetValuesTableProps>) {
+export function FacetValuesTable({ facetId }: FacetValuesTableProps) {
     const [sorting, setSorting] = useState<SortingState>([]);
     const [page, setPage] = useState(1);
     const [pageSize, setPageSize] = useState(10);
     const [filters, setFilters] = useState<ColumnFiltersState>([]);
-
+    
     return (
         <PaginatedListDataTable
             listQuery={addCustomFields(facetValueListDocument)}
@@ -81,15 +82,10 @@ export function FacetValuesTable({ facetId }: Readonly<FacetValuesTableProps>) {
                         return (
                             <Popover open={open} onOpenChange={setOpen}>
                                 <PopoverTrigger asChild>
-                                    <Button type="button" variant="outline" size="sm">
-                                        <Trans>Edit</Trans>
-                                    </Button>
+                                    <Button type="button" variant="outline" size="sm"><Trans>Edit</Trans></Button>
                                 </PopoverTrigger>
                                 <PopoverContent className="w-80">
-                                    <EditFacetValue
-                                        facetValueId={facetValue.id}
-                                        onSuccess={() => setOpen(false)}
-                                    />
+                                    <EditFacetValue facetValueId={facetValue.id} onSuccess={() => setOpen(false)} />
                                 </PopoverContent>
                             </Popover>
                         );

package/src/app/routes/_authenticated/_facets/facets.graphql.ts

@@ -1,4 +1,4 @@
-import { graphql } from '@/vdb/graphql/graphql.js';
+import { graphql } from '@/graphql/graphql.js';
 
 export const facetValueFragment = graphql(`
     fragment FacetValue on FacetValue {
@@ -102,33 +102,3 @@ export const deleteFacetDocument = graphql(`
         }
     }
 `);
-
-export const assignFacetsToChannelDocument = graphql(`
-    mutation AssignFacetsToChannel($input: AssignFacetsToChannelInput!) {
-        assignFacetsToChannel(input: $input) {
-            id
-        }
-    }
-`);
-
-export const removeFacetsFromChannelDocument = graphql(`
-    mutation RemoveFacetsFromChannel($input: RemoveFacetsFromChannelInput!) {
-        removeFacetsFromChannel(input: $input) {
-            ... on Facet {
-                id
-            }
-            ... on ErrorResult {
-                message
-            }
-        }
-    }
-`);
-
-export const deleteFacetsDocument = graphql(`
-    mutation DeleteFacets($ids: [ID!]!) {
-        deleteFacets(ids: $ids) {
-            result
-            message
-        }
-    }
-`);

package/src/app/routes/_authenticated/_facets/facets.tsx

@@ -1,19 +1,13 @@
-import { DetailPageButton } from '@/vdb/components/shared/detail-page-button.js';
-import { FacetValueChip } from '@/vdb/components/shared/facet-value-chip.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 { FacetValueChip } from '@/components/shared/facet-value-chip.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 { ResultOf } from 'gql.tada';
 import { PlusIcon } from 'lucide-react';
-import {
-    AssignFacetsToChannelBulkAction,
-    DeleteFacetsBulkAction,
-    DuplicateFacetsBulkAction,
-    RemoveFacetsFromChannelBulkAction,
-} from './components/facet-bulk-actions.js';
 import { FacetValuesSheet } from './components/facet-values-sheet.js';
 import { deleteFacetDocument, facetListDocument } from './facets.graphql.js';
 
@@ -86,24 +80,6 @@ function FacetListPage() {
                     },
                 };
             }}
-            bulkActions={[
-                {
-                    order: 100,
-                    component: AssignFacetsToChannelBulkAction,
-                },
-                {
-                    order: 200,
-                    component: RemoveFacetsFromChannelBulkAction,
-                },
-                {
-                    order: 300,
-                    component: DuplicateFacetsBulkAction,
-                },
-                {
-                    order: 400,
-                    component: DeleteFacetsBulkAction,
-                },
-            ]}
             route={Route}
         >
             <PageActionBarRight>

package/src/app/routes/_authenticated/_facets/facets_.$id.tsx

@@ -1,11 +1,11 @@
-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 { TranslatableFormFieldWrapper } from '@/vdb/components/shared/translatable-form-field.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 { TranslatableFormFieldWrapper } from '@/components/shared/translatable-form-field.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,
@@ -15,21 +15,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 { FacetValuesTable } from './components/facet-values-table.js';
 import { createFacetDocument, facetDetailDocument, updateFacetDocument } from './facets.graphql.js';
 
-const pageId = 'facet-detail';
-
 export const Route = createFileRoute('/_authenticated/_facets/facets_/$id')({
     component: FacetDetailPage,
     loader: detailPageRouteLoader({
-        pageId,
         queryDocument: facetDetailDocument,
         breadcrumb(isNew, entity) {
             return [{ path: '/facets', label: 'Facets' }, isNew ? <Trans>New facet</Trans> : entity?.name];
@@ -45,7 +42,6 @@ function FacetDetailPage() {
     const { i18n } = useLingui();
 
     const { form, submitHandler, entity, isPending, resetForm } = useDetailPage({
-        pageId,
         queryDocument: facetDetailDocument,
         createDocument: createFacetDocument,
         updateDocument: updateFacetDocument,
@@ -86,7 +82,7 @@ function FacetDetailPage() {
     });
 
     return (
-        <Page pageId={pageId} form={form} submitHandler={submitHandler} entity={entity}>
+        <Page pageId="facet-detail" form={form} submitHandler={submitHandler}>
             <PageTitle>{creatingNewEntity ? <Trans>New facet</Trans> : (entity?.name ?? '')}</PageTitle>
             <PageActionBar>
                 <PageActionBarRight>

package/src/app/routes/_authenticated/_global-settings/global-settings.graphql.ts

@@ -1,4 +1,4 @@
-import { graphql } from '@/vdb/graphql/graphql.js';
+import { graphql } from '@/graphql/graphql.js';
 
 export const globalSettingsDocument = graphql(`
     query GlobalSettings {

package/src/app/routes/_authenticated/_global-settings/global-settings.tsx

@@ -1,11 +1,11 @@
-import { ErrorPage } from '@/vdb/components/shared/error-page.js';
-import { FormFieldWrapper } from '@/vdb/components/shared/form-field-wrapper.js';
-import { LanguageSelector } from '@/vdb/components/shared/language-selector.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 { LanguageSelector } from '@/components/shared/language-selector.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,
@@ -15,10 +15,10 @@ import {
     PageBlock,
     PageLayout,
     PageTitle,
-} from '@/vdb/framework/layout-engine/page-layout.js';
-import { useDetailPage } from '@/vdb/framework/page/use-detail-page.js';
-import { api } from '@/vdb/graphql/api.js';
-import { Trans, useLingui } from '@/vdb/lib/trans.js';
+} from '@/framework/layout-engine/page-layout.js';
+import { useDetailPage } from '@/framework/page/use-detail-page.js';
+import { api } from '@/graphql/api.js';
+import { Trans, useLingui } from '@/lib/trans.js';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { toast } from 'sonner';
 import { globalSettingsDocument, updateGlobalSettingsDocument } from './global-settings.graphql.js';
@@ -78,7 +78,7 @@ function GlobalSettingsPage() {
     });
 
     return (
-        <Page pageId="global-settings" form={form} submitHandler={submitHandler} entity={entity}>
+        <Page pageId="global-settings" form={form} submitHandler={submitHandler}>
             <PageTitle>
                 <Trans>Global settings</Trans>
             </PageTitle>