@ketvietlab/ketsuite 0.1.22 → 0.1.25

package/dist/modules/product_backend/routes.js

@@ -1,9 +1,10 @@
 import { randomUUID } from 'node:crypto';
 import { NAVIGATION_TYPE, encodeListState, fragment, json, parseListState, table, text, validateListState, withHeaders, } from '@ketvietlab/ketjs';
-import { attributesScreen, favoriteModal, newProductScreen, productDetailScreen, productsScreen, VARIANT_DETAIL_TABS, variantScreen, VIEWS, } from './screens/index.js';
-import { attributeControl, attributeValuesControl, brandControl, categoryControl, uomControl, } from './relation-control.js';
+import { attributesScreen, favoriteModal, productDetailScreen, productsScreen, VARIANT_DETAIL_TABS, variantScreen, VIEWS, } from './screens/index.js';
+import { uomControl } from './relation-control.js';
 import { PAGE_SIZE, colsHref, colsOf, pager, withParam } from '../backend/paging.js';
 import { backendPage, modalWorkspace } from '../../ui/index.js';
+import { recordModalCreateHref, recordModalHref } from '../../ui/record-modal.js';
 import { receiveAttachment } from '../storage/routes.js';
 import { errorsOf, readForm, seeOther } from '../backend/forms.js';
 import { productListSearch } from '../product/search.js';
@@ -34,7 +35,6 @@ const refusePost = (req, accepts = 'POST') => req.method !== 'POST'
         : null;
 const productTabOf = (url) => url.searchParams.get('tab') || 'general';
 const MEDIA_VARIANT_PAGE_SIZE = 25;
-const VARIANT_PAGE_SIZE = 10;
 const positivePage = (value) => {
     const page = Number.parseInt(value ?? '1', 10);
     return Number.isFinite(page) && page > 0 ? page : 1;
@@ -42,7 +42,6 @@ const positivePage = (value) => {
 const requestedVariantMediaPage = (url) => {
     return positivePage(url.searchParams.get('variantPage'));
 };
-const requestedVariantPage = (url) => positivePage(url.searchParams.get('page'));
 const variantTabOf = (url) => {
     const asked = url.searchParams.get('tab');
     return VARIANT_DETAIL_TABS.includes(asked ?? '')
@@ -106,17 +105,6 @@ const unitRootOf = (units, uomId) => {
     return unit ? (String(unit.parentPath).split('/').filter(Boolean)[0] ?? null) : null;
 };
 const invalidErrors = (url, _) => url.searchParams.has('invalid') ? [_('product_backend.error.invalid')] : undefined;
-const stockEnabled = async (ctx, req) => Boolean((await ctx.live(req)).functions['stock.configureProduct']);
-const TRACKING = ['none', 'lot', 'serial'];
-const validStockForm = (form) => {
-    const tracking = form.tracking || 'none';
-    return (TRACKING.includes(tracking) && (form.isStorable === '1' || tracking === 'none'));
-};
-const configureStock = (ctx, url, req, templateId, form) => ctx.call('stock.configureProduct', {
-    templateId,
-    isStorable: form.isStorable === '1',
-    tracking: form.tracking || 'none',
-}, url, req);
 const templateRow = (row) => ({
     id: row.id,
     name: row.name,
@@ -532,12 +520,12 @@ export const routes = {
             title: 'KetSuite',
             translate: false,
             body: (_, frame) => {
-                const workspace = productsScreen(_, decoratedRows, view, {
+                const workspace = productsScreen(_, decoratedRows, view, (id) => recordModalHref(url, { kind: 'product.template', id }), {
                     ...frame,
                     chrome: {
                         create: {
                             label: _('product_backend.create.title'),
-                            path: inLocale(url, '/admin/product/templates/new'),
+                            path: recordModalCreateHref(url, { kind: 'product.template' }),
                         },
                         selection,
                         search: {
@@ -557,7 +545,7 @@ export const routes = {
                             active: v === view,
                         })),
                     },
-                }, { shown: colsOf(url), colsHref: colsHref(url), groups, selection }, localeQuery(url), count, extensionActions);
+                }, { shown: colsOf(url), colsHref: colsHref(url), groups, selection }, count, extensionActions);
                 if (url.searchParams.get('modal') !== 'favorite')
                     return workspace;
                 const returnUrl = new URL(url);
@@ -639,59 +627,6 @@ export const routes = {
         }
         return seeOther(modalHref());
     },
-    '/admin/product/templates/new': (ctx) => async (url, req) => {
-        const lang = ctx.localeOf(url, req);
-        const _ = ctx.translate(lang);
-        const hasStock = await stockEnabled(ctx, req);
-        if (req.method === 'POST') {
-            if (crossSite(req))
-                return text('Forbidden', { status: 403 });
-            const form = await readForm(req);
-            if (hasStock && !validStockForm(form))
-                return seeOther(inLocale(url, '/admin/product/templates/new?invalid=1&count=1'));
-            const id = randomUUID();
-            const result = await ctx.call('product.saveTemplate', {
-                id,
-                name: form.name ?? '',
-                type: form.type || 'goods',
-                // Sent as null rather than omitted: an absent key is skipped by the
-                // changeset, so leaving it out would make the form's empty "—" option
-                // a no-op and the field impossible to clear once set.
-                uomId: form.uomId || null,
-                categoryId: form.categoryId || null,
-                brandId: form.brandId || null,
-                origin: form.origin || null,
-                description: form.description || null,
-                listPrice: form.listPrice || '0',
-                saleOk: form.saleOk === '1',
-                purchaseOk: form.purchaseOk === '1',
-                ...(Object.hasOwn(form, 'defaultCode') ? { defaultCode: form.defaultCode || null } : {}),
-                ...(Object.hasOwn(form, 'barcode') ? { barcode: form.barcode || null } : {}),
-            }, url, req);
-            if (!result.ok)
-                return seeOther(inLocale(url, `/admin/product/templates/new?invalid=1&count=${errorsOf(result).length}`));
-            if (hasStock) {
-                const stockResult = await configureStock(ctx, url, req, id, form);
-                if (!stockResult.ok)
-                    return seeOther(inLocale(url, `/admin/product/templates/${id}?invalid=1&count=${errorsOf(stockResult).length}`));
-            }
-            return seeProduct(id, url);
-        }
-        if (req.method !== 'GET')
-            return text('GET or POST', { status: 405 });
-        const options = await optionsFor(ctx, url, req);
-        const controls = {
-            uom: await uomControl(ctx, url, req, _, { id: 'product-create-uom', units: options.uoms }),
-            category: await categoryControl(ctx, url, req, _, {
-                id: 'product-create-category',
-                categories: options.categories,
-            }),
-        };
-        return adminPage(ctx, url, req, {
-            title: 'product_backend.create.title',
-            body: (_, frame) => newProductScreen(_, { ...options, stockEnabled: hasStock, errors: invalidErrors(url, _), controls }, frame, localeQuery(url)),
-        });
-    },
     '/admin/product/attributes': (ctx) => async (url, req) => {
         const lang = ctx.localeOf(url, req);
         const _ = ctx.translate(lang);
@@ -741,117 +676,33 @@ export const routes = {
             : seeOther(inLocale(url, '/admin/product/attributes?invalid=1'));
     },
     '/admin/product/templates/{id}': (ctx) => async (url, req, params) => {
+        // General and Variants now open in the record-modal (`product.template`);
+        // this route only still renders a page for Media, which the modal does not
+        // cover yet (see product_backend/modal/product-modal-view.tsx).
+        const askedTab = productTabOf(url);
+        if (req.method !== 'GET' || askedTab !== 'media') {
+            if (req.method !== 'GET')
+                return text('GET', { status: 405 });
+            return seeOther(recordModalHref(inLocale(url, '/admin/product/templates'), {
+                kind: 'product.template',
+                id: params.id,
+                tab: askedTab === 'variants' ? 'variants' : 'general',
+            }));
+        }
         const lang = ctx.localeOf(url, req);
         const _ = ctx.translate(lang);
-        const live = await ctx.live(req);
-        const hasStock = await stockEnabled(ctx, req);
-        const hasProductTax = Boolean(live.functions['account.getProductTax'] && live.functions['account.setProductTax']);
-        const activeTab = productTabOf(url);
         const locale = localeQuery(url);
-        const querySuffix = locale ? locale.replace(/^\?/, '&') : '';
-        let savedPartial = false;
-        if (req.method === 'POST') {
-            if (crossSite(req))
-                return text('Forbidden', { status: 403 });
-            const partial = isProductPartial(req);
-            const form = await readForm(req);
-            if (hasStock && !validStockForm(form)) {
-                if (partial)
-                    return json({ ok: false, message: _('product_backend.error.invalid'), errors: ['tracking'] }, { status: 422 });
-                return seeOther(inLocale(url, `/admin/product/templates/${params.id}?invalid=1&count=1`));
-            }
-            const result = await ctx.call('product.saveTemplate', {
-                id: params.id,
-                name: form.name ?? '',
-                type: form.type || 'goods',
-                // Sent as null rather than omitted: an absent key is skipped by the
-                // changeset, so leaving it out would make the form's empty "—" option
-                // a no-op and the field impossible to clear once set.
-                uomId: form.uomId || null,
-                categoryId: form.categoryId || null,
-                brandId: form.brandId || null,
-                origin: form.origin || null,
-                description: form.description || null,
-                listPrice: form.listPrice || '0',
-                saleOk: form.saleOk === '1',
-                purchaseOk: form.purchaseOk === '1',
-                ...(Object.hasOwn(form, 'defaultCode') ? { defaultCode: form.defaultCode || null } : {}),
-                ...(Object.hasOwn(form, 'barcode') ? { barcode: form.barcode || null } : {}),
-            }, url, req);
-            if (!result.ok) {
-                if (partial)
-                    return json({ ok: false, message: _('product_backend.error.invalid'), errors: errorsOf(result) }, { status: 422 });
-                return seeOther(inLocale(url, `/admin/product/templates/${params.id}?invalid=1&count=${errorsOf(result).length}`));
-            }
-            if (hasStock) {
-                const stockResult = await configureStock(ctx, url, req, params.id, form);
-                if (!stockResult.ok) {
-                    if (partial)
-                        return json({
-                            ok: false,
-                            message: _('product_backend.error.invalid'),
-                            errors: errorsOf(stockResult),
-                        }, { status: 422 });
-                    return seeOther(inLocale(url, `/admin/product/templates/${params.id}?invalid=1&count=${errorsOf(stockResult).length}`));
-                }
-            }
-            if (hasProductTax && Object.hasOwn(form, 'taxId')) {
-                const taxResult = await ctx.call('account.setProductTax', { templateId: params.id, taxId: form.taxId || null }, url, req);
-                if (!taxResult.ok) {
-                    if (partial)
-                        return json({
-                            ok: false,
-                            message: _('product_backend.error.invalid'),
-                            errors: errorsOf(taxResult),
-                        }, { status: 422 });
-                    return seeOther(inLocale(url, `/admin/product/templates/${params.id}?invalid=1&count=${errorsOf(taxResult).length}`));
-                }
-            }
-            if (!partial)
-                return seeProduct(params.id, url);
-            savedPartial = true;
-        }
-        if (req.method !== 'GET' && !savedPartial)
-            return text('GET or POST', { status: 405 });
         const row = (await ctx.call('product.getTemplate', { id: params.id }, url, req));
         if (!row)
             return text('Product not found', { status: 404 });
-        const [mediaRows, listedVariants, options, stockConfig, attributeLines, currentTax] = await Promise.all([
-            mediaFor(ctx, url, req, row.id),
-            ctx.call('product.listVariants', { templateId: row.id }, url, req),
-            optionsFor(ctx, url, req),
-            hasStock
-                ? ctx.call('stock.getProductConfig', { templateId: row.id }, url, req)
-                : Promise.resolve(null),
-            ctx.call('product.listAttributeLines', { templateId: row.id }, url, req),
-            hasProductTax
-                ? ctx.call('account.getProductTax', { templateId: row.id }, url, req)
-                : Promise.resolve(null),
-        ]);
-        const defaultVariant = (row.variants ?? []).find((variant) => String(variant.combinationKey ?? '') === '');
+        const listedVariants = (await ctx.call('product.listVariants', { templateId: row.id }, url, req));
         const variants = listedVariants.filter((variant) => String(variant.combinationKey ?? '') !== '');
-        const variantPageCount = Math.max(1, Math.ceil(variants.length / VARIANT_PAGE_SIZE));
-        const variantPage = Math.min(requestedVariantPage(url), variantPageCount);
-        const variantStart = (variantPage - 1) * VARIANT_PAGE_SIZE;
-        const visibleVariants = variants.slice(variantStart, variantStart + VARIANT_PAGE_SIZE);
-        const stockByVariant = new Map();
-        if (activeTab === 'variants' && hasStock && live.functions['stock.forecast']) {
-            const forecasts = await Promise.all(visibleVariants.map(async (variant) => ({
-                id: variant.id,
-                forecast: (await ctx.call('stock.forecast', { productId: variant.id }, url, req)),
-            })));
-            for (const entry of forecasts)
-                stockByVariant.set(String(entry.id), String(entry.forecast.onHand ?? '0'));
-        }
+        const [mediaRows] = await Promise.all([mediaFor(ctx, url, req, row.id)]);
         const variantMediaPageCount = Math.max(1, Math.ceil(variants.length / MEDIA_VARIANT_PAGE_SIZE));
         const variantMediaPage = Math.min(requestedVariantMediaPage(url), variantMediaPageCount);
         const variantMediaStart = (variantMediaPage - 1) * MEDIA_VARIANT_PAGE_SIZE;
-        const visibleMediaVariants = activeTab === 'media'
-            ? variants.slice(variantMediaStart, variantMediaStart + MEDIA_VARIANT_PAGE_SIZE)
-            : variants;
-        const variantMediaRows = activeTab === 'media'
-            ? (await ctx.call('product_media.listMediaByProducts', { productIds: visibleMediaVariants.map((variant) => variant.id) }, url, req))
-            : [];
+        const visibleMediaVariants = variants.slice(variantMediaStart, variantMediaStart + MEDIA_VARIANT_PAGE_SIZE);
+        const variantMediaRows = (await ctx.call('product_media.listMediaByProducts', { productIds: visibleMediaVariants.map((variant) => variant.id) }, url, req));
         const variantMedia = visibleMediaVariants.map((variant) => ({
             variantId: variant.id,
             images: variantMediaRows
@@ -866,22 +717,14 @@ export const routes = {
                 },
             })),
         }));
-        const body = productDetailScreen(_, {
-            ...row,
-            ...stockConfig,
-            defaultCode: defaultVariant?.defaultCode ?? null,
-            barcode: defaultVariant?.barcode ?? null,
-            taxId: currentTax?.taxId ?? null,
-        }, {
+        const body = productDetailScreen(_, { ...row, defaultCode: null, barcode: null, taxId: null }, {
             status: 'ready',
             uploadAction: inLocale(url, `/admin/product/templates/${row.id}/media?tab=media`),
-            uploadControl: savedPartial
-                ? ''
-                : await ctx.joint(url, req, 'product_backend:media.upload', {
-                    identity: `template:${row.id}`,
-                    action: inLocale(url, `/admin/product/templates/${row.id}/media?tab=media`),
-                    label: _('product_backend.media.add'),
-                }),
+            uploadControl: await ctx.joint(url, req, 'product_backend:media.upload', {
+                identity: `template:${row.id}`,
+                action: inLocale(url, `/admin/product/templates/${row.id}/media?tab=media`),
+                label: _('product_backend.media.add'),
+            }),
             images: mediaRows.map((image, index) => ({
                 id: image.id,
                 src: `/files/${image.attachmentId}`,
@@ -902,158 +745,29 @@ export const routes = {
                         : {}),
                 },
             })),
-            extension: savedPartial
-                ? ''
-                : await ctx.joint(url, req, 'product_backend:template.media', {
-                    templateId: row.id,
-                }),
+            extension: await ctx.joint(url, req, 'product_backend:template.media', { templateId: row.id }),
         }, {
-            ...options,
-            variants: (activeTab === 'media'
-                ? visibleMediaVariants
-                : activeTab === 'variants'
-                    ? visibleVariants
-                    : variants).map((variant) => ({
-                ...variant,
-                ...(stockByVariant.has(String(variant.id))
-                    ? { stock: stockByVariant.get(String(variant.id)) }
-                    : {}),
-            })),
-            variantPage: {
-                page: variantPage,
-                pageSize: VARIANT_PAGE_SIZE,
-                total: variants.length,
-            },
+            uoms: [],
+            categories: [],
+            brands: [],
+            taxes: [],
+            variantAttributes: [],
+            // The media panel renders exactly the `variants` it is given — the
+            // caller does the paging, unlike the variants tab's own table.
+            variants: visibleMediaVariants,
+            attributeLines: [],
             variantMedia,
             variantMediaPage: {
                 page: variantMediaPage,
                 pageSize: MEDIA_VARIANT_PAGE_SIZE,
                 total: variants.length,
             },
-            attributeLines: attributeLines.filter((line) => options.variantAttributes.some((attribute) => attribute.value === line.attributeId)),
-            stockEnabled: hasStock,
-            errors: invalidErrors(url, _),
-            actions: savedPartial
-                ? ''
-                : await ctx.joint(url, req, 'product_backend:template.actions', {
-                    templateId: row.id,
-                    locale,
-                }),
-            tabs: savedPartial
-                ? ''
-                : await ctx.joint(url, req, 'product_backend:template.tabs', {
-                    templateId: row.id,
-                    activeTab,
-                    locale,
-                    querySuffix,
-                }),
-            panel: savedPartial
-                ? ''
-                : await ctx.joint(url, req, 'product_backend:template.panel', {
-                    templateId: row.id,
-                    activeTab,
-                    locale,
-                    querySuffix,
-                }),
-            controls: {
-                uom: await uomControl(ctx, url, req, _, {
-                    id: `product-uom:${row.id}`,
-                    value: row.uomId,
-                    units: options.uoms,
-                }),
-                category: await categoryControl(ctx, url, req, _, {
-                    id: `product-category:${row.id}`,
-                    value: row.categoryId,
-                    categories: options.categories,
-                }),
-                brand: await brandControl(ctx, url, req, _, {
-                    id: `product-brand:${row.id}`,
-                    value: row.brandId,
-                    brands: options.brands,
-                }),
-                attribute: await attributeControl(ctx, url, req, _, {
-                    id: `product-attribute:${row.id}`,
-                    attributes: options.variantAttributes,
-                    required: true,
-                }),
-                // The value picker cannot be scoped to an attribute yet — the two are
-                // separate fields and the attribute is only known once chosen — so it
-                // lists every value, each labelled with the attribute it belongs to.
-                attributeValues: await attributeValuesControl(ctx, url, req, _, {
-                    id: `product-attribute-values:${row.id}`,
-                    choices: options.attributeValues,
-                    required: true,
-                }),
-            },
-            editor: savedPartial
-                ? ''
-                : await ctx.joint(url, req, 'product_backend:template.editor', {
-                    identity: `template:${row.id}`,
-                    templateId: row.id,
-                    lang,
-                }),
-        }, savedPartial
-            ? ''
-            : await ctx.joint(url, req, 'product_backend:template.collaboration', {
-                resModel: 'product.Template',
-                resId: row.id,
-                lang,
-            }), savedPartial ? {} : await frameOf(ctx, url, req), locale, activeTab, savedPartial);
-        if (savedPartial)
-            return withHeaders(fragment(body, { type: NAVIGATION_TYPE }), { vary: 'X-Ket-Partial' });
-        return backendPage(ctx, req, {
+        }, await ctx.joint(url, req, 'product_backend:template.collaboration', {
+            resModel: 'product.Template',
+            resId: row.id,
             lang,
-            title: row.name,
-            body,
-        });
-    },
-    '/admin/product/templates/{id}/variants/generate': (ctx) => async (url, req, params) => {
-        const denied = refusePost(req);
-        if (denied)
-            return denied;
-        const result = await ctx.call('product.generateVariants', { templateId: params.id }, url, req);
-        return result.ok
-            ? seeProduct(params.id, url)
-            : seeOther(inLocale(url, `/admin/product/templates/${params.id}?invalid=1`));
-    },
-    '/admin/product/templates/{id}/attribute-lines': (ctx) => async (url, req, params) => {
-        const denied = refusePost(req);
-        if (denied)
-            return denied;
-        const form = await readForm(req);
-        const attributeId = form.attributeId ?? '';
-        const result = await ctx.call('product.saveAttributeLine', {
-            id: `${params.id}:${attributeId}`,
-            templateId: params.id,
-            attributeId,
-            valueIds: (form.valueIds ?? '')
-                .split(',')
-                .map((value) => value.trim())
-                .filter(Boolean),
-        }, url, req);
-        return result.ok
-            ? seeProduct(params.id, url)
-            : seeOther(inLocale(url, `/admin/product/templates/${params.id}?invalid=1`));
-    },
-    '/admin/product/templates/{id}/archive': (ctx) => async (url, req, params) => {
-        const denied = refusePost(req);
-        if (denied)
-            return denied;
-        const form = await readForm(req);
-        await ctx.call('product.archiveTemplate', { id: params.id, active: form.active === '1' }, url, req);
-        return seeProduct(params.id, url);
-    },
-    '/admin/product/templates/{id}/attribute-lines/{lineId}/remove': (ctx) => async (url, req, params) => {
-        const denied = refusePost(req);
-        if (denied)
-            return denied;
-        // The line has to belong to the template in the path, or a POST could take
-        // an attribute off a product the reader never opened.
-        const lines = (await ctx.call('product.listAttributeLines', { templateId: params.id }, url, req));
-        if (!lines.some((line) => line.id === params.lineId))
-            return text('Attribute line not found', { status: 404 });
-        await ctx.call('product.removeAttributeLine', { id: params.lineId }, url, req);
-        return seeProduct(params.id, url);
+        }), await frameOf(ctx, url, req), locale, 'media', false);
+        return backendPage(ctx, req, { lang, title: row.name, body });
     },
     '/admin/product/templates/{id}/variants/{variantId}': (ctx) => async (url, req, params) => {
         const lang = ctx.localeOf(url, req);