npm - @vendure/dashboard - Versions diffs - 3.5.0-minor-202510031341 → 3.5.0-minor-202510161257 - Mend

@vendure/dashboard 3.5.0-minor-202510031341 → 3.5.0-minor-202510161257

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (220) hide show

package/dist/plugin/dashboard.plugin.js CHANGED Viewed

@@ -151,7 +151,7 @@ let DashboardPlugin = DashboardPlugin_1 = class DashboardPlugin {
     createStaticServer(dashboardPath) {
         const limiter = (0, express_rate_limit_1.rateLimit)({
             windowMs: 60 * 1000,
-            limit: process.env.NODE_ENV === 'production' ? 500 : 2000,
+            limit: process.env.NODE_ENV === 'production' ? 500 : 10000,
             standardHeaders: true,
             legacyHeaders: false,
         });

package/dist/plugin/default-page.html CHANGED Viewed

@@ -108,7 +108,7 @@
 </head>
 <body>
     <div class="container">
-        <svg viewBox="0 0 539 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <svg class="logo" viewBox="0 0 539 100" fill="none" xmlns="http://www.w3.org/2000/svg">
             <path d="M198.715 29.7044C198.311 29.1369 197.638 28.7809 196.916 28.7809H189.317C188.393 28.7809 187.547 29.3774 187.239 30.2431L174.3 67.6252L161.16 30.2239C160.862 29.3581 160.034 28.7617 159.082 28.7617H151.261C150.54 28.7617 149.886 29.108 149.462 29.6852C149.058 30.2527 148.962 31.0031 149.183 31.6764L167.817 82.9974C168.115 83.8632 168.942 84.4404 169.866 84.4404H178.139C179.062 84.4404 179.889 83.8728 180.188 82.9974L198.927 31.6764C199.177 31.0031 199.081 30.2623 198.648 29.6852L198.696 29.714L198.715 29.7044Z" fill="#17C1FF"/>
             <path d="M252.778 58.3518C252.855 57.5342 252.903 56.4086 252.903 54.9465C252.903 49.7807 251.729 45.0286 249.43 40.8055C247.131 36.5825 243.88 33.1771 239.839 30.7145C235.77 28.2518 231.143 26.982 226.15 26.982C220.85 26.982 216.031 28.2711 211.836 30.8107C207.642 33.3503 204.343 36.9288 201.995 41.4212C199.667 45.8655 198.494 50.9639 198.494 56.553C198.494 62.142 199.696 67.2404 202.044 71.7135C204.42 76.2156 207.767 79.7941 211.99 82.3241C216.213 84.8636 221.081 86.1527 226.458 86.1527C232.23 86.1527 237.329 84.9887 241.619 82.6511C245.89 80.3135 249.392 77.0621 252.008 72.9834C252.633 71.9925 252.354 70.6746 251.383 70.0012L245.438 66.0476C244.938 65.7205 244.341 65.5955 243.735 65.7205C243.158 65.8456 242.639 66.2207 242.34 66.7113C240.792 69.299 238.695 71.3384 236.145 72.8006C233.596 74.2435 230.277 74.9842 226.256 74.9842C221.456 74.9842 217.791 73.4162 215.04 70.1648C212.644 67.327 211.163 64.0755 210.595 60.2469H250.613C251.739 60.2469 252.691 59.4004 252.787 58.2845V58.3326L252.778 58.3518ZM211.355 49.8288C212.25 46.7986 213.78 44.2397 215.925 42.0753C218.57 39.4395 221.899 38.1505 226.122 38.1505C230.345 38.1505 233.846 39.2664 236.318 41.5558C238.339 43.4413 239.791 46.231 240.59 49.8095H211.336L211.365 49.8384L211.355 49.8288Z" fill="#17C1FF"/>
             <path d="M305.417 36.6883C303.396 33.5042 300.645 31.0512 297.25 29.4062C293.931 27.819 290.227 26.9917 286.331 26.9917C282.108 26.9917 278.337 28.0114 275.086 30.0026C273.758 30.8203 272.537 31.7919 271.44 32.8885V30.9261C271.44 29.7333 270.468 28.7425 269.237 28.7425H261.743C260.541 28.7425 259.54 29.714 259.54 30.9261V82.2471C259.54 83.4399 260.512 84.4308 261.743 84.4308H269.237C270.439 84.4308 271.44 83.4592 271.44 82.2471V56.5722C271.44 50.7811 272.642 46.1348 275.009 42.8064C277.231 39.6704 280.559 38.1312 285.129 38.1312C292.978 38.1312 296.624 42.2773 296.624 51.2044V82.2471C296.624 83.4399 297.596 84.4308 298.827 84.4308H306.321C307.523 84.4308 308.524 83.4592 308.524 82.2471V47.9241C308.524 43.653 307.504 39.8724 305.503 36.6883H305.426H305.417Z" fill="#17C1FF"/>

package/dist/vite/utils/ast-utils.spec.js CHANGED Viewed

@@ -2,7 +2,7 @@ import ts from 'typescript';
 import { describe, expect, it } from 'vitest';
 import { findConfigExport } from './ast-utils.js';
 describe('findConfigExport', () => {
-    it('should return undefined when no VendureConfig export is found', () => {
+    it('should return undefined when no VendureConfig export is found', { timeout: 30000 }, () => {
         const sourceText = `
             export const notConfig = {
                 some: 'value'
@@ -12,7 +12,7 @@ describe('findConfigExport', () => {
         const result = findConfigExport(sourceFile);
         expect(result).toBeUndefined();
     });
-    it('should find exported variable with VendureConfig type', () => {
+    it('should find exported variable with VendureConfig type', { timeout: 30000 }, () => {
         const sourceText = `
             import { VendureConfig } from '@vendure/core';
@@ -26,7 +26,7 @@ describe('findConfigExport', () => {
         const result = findConfigExport(sourceFile);
         expect(result).toBe('config');
     });
-    it('should find exported variable with VendureConfig type among other exports', () => {
+    it('should find exported variable with VendureConfig type among other exports', { timeout: 30000 }, () => {
         const sourceText = `
             import { VendureConfig } from '@vendure/core';

package/dist/vite/utils/tsconfig-utils.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import path from 'path';
+import stripJsonComments from 'strip-json-comments';
 /**
  * Finds and parses tsconfig files in the given directory and its parent directories.
  */
@@ -33,7 +34,7 @@ export async function findTsConfigPaths(configPath, logger, phase, transformTsCo
 }
 async function getCompilerOptionsFromFile(tsConfigFilePath) {
     const tsConfigContent = await fs.readFile(tsConfigFilePath, 'utf-8');
-    const tsConfig = JSON.parse(tsConfigContent);
+    const tsConfig = JSON.parse(stripJsonComments(tsConfigContent));
     return tsConfig.compilerOptions || {};
 }
 function getTransformedPathMappings(paths, phase, transformTsConfigPathMappings) {

package/dist/vite/vite-plugin-hmr.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import { Plugin } from 'vite';
+/**
+ * @description
+ * This plugin enables kind-of HMR for when dashboard extension files change.
+ * It is not true HMR because it triggers a page reload. Making real HMR work is very
+ * tricky in this case due to the way we load extension files via virtual modules.
+ */
+export declare function hmrPlugin(): Plugin;

package/dist/vite/vite-plugin-hmr.js ADDED Viewed

@@ -0,0 +1,34 @@
+/**
+ * @description
+ * This plugin enables kind-of HMR for when dashboard extension files change.
+ * It is not true HMR because it triggers a page reload. Making real HMR work is very
+ * tricky in this case due to the way we load extension files via virtual modules.
+ */
+export function hmrPlugin() {
+    let viteRoot;
+    return {
+        name: 'vendure:hmr',
+        configResolved(config) {
+            viteRoot = config.root;
+        },
+        handleHotUpdate({ server, modules, timestamp, file }) {
+            const invalidatedModules = new Set();
+            for (const mod of modules) {
+                server.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
+                // Check if this is a file outside the Vite root (e.g., dashboard extensions)
+                const isOutsideRoot = mod.file && !mod.file.startsWith(viteRoot);
+                if (isOutsideRoot) {
+                    // For files outside root, trigger a full page reload
+                    // This ensures all extension code is fresh
+                    server.ws.send({
+                        type: 'full-reload',
+                        path: '*',
+                    });
+                    return [];
+                }
+            }
+            // Let Vite handle normal HMR for files inside root
+            return undefined;
+        },
+    };
+}

package/dist/vite/vite-plugin-theme.js CHANGED Viewed

@@ -7,16 +7,16 @@ const defaultVariables = {
         popover: 'oklch(1.0000 0 0)',
         'popover-foreground': 'oklch(0.2103 0.0059 285.8852)',
         primary: 'oklch(0.7613 0.1503 231.1314)',
-        'primary-foreground': 'oklch(0.1408 0.0044 285.8229)',
+        'primary-foreground': 'oklch(0.261 0.043 218.379)',
         secondary: 'oklch(0.9674 0.0013 286.3752)',
         'secondary-foreground': 'oklch(0.2103 0.0059 285.8852)',
         muted: 'oklch(0.9674 0.0013 286.3752)',
         'muted-foreground': 'oklch(0.5517 0.0138 285.9385)',
         accent: 'oklch(0.9674 0.0013 286.3752)',
         'accent-foreground': 'oklch(0.2103 0.0059 285.8852)',
-        destructive: 'oklch(0.5771 0.2152 27.3250)',
+        destructive: 'oklch(0.505 0.188 27.325)',
         'destructive-foreground': 'oklch(0.9851 0 0)',
-        success: 'hsl(100, 81%, 35%)',
+        success: 'hsl(99deg 67.25% 33.2%)',
         'success-foreground': 'hsl(0 0% 98%)',
         'dev-mode': 'hsl(204, 76%, 62%)',
         'dev-mode-foreground': 'hsl(0 0% 98%)',
@@ -58,9 +58,9 @@ const defaultVariables = {
         'muted-foreground': 'oklch(0.7118 0.0129 286.0665)',
         accent: 'oklch(0.2739 0.0055 286.0326)',
         'accent-foreground': 'oklch(0.9851 0 0)',
-        destructive: 'oklch(0.6368 0.2078 25.3313)',
+        destructive: 'oklch(0.4 0.15 27.11)',
         'destructive-foreground': 'oklch(0.9851 0 0)',
-        success: 'hsl(100, 100%, 35%)',
+        success: 'hsl(100 76.42% 22.21%)',
         'success-foreground': 'hsl(0 0% 98%)',
         'dev-mode': 'hsl(204, 86%, 53%)',
         'dev-mode-foreground': 'hsl(0 0% 98%)',
@@ -72,7 +72,7 @@ const defaultVariables = {
         'chart-3': 'oklch(0.6450 0.2154 16.4393)',
         'chart-4': 'oklch(0.7686 0.1647 70.0804)',
         'chart-5': 'oklch(0.7227 0.1920 149.5793)',
-        sidebar: 'oklch(0.1408 0.0044 285.8229)',
+        sidebar: 'oklch(0.2 0 0)',
         'sidebar-foreground': 'oklch(0.9851 0 0)',
         'sidebar-primary': 'oklch(0.7613 0.1503 231.1314)',
         'sidebar-primary-foreground': 'oklch(0.1408 0.0044 285.8229)',

package/dist/vite/vite-plugin-transform-index.js CHANGED Viewed

@@ -17,7 +17,12 @@ export function transformIndexHtmlPlugin() {
         },
         // Only apply this plugin during the build phase
         apply: 'build',
-        transformIndexHtml(html) {
+        transformIndexHtml(html, ctx) {
+            // Don't transform Storybook HTML files
+            if (ctx.filename &&
+                (ctx.filename.includes('iframe.html') || ctx.filename.includes('storybook'))) {
+                return html;
+            }
             if (config.base && config.base !== '/') {
                 // Remove the base path from hrefs and srcs
                 const basePath = config.base.replace(/\/$/, ''); // Remove trailing slash

package/dist/vite/vite-plugin-vendure-dashboard.d.ts CHANGED Viewed

@@ -73,11 +73,38 @@ export type VitePluginVendureDashboardOptions = {
      * the location based on the location of the `@vendure/core` package.
      */
     pluginPackageScanner?: PackageScannerConfig;
+    /**
+     * @description
+     * Allows you to selectively disable individual plugins.
+     * @example
+     * ```ts
+     * vendureDashboardPlugin({
+     *   vendureConfigPath: './config.ts',
+     *   disablePlugins: {
+     *     react: true,
+     *     lingui: true,
+     *   }
+     * })
+     * ```
+     */
+    disablePlugins?: {
+        tanstackRouter?: boolean;
+        react?: boolean;
+        lingui?: boolean;
+        themeVariables?: boolean;
+        tailwindSource?: boolean;
+        tailwindcss?: boolean;
+        configLoader?: boolean;
+        viteConfig?: boolean;
+        adminApiSchema?: boolean;
+        dashboardMetadata?: boolean;
+        uiConfig?: boolean;
+        gqlTada?: boolean;
+        transformIndexHtml?: boolean;
+        translations?: boolean;
+        hmr?: boolean;
+    };
 } & UiConfigPluginOptions & ThemeVariablesPluginOptions;
-/**
- * @description
- * This is a Vite plugin which configures a set of plugins required to build the Vendure Dashboard.
- */
 export declare function vendureDashboardPlugin(options: VitePluginVendureDashboardOptions): PluginOption[];
 /**
  * Get the normalized path to the Vendure config file given either a string or URL.

package/dist/vite/vite-plugin-vendure-dashboard.js CHANGED Viewed

@@ -8,60 +8,115 @@ import { configLoaderPlugin } from './vite-plugin-config-loader.js';
 import { viteConfigPlugin } from './vite-plugin-config.js';
 import { dashboardMetadataPlugin } from './vite-plugin-dashboard-metadata.js';
 import { gqlTadaPlugin } from './vite-plugin-gql-tada.js';
+import { hmrPlugin } from './vite-plugin-hmr.js';
 import { dashboardTailwindSourcePlugin } from './vite-plugin-tailwind-source.js';
 import { themeVariablesPlugin } from './vite-plugin-theme.js';
 import { transformIndexHtmlPlugin } from './vite-plugin-transform-index.js';
 import { translationsPlugin } from './vite-plugin-translations.js';
 import { uiConfigPlugin } from './vite-plugin-ui-config.js';
-/**
- * @description
- * This is a Vite plugin which configures a set of plugins required to build the Vendure Dashboard.
- */
 export function vendureDashboardPlugin(options) {
-    var _a;
+    var _a, _b;
     const tempDir = (_a = options.tempCompilationDir) !== null && _a !== void 0 ? _a : path.join(import.meta.dirname, './.vendure-dashboard-temp');
     const normalizedVendureConfigPath = getNormalizedVendureConfigPath(options.vendureConfigPath);
     const packageRoot = getDashboardPackageRoot();
     const linguiConfigPath = path.join(packageRoot, 'lingui.config.js');
+    const disabled = (_b = options.disablePlugins) !== null && _b !== void 0 ? _b : {};
     if (process.env.IS_LOCAL_DEV !== 'true') {
         process.env.LINGUI_CONFIG = linguiConfigPath;
     }
-    return [
-        ...(options.disableTansStackRouterPlugin
-            ? []
-            : [
+    const pluginMap = [
+        {
+            key: 'tanstackRouter',
+            plugin: () => !options.disableTansStackRouterPlugin &&
                 tanstackRouter({
                     autoCodeSplitting: true,
                     routeFileIgnorePattern: '.graphql.ts|components|hooks|utils',
                     routesDirectory: path.join(packageRoot, 'src/app/routes'),
                     generatedRouteTree: path.join(packageRoot, 'src/app/routeTree.gen.ts'),
                 }),
-            ]),
-        react({
-            plugins: [['@lingui/swc-plugin', {}]],
-        }),
-        lingui({}),
-        themeVariablesPlugin({ theme: options.theme }),
-        dashboardTailwindSourcePlugin(),
-        tailwindcss(),
-        configLoaderPlugin({
-            vendureConfigPath: normalizedVendureConfigPath,
-            outputPath: tempDir,
-            pathAdapter: options.pathAdapter,
-            pluginPackageScanner: options.pluginPackageScanner,
-        }),
-        viteConfigPlugin({ packageRoot }),
-        adminApiSchemaPlugin(),
-        dashboardMetadataPlugin(),
-        uiConfigPlugin(options),
-        ...(options.gqlOutputPath
-            ? [gqlTadaPlugin({ gqlTadaOutputPath: options.gqlOutputPath, tempDir, packageRoot })]
-            : []),
-        transformIndexHtmlPlugin(),
-        translationsPlugin({
-            packageRoot,
-        }),
+        },
+        {
+            key: 'react',
+            plugin: () => react({
+                plugins: [['@lingui/swc-plugin', {}]],
+            }),
+        },
+        {
+            key: 'lingui',
+            plugin: () => lingui({}),
+        },
+        {
+            key: 'themeVariables',
+            plugin: () => themeVariablesPlugin({ theme: options.theme }),
+        },
+        {
+            key: 'tailwindSource',
+            plugin: () => dashboardTailwindSourcePlugin(),
+        },
+        {
+            key: 'tailwindcss',
+            plugin: () => tailwindcss(),
+        },
+        {
+            key: 'configLoader',
+            plugin: () => configLoaderPlugin({
+                vendureConfigPath: normalizedVendureConfigPath,
+                outputPath: tempDir,
+                pathAdapter: options.pathAdapter,
+                pluginPackageScanner: options.pluginPackageScanner,
+            }),
+        },
+        {
+            key: 'viteConfig',
+            plugin: () => viteConfigPlugin({ packageRoot }),
+        },
+        {
+            key: 'adminApiSchema',
+            plugin: () => adminApiSchemaPlugin(),
+        },
+        {
+            key: 'dashboardMetadata',
+            plugin: () => dashboardMetadataPlugin(),
+        },
+        {
+            key: 'uiConfig',
+            plugin: () => uiConfigPlugin(options),
+        },
+        {
+            key: 'gqlTada',
+            plugin: () => options.gqlOutputPath &&
+                gqlTadaPlugin({ gqlTadaOutputPath: options.gqlOutputPath, tempDir, packageRoot }),
+        },
+        {
+            key: 'transformIndexHtml',
+            plugin: () => transformIndexHtmlPlugin(),
+        },
+        {
+            key: 'translations',
+            plugin: () => translationsPlugin({
+                packageRoot,
+            }),
+        },
+        {
+            key: 'hmr',
+            plugin: () => hmrPlugin(),
+        },
     ];
+    const plugins = [];
+    for (const entry of pluginMap) {
+        if (!disabled[entry.key]) {
+            const plugin = entry.plugin();
+            if (plugin) {
+                if (Array.isArray(plugin)) {
+                    plugins.push(...plugin);
+                }
+                else {
+                    plugins.push(plugin);
+                }
+            }
+        }
+    }
+    return plugins;
 }
 /**
  * @description

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@vendure/dashboard",
   "private": false,
-  "version": "3.5.0-minor-202510031341",
+  "version": "3.5.0-minor-202510161257",
   "type": "module",
   "repository": {
     "type": "git",
@@ -24,7 +24,10 @@
     "preview": "vite preview",
     "generate-index": "node scripts/generate-index.js",
     "i18n:extract": "lingui extract && node ./scripts/translate/i18n-tool.js extract",
-    "i18n:apply": "node ./scripts/translate/i18n-tool.js apply"
+    "i18n:apply": "node ./scripts/translate/i18n-tool.js apply",
+    "storybook": "storybook dev -p 6006",
+    "storybook:build": "storybook build",
+    "storybook:deploy": "npm run build --prefix ../common && npm run build --prefix ../core && npm run build:vite && storybook build"
   },
   "module": "./src/lib/index.ts",
   "main": "./src/lib/index.ts",
@@ -134,6 +137,7 @@
     "react-resizable-panels": "^3.0.3",
     "recharts": "^2.15.4",
     "sonner": "^2.0.6",
+    "strip-json-comments": "^5.0.3",
     "tailwind-merge": "^3.2.0",
     "tailwindcss": "^4.1.5",
     "tailwindcss-animate": "^1.0.7",
@@ -145,19 +149,28 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.19.0",
+    "@storybook/addon-a11y": "^10.0.0-beta.9",
+    "@storybook/addon-docs": "^10.0.0-beta.9",
+    "@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.0-minor-202510031341",
-    "@vendure/core": "^3.5.0-minor-202510031341",
+    "@vendure/common": "^3.5.0-minor-202510161257",
+    "@vendure/core": "^3.5.0-minor-202510161257",
+    "@vitest/browser": "^3.2.4",
+    "@vitest/coverage-v8": "^3.2.4",
     "eslint": "^9.19.0",
     "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.18",
+    "eslint-plugin-storybook": "^10.0.0-beta.9",
     "globals": "^15.14.0",
+    "playwright": "^1.55.1",
+    "storybook": "^10.0.0-beta.9",
     "vite-plugin-dts": "^4.5.4"
   },
   "optionalDependencies": {
     "lightningcss-linux-arm64-musl": "^1.29.3",
     "lightningcss-linux-x64-musl": "^1.29.1"
   },
-  "gitHead": "ffe957ddc6b419f17fced0b4b94fe66fc42528f8"
+  "gitHead": "7567509a55b94070b741cf44e432533a12233369"
 }

package/src/app/app-providers.tsx CHANGED Viewed

@@ -1,3 +1,4 @@
+import { AlertsProvider } from '@/vdb/providers/alerts-provider.js';
 import { AuthProvider } from '@/vdb/providers/auth.js';
 import { ChannelProvider } from '@/vdb/providers/channel-provider.js';
 import { I18nProvider } from '@/vdb/providers/i18n-provider.js';
@@ -17,7 +18,9 @@ export function AppProviders({ children }: { children: React.ReactNode }) {
                     <ThemeProvider defaultTheme="system">
                         <AuthProvider>
                             <ServerConfigProvider>
-                                <ChannelProvider>{children}</ChannelProvider>
+                                <ChannelProvider>
+                                    <AlertsProvider>{children}</AlertsProvider>
+                                </ChannelProvider>
                             </ServerConfigProvider>
                         </AuthProvider>
                     </ThemeProvider>

package/src/app/common/map-faceted-filter-fields.ts ADDED Viewed

@@ -0,0 +1,21 @@
+/**
+ * Maps filter fields to their corresponding ID fields in faceted filters.
+ * For example, transforms { category: '5' } to { categoryId: { eq: '5' } }
+ *
+ * @param facetedFilters - Array of filter objects to transform
+ * @param fieldMapping - Record mapping source field names to target field names
+ */
+export function mapFacetedFilterFields(
+    facetedFilters: Array<Record<string, any>>,
+    fieldMapping: Record<string, string>,
+) {
+    for (const [index, filter] of Object.entries(facetedFilters)) {
+        for (const [sourceField, targetField] of Object.entries(fieldMapping)) {
+            if (filter[sourceField]) {
+                facetedFilters[index as unknown as number] = {
+                    [targetField]: filter[sourceField],
+                };
+            }
+        }
+    }
+}

package/src/app/main.tsx CHANGED Viewed

@@ -38,7 +38,9 @@ const routerOptions: RouterOptions<AnyRoute, any> = {
         auth: undefined!, // This will be set after we wrap the app in an AuthProvider
         queryClient,
     },
-    defaultErrorComponent: ({ error }: { error: Error }) => <div>Uh Oh!!! {error.message}</div>,
+    defaultErrorComponent: ({ error }: { error: Error }) => (
+        <div className="text-destructive p-6">An error occurred: {error.message}</div>
+    ),
 };
 // Create a type-only router instance for TypeScript type registration

package/src/app/routes/_authenticated/_administrators/administrators.graphql.ts CHANGED Viewed

@@ -29,8 +29,8 @@ export const administratorItemFragment = graphql(`
 export const administratorListDocument = graphql(
     `
-        query AdministratorList {
-            administrators {
+        query AdministratorList($options: AdministratorListOptions) {
+            administrators(options: $options) {
                 items {
                     ...AdministratorItem
                 }

package/src/app/routes/_authenticated/_administrators/administrators.tsx CHANGED Viewed

@@ -24,10 +24,20 @@ function AdministratorListPage() {
             listQuery={administratorListDocument}
             route={Route}
             onSearchTermChange={searchTerm => {
+                return searchTerm
+                    ? {
+                          firstName: { contains: searchTerm },
+                          lastName: { contains: searchTerm },
+                          emailAddress: { contains: searchTerm },
+                      }
+                    : {};
+            }}
+            transformVariables={variables => {
                 return {
-                    firstName: { contains: searchTerm },
-                    lastName: { contains: searchTerm },
-                    emailAddress: { contains: searchTerm },
+                    options: {
+                        ...variables.options,
+                        filterOperator: 'OR',
+                    },
                 };
             }}
             additionalColumns={{

package/src/app/routes/_authenticated/_administrators/administrators_.$id.tsx CHANGED Viewed

@@ -75,11 +75,9 @@ function AdministratorDetailPage() {
         params: { id: params.id },
         onSuccess: async data => {
             toast(
-                i18n.t(
-                    creatingNewEntity
-                        ? 'Successfully created administrator'
-                        : 'Successfully updated administrator',
-                ),
+                creatingNewEntity
+                    ? t`Successfully created administrator`
+                    : t`Successfully updated administrator`,
             );
             resetForm();
             if (creatingNewEntity) {
@@ -87,14 +85,9 @@ function AdministratorDetailPage() {
             }
         },
         onError: err => {
-            toast(
-                i18n.t(
-                    creatingNewEntity ? 'Failed to create administrator' : 'Failed to update administrator',
-                ),
-                {
-                    description: err instanceof Error ? err.message : 'Unknown error',
-                },
-            );
+            toast(creatingNewEntity ? t`Failed to create administrator` : t`Failed to update administrator`, {
+                description: err instanceof Error ? err.message : 'Unknown error',
+            });
         },
     });

package/src/app/routes/_authenticated/_administrators/components/role-permissions-display.tsx CHANGED Viewed

@@ -29,7 +29,7 @@ interface RolePermissionsDisplayProps {
 }
 export function RolePermissionsDisplay({ value = [] }: Readonly<RolePermissionsDisplayProps>) {
-    const { t } = useLingui();
+    const { i18n } = useLingui();
     const groupedPermissions = useGroupedPermissions();
     const { data } = useQuery({

package/src/app/routes/_authenticated/_assets/assets.tsx CHANGED Viewed

@@ -1,15 +1,29 @@
 import { AssetGallery } from '@/vdb/components/shared/asset/asset-gallery.js';
 import { Page, PageBlock, PageTitle } from '@/vdb/framework/layout-engine/page-layout.js';
 import { Trans } from '@lingui/react/macro';
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { DeleteAssetsBulkAction } from './components/asset-bulk-actions.js';
 export const Route = createFileRoute('/_authenticated/_assets/assets')({
     component: RouteComponent,
     loader: () => ({ breadcrumb: () => <Trans>Assets</Trans> }),
+    validateSearch: (search: Record<string, unknown>) => {
+        return {
+            perPage: (search.perPage as number) || 24,
+        };
+    },
 });
 function RouteComponent() {
+    const navigate = useNavigate({ from: Route.fullPath });
+    const { perPage } = Route.useSearch();
+    const handlePageSizeChange = (newPageSize: number) => {
+        navigate({
+            search: (prev: any) => ({ ...prev, perPage: newPageSize }),
+        });
+    };
     return (
         <Page pageId="asset-list">
             <PageTitle>
@@ -19,6 +33,8 @@ function RouteComponent() {
                 <AssetGallery
                     selectable={true}
                     multiSelect="manual"
+                    pageSize={perPage}
+                    onPageSizeChange={handlePageSizeChange}
                     bulkActions={[
                         {
                             order: 10,

package/src/app/routes/_authenticated/_collections/collections.graphql.ts CHANGED Viewed

@@ -20,6 +20,7 @@ export const collectionListDocument = graphql(
                     }
                     name
                     slug
+                    description
                     breadcrumbs {
                         id
                         name

package/src/app/routes/_authenticated/_collections/collections.tsx CHANGED Viewed

@@ -13,6 +13,7 @@ import { ResultOf } from 'gql.tada';
 import { Folder, FolderOpen, PlusIcon } from 'lucide-react';
 import { useState } from 'react';
+import { RichTextDescriptionCell } from '@/vdb/components/shared/table-cell/order-table-cell-components.js';
 import { Badge } from '@/vdb/components/ui/badge.js';
 import { collectionListDocument } from './collections.graphql.js';
 import {
@@ -123,6 +124,9 @@ function CollectionListPage() {
                             );
                         },
                     },
+                    description: {
+                        cell: RichTextDescriptionCell,
+                    },
                     breadcrumbs: {
                         cell: ({ cell }) => {
                             const value = cell.getValue();
@@ -204,6 +208,7 @@ function CollectionListPage() {
                     position: false,
                     parentId: false,
                     children: false,
+                    description: false,
                 }}
                 onSearchTermChange={searchTerm => {
                     return {

package/src/app/routes/_authenticated/_collections/components/collection-bulk-actions.tsx CHANGED Viewed

@@ -68,7 +68,6 @@ export const DuplicateCollectionsBulkAction: BulkActionComponent<any> = ({ selec
         <DuplicateBulkAction
             entityType="Collection"
             duplicatorCode="collection-duplicator"
-            duplicatorArguments={[]}
             requiredPermissions={['UpdateCatalog', 'UpdateCollection']}
             entityName="Collection"
             selection={selection}