includio-cms 0.25.0 → 0.27.0

package/dist/admin/remote/entry.remote.js

@@ -1,10 +1,16 @@
 import { command, query } from '$app/server';
-import { getAtPath } from '../utils/objectPath.js';
+import { error } from '@sveltejs/kit';
+import { CmsError } from '../../core/errors.js';
+import { getRawCollectionEntryLabelWithLanguage } from '../utils/entryLabel.js';
+import { db } from '../../server/db/index.js';
+import { user } from '../../server/db/schema/auth-schema.js';
+import { inArray } from 'drizzle-orm';
 import { createEntry as createEntryOperation, createEntrySchema, createEntryVersion } from '../../core/server/entries/operations/create.js';
 import { _getRawEntries as getRawEntriesOperation, _countRawEntries as countRawEntriesOperation, _getRawEntry as getRawEntryOperation, _getRawEntryOrThrow as getRawEntryOrThrow, _getDbEntry as getDbEntry, getEntryVersion as getEntryVersionOperation, getEntryLabels as getEntryLabelsOperation } from '../../core/server/entries/operations/get.js';
 import { resolveEntries, resolveEntry } from '../../core/server/entries/operations/resolveEntry.js';
 import { getCMS } from '../../core/cms.js';
-import { pruneOldDraftVersions, unpublishEntryLang, upsertDraftVersion, updateEntry, updateEntrySchema, updateEntryVersionCommandTypes } from '../../core/server/entries/operations/update.js';
+import { getFieldsFromConfig } from '../../core/fields/layoutUtils.js';
+import { pruneOldDraftVersions, unpublishEntryLang, cancelScheduledEntryLang, upsertDraftVersion, updateEntry, updateEntrySchema, updateEntryVersionCommandTypes } from '../../core/server/entries/operations/update.js';
 import z from 'zod';
 import { requireAuth } from './middleware/auth.js';
 import { stableSlotReorder } from './reorder.js';
@@ -55,12 +61,84 @@ export const getEntries = query(z.object({
         orderBy: input.orderBy
     });
 });
+/**
+ * Cross-collection search for the URL field's internal-link picker. Matches
+ * the term (case-insensitive, OR) against each collection's admin-title field
+ * (`entryAdminTitle`), its `slug`-type field, and `seo.slug` / `seo.title`.
+ * The previous `getEntries({ dataLike })` call was a no-op because it never
+ * passed a collection slug (`if (!input.slug) return []`).
+ */
+export const searchLinkableEntries = query(z.object({ term: z.string(), language: z.string().optional() }), async ({ term, language }) => {
+    requireAuth();
+    const q = term.trim();
+    if (q.length < 2)
+        return [];
+    const cms = getCMS();
+    // Internal links are language-agnostic (resolved by id at render), but
+    // resolveEntries is strict per locale — so an entry that only has a
+    // `pl` version is invisible when searching the default `en`. Scan all
+    // languages (preferred one first) and dedupe by entry id.
+    const langs = [
+        ...(language ? [language] : []),
+        ...cms.languages.filter((l) => l !== language)
+    ];
+    const results = [];
+    for (const config of Object.values(cms.collections)) {
+        if (config.type !== 'collection')
+            continue;
+        const fields = getFieldsFromConfig(config);
+        const titleField = config.entryAdminTitle;
+        const slugField = fields.find((f) => f.type === 'slug')?.slug;
+        const ilike = { seo: { slug: q, title: q } };
+        if (titleField)
+            ilike[titleField] = q;
+        if (slugField)
+            ilike[slugField] = q;
+        for (const locale of langs) {
+            let entries;
+            try {
+                entries = await resolveEntries({
+                    collection: config.slug,
+                    locale,
+                    status: 'published',
+                    filter: { dataILikeOr: ilike }
+                });
+            }
+            catch {
+                continue;
+            }
+            for (const e of entries) {
+                const seo = e.seo;
+                const rawTitle = titleField ? e[titleField] : undefined;
+                const title = (typeof rawTitle === 'string' && rawTitle) ||
+                    (typeof seo?.title === 'string' && seo.title) ||
+                    '';
+                const rawSlug = slugField ? e[slugField] : undefined;
+                const slug = (typeof rawSlug === 'string' && rawSlug) ||
+                    (typeof seo?.slug === 'string' && seo.slug) ||
+                    '';
+                results.push({
+                    _id: e._id,
+                    _slug: config.slug,
+                    _url: typeof e._url === 'string' ? e._url : undefined,
+                    title,
+                    slug
+                });
+            }
+        }
+    }
+    const seen = new Set();
+    return results
+        .filter((r) => (seen.has(r._id) ? false : (seen.add(r._id), true)))
+        .slice(0, 8);
+});
 export const getEntryLabels = query(z.object({
     slug: z.string(),
     ids: z.array(z.string().uuid()).optional(),
     search: z.string().optional(),
     limit: z.number().int().positive().optional(),
-    status: z.enum(['published', 'draft', 'all']).optional()
+    status: z.enum(['published', 'draft', 'all']).optional(),
+    language: z.string().optional()
 }), async (input) => {
     return getEntryLabelsOperation(input);
 });
@@ -128,37 +206,51 @@ const updateEntryVersionCommandSchema = z.object({
 export const updateEntryVersionCommand = command(updateEntryVersionCommandSchema, async (input) => {
     const { user } = requireAuth();
     let result;
-    switch (input.type) {
-        case 'draft':
-            result = await upsertDraftVersion(input.entryId, input.data, input.lang, { skipValidation: true });
-            break;
-        case 'published-now': {
-            // Create a new published version for this language
-            result = await createEntryVersion({
+    // Publish failures should reach the client with a structured body so the
+    // editor can pin the message to the offending field. SvelteKit hides any
+    // thrown error that isn't created via `error()`, so wrap publish writes.
+    const runPublish = async (publishedAt) => {
+        try {
+            return await createEntryVersion({
                 entryId: input.entryId,
                 lang: input.lang,
                 data: input.data,
-                publishedAt: new Date(),
+                publishedAt,
                 publishedBy: user.id
             });
+        }
+        catch (e) {
+            if (e instanceof CmsError && e.code === 'SLUG_DUPLICATE') {
+                error(409, {
+                    message: e.message,
+                    code: e.code,
+                    path: typeof e.context.path === 'string' ? e.context.path : undefined
+                });
+            }
+            throw e;
+        }
+    };
+    switch (input.type) {
+        case 'draft':
+            result = await upsertDraftVersion(input.entryId, input.data, input.lang, { skipValidation: true });
+            break;
+        case 'published-now': {
+            result = await runPublish(new Date());
             break;
         }
         case 'published-scheduled': {
             if (!input.scheduledAt) {
                 throw new Error('scheduledAt is required for scheduled publishing');
             }
-            result = await createEntryVersion({
-                entryId: input.entryId,
-                lang: input.lang,
-                data: input.data,
-                publishedAt: input.scheduledAt,
-                publishedBy: user.id
-            });
+            result = await runPublish(input.scheduledAt);
             break;
         }
         case 'cancel-published':
             await unpublishEntryLang(input.entryId, input.lang);
             break;
+        case 'cancel-scheduled':
+            await cancelScheduledEntryLang(input.entryId, input.lang);
+            break;
     }
     // Prune old draft versions only after publish/schedule (drafts upsert in-place)
     if (input.type !== 'draft') {
@@ -210,7 +302,13 @@ export const getEntryVersion = query(z.object({
 }), async (input) => {
     return getEntryVersionOperation(input);
 });
-export const getRecentEntries = query(z.number().default(6), async (limit) => {
+/**
+ * `containerLabel` carries the collection's plural label for collection entries
+ * and the single's name for singles; clients localise it. For collection entries
+ * `label` is the entry's own title (or `null` to fall back to the slug); for
+ * singles `label` is always `null` — the title shown is `containerLabel`.
+ */
+export const getRecentEntries = query(z.object({ limit: z.number().default(6), language: z.string() }), async ({ limit, language }) => {
     const entries = await getRawEntriesOperation({
         orderBy: { column: 'updatedAt', direction: 'desc' },
         limit
@@ -223,30 +321,22 @@ export const getRecentEntries = query(z.number().default(6), async (limit) => {
         catch {
             // orphaned entry
         }
-        const latestVersion = entry.versions[0];
+        const kind = config?.type === 'single' ? 'single' : 'collection';
         let label = null;
-        if (config && config.type === 'collection' && config.entryAdminTitle && latestVersion) {
-            const titleData = getAtPath(latestVersion.data, config.entryAdminTitle);
-            if (typeof titleData === 'string') {
-                label = titleData || '';
+        let labelLanguage = null;
+        if (config && config.type === 'collection') {
+            const resolved = getRawCollectionEntryLabelWithLanguage(entry, config, language);
+            if (resolved.label !== entry.id) {
+                label = resolved.label;
+                labelLanguage = resolved.language;
             }
         }
-        if (config && config.type === 'single' && config.label) {
-            if (typeof config.label === 'object') {
-                label = String(Object.values(config.label)[0] || '');
-            }
-            else {
-                label = config.label;
-            }
+        let containerLabel = { pl: entry.slug, en: entry.slug };
+        if (config?.type === 'collection' && config.labels) {
+            containerLabel = config.labels.plural ?? config.labels.singular ?? containerLabel;
         }
-        let collectionLabel = { pl: entry.slug, en: entry.slug };
-        if (config) {
-            if (config.type === 'collection' && config.labels) {
-                collectionLabel = config.labels.plural ?? config.labels.singular ?? collectionLabel;
-            }
-            else if (config.type === 'single' && config.label) {
-                collectionLabel = config.label;
-            }
+        else if (config?.type === 'single' && config.label) {
+            containerLabel = config.label;
         }
         const hasPublished = Object.values(entry.publishedVersions).some((v) => v != null);
         const hasScheduled = Object.values(entry.scheduledVersions).some((v) => v != null);
@@ -258,43 +348,130 @@ export const getRecentEntries = query(z.number().default(6), async (limit) => {
         return {
             entryId: entry.id,
             slug: entry.slug,
-            collectionLabel,
+            kind,
+            containerLabel,
             label,
+            labelLanguage,
             status,
             updatedAt: entry.updatedAt
         };
     });
 });
-export const getRecentActivity = query(z.number().default(10), async (limit) => {
+export const getRecentActivity = query(z.object({ limit: z.number().default(10), language: z.string() }), async ({ limit, language }) => {
     const entries = await getRawEntriesOperation({});
     const activity = [];
     for (const entry of entries) {
         const latestVersion = entry.versions[0];
-        if (latestVersion) {
-            const config = getCMS().getBySlug(entry.slug);
-            let label = null;
-            if (config && config.type === 'collection' && config.entryAdminTitle) {
-                const titleData = getAtPath(latestVersion.data, config.entryAdminTitle);
-                if (typeof titleData === 'string') {
-                    label = titleData || null;
-                }
+        if (!latestVersion)
+            continue;
+        let config = null;
+        try {
+            config = getCMS().getBySlug(entry.slug);
+        }
+        catch {
+            // orphaned entry — still surface the edit, just without a friendly label
+        }
+        const kind = config?.type === 'single' ? 'single' : 'collection';
+        let label = null;
+        let labelLanguage = null;
+        let containerLabel = { pl: entry.slug, en: entry.slug };
+        if (config && config.type === 'collection') {
+            const resolved = getRawCollectionEntryLabelWithLanguage(entry, config, language);
+            if (resolved.label !== entry.id) {
+                label = resolved.label;
+                labelLanguage = resolved.language;
             }
-            if (config && config.type === 'single' && config.label) {
-                if (typeof config.label === 'object') {
-                    label = String(Object.values(config.label)[0] || '');
-                }
-                else {
-                    label = config.label;
-                }
+            if (config.labels) {
+                containerLabel = config.labels.singular ?? config.labels.plural ?? containerLabel;
             }
-            activity.push({
-                type: 'entry_edit',
+        }
+        else if (config?.type === 'single' && config.label) {
+            containerLabel = config.label;
+        }
+        activity.push({
+            type: 'entry_edit',
+            entryId: entry.id,
+            slug: entry.slug,
+            kind,
+            label,
+            labelLanguage,
+            containerLabel,
+            editorId: latestVersion.createdBy ?? null,
+            editorName: null,
+            updatedAt: latestVersion.createdAt
+        });
+    }
+    const recent = activity
+        .sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime())
+        .slice(0, limit);
+    // resolve editor names for the items we're returning
+    const editorIds = [...new Set(recent.map((a) => a.editorId).filter((id) => !!id))];
+    if (editorIds.length > 0) {
+        const rows = await db
+            .select({ id: user.id, name: user.name })
+            .from(user)
+            .where(inArray(user.id, editorIds));
+        const nameById = new Map(rows.map((r) => [r.id, r.name]));
+        for (const item of recent) {
+            if (item.editorId)
+                item.editorName = nameById.get(item.editorId) ?? null;
+        }
+    }
+    return recent;
+});
+/**
+ * Global quick-search over entry titles plus single names. Titles are matched
+ * and returned in the requested `language`, falling back to any available
+ * translation (`titleLanguage` reports which one was used). Used by the sidebar
+ * command palette. A full multi-language FTS search is tracked separately.
+ */
+export const searchEntries = query(z.object({ query: z.string(), language: z.string() }), async ({ query: rawQuery, language }) => {
+    requireAuth();
+    const q = rawQuery.trim();
+    if (q.length < 2)
+        return [];
+    const cms = getCMS();
+    const needle = q.toLocaleLowerCase();
+    const results = [];
+    for (const config of Object.values(cms.collections)) {
+        const containerLabel = config.labels?.plural ?? config.labels?.singular ?? { pl: config.slug, en: config.slug };
+        const entries = await getRawEntriesOperation({ slug: config.slug });
+        for (const entry of entries) {
+            const resolved = getRawCollectionEntryLabelWithLanguage(entry, config, language);
+            if (resolved.label === entry.id)
+                continue; // no usable title
+            if (!resolved.label.toLocaleLowerCase().includes(needle))
+                continue;
+            results.push({
                 entryId: entry.id,
-                slug: entry.slug,
-                label,
-                updatedAt: latestVersion.createdAt
+                title: resolved.label,
+                titleLanguage: resolved.language,
+                kind: 'collection',
+                containerSlug: config.slug,
+                containerLabel
             });
         }
     }
-    return activity.sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime()).slice(0, limit);
+    for (const config of Object.values(cms.singles)) {
+        const labelObj = config.label;
+        const names = labelObj && typeof labelObj === 'object' ? Object.values(labelObj) : labelObj ? [labelObj] : [];
+        const matches = config.slug.toLocaleLowerCase().includes(needle) ||
+            names.some((n) => typeof n === 'string' && n.toLocaleLowerCase().includes(needle));
+        if (!matches)
+            continue;
+        const localizedTitle = labelObj && typeof labelObj === 'object' ? labelObj[language] : undefined;
+        const title = localizedTitle ??
+            (labelObj && typeof labelObj === 'object'
+                ? (Object.values(labelObj)[0] ?? config.slug)
+                : labelObj || config.slug);
+        results.push({
+            entryId: config.slug,
+            title,
+            titleLanguage: localizedTitle ? language : null,
+            kind: 'single',
+            containerSlug: config.slug,
+            containerLabel: labelObj && typeof labelObj === 'object' ? labelObj : { pl: title, en: title }
+        });
+    }
+    return results.slice(0, 20);
 });

package/dist/admin/remote/shop.remote.d.ts

@@ -8,6 +8,9 @@ export declare const getShopConfig: import("@sveltejs/kit").RemoteQueryFunction<
         id: string;
         label: import("../../shop/types.js").I18nText;
     }[];
+    variantAttributes: Record<string, import("../../shop/types.js").VariantAttribute>;
+    variantLabel: import("../../shop/types.js").VariantLabelConfig | null;
+    variantExpiry: import("../../shop/types.js").VariantExpiryConfig | null;
 } | null>;
 export declare const listShopProductEntries: import("@sveltejs/kit").RemoteQueryFunction<void, import("../../shop/server/shop-data.js").ShopEntryListItem[]>;
 export declare const getShopDataForEntry: import("@sveltejs/kit").RemoteQueryFunction<string, import("../../shop/server/shop-data.js").ShopDataWithVariants | null>;
@@ -18,6 +21,18 @@ export declare const upsertShopDataForEntry: import("@sveltejs/kit").RemoteComma
         vatRate: number;
         isActive?: boolean | undefined;
         sortOrder?: number | null | undefined;
+        paymentPolicy?: {
+            type: "full";
+        } | {
+            type: "deposit";
+            depositAmount: {
+                type: "percent";
+                value: number;
+            } | {
+                type: "amount";
+                value: number;
+            };
+        } | null | undefined;
     };
     variants?: {
         id?: string | undefined;
@@ -25,7 +40,7 @@ export declare const upsertShopDataForEntry: import("@sveltejs/kit").RemoteComma
         name?: Record<string, string> | null | undefined;
         priceDelta?: number | undefined;
         stock?: number | null | undefined;
-        attributes?: Record<string, string> | null | undefined;
+        attributes?: Record<string, unknown> | null | undefined;
     }[] | undefined;
 }, Promise<import("../../shop/server/shop-data.js").ShopDataWithVariants>>;
 export declare const deleteShopDataForEntry: import("@sveltejs/kit").RemoteCommand<string, Promise<{
@@ -82,49 +97,20 @@ export declare const listOrdersAdmin: import("@sveltejs/kit").RemoteQueryFunctio
     limit?: number | undefined;
     offset?: number | undefined;
 } | undefined, {
-    number: string;
-    id: string;
-    status: import("../../shop/types.js").OrderStatus;
-    createdAt: Date;
-    updatedAt: Date;
-    language: string | null;
-    carrierType: string | null;
-    currency: string;
-    customerEmail: string;
-    customerName: string | null;
-    customerPhone: string | null;
-    shippingAddress: Record<string, string> | null;
-    totalNet: number;
-    totalGross: number;
-    vatAmount: number;
-    shippingNet: number;
-    shippingGross: number;
-    shippingMethodId: string | null;
-    carrierRef: string | null;
-    shipmentId: string | null;
-    trackingNumber: string | null;
-    labelUrl: string | null;
-    shipmentCreatedAt: Date | null;
-    paymentMethod: string | null;
-    paymentProviderRef: string | null;
-    consents: {
-        id: string;
-        accepted: boolean;
-        label: string;
-    }[] | null;
-    notes: string | null;
-    accessToken: string;
-}[]>;
-export declare const getOrderForAdmin: import("@sveltejs/kit").RemoteQueryFunction<string, {
-    order: {
+    items: {
         number: string;
+        currency: string;
+        consents: {
+            id: string;
+            accepted: boolean;
+            label: string;
+        }[] | null;
         id: string;
         status: import("../../shop/types.js").OrderStatus;
         createdAt: Date;
         updatedAt: Date;
         language: string | null;
         carrierType: string | null;
-        currency: string;
         customerEmail: string;
         customerName: string | null;
         customerPhone: string | null;
@@ -142,13 +128,51 @@ export declare const getOrderForAdmin: import("@sveltejs/kit").RemoteQueryFuncti
         shipmentCreatedAt: Date | null;
         paymentMethod: string | null;
         paymentProviderRef: string | null;
+        notes: string | null;
+        accessToken: string;
+        partialPayment: import("../../shop/types.js").PartialPayment | null;
+        balanceOwed: boolean;
+    }[];
+    total: number;
+    limit: number;
+    offset: number;
+}>;
+export declare const getOrderForAdmin: import("@sveltejs/kit").RemoteQueryFunction<string, {
+    order: {
+        number: string;
+        currency: string;
         consents: {
             id: string;
             accepted: boolean;
             label: string;
         }[] | null;
+        id: string;
+        status: import("../../shop/types.js").OrderStatus;
+        createdAt: Date;
+        updatedAt: Date;
+        language: string | null;
+        carrierType: string | null;
+        customerEmail: string;
+        customerName: string | null;
+        customerPhone: string | null;
+        shippingAddress: Record<string, string> | null;
+        totalNet: number;
+        totalGross: number;
+        vatAmount: number;
+        shippingNet: number;
+        shippingGross: number;
+        shippingMethodId: string | null;
+        carrierRef: string | null;
+        shipmentId: string | null;
+        trackingNumber: string | null;
+        labelUrl: string | null;
+        shipmentCreatedAt: Date | null;
+        paymentMethod: string | null;
+        paymentProviderRef: string | null;
         notes: string | null;
         accessToken: string;
+        partialPayment: import("../../shop/types.js").PartialPayment | null;
+        balanceOwed: boolean;
     };
     items: {
         id: string;
@@ -177,13 +201,18 @@ export declare const updateOrderStatusCmd: import("@sveltejs/kit").RemoteCommand
     note?: string | undefined;
 }, Promise<{
     number: string;
+    currency: string;
+    consents: {
+        id: string;
+        accepted: boolean;
+        label: string;
+    }[] | null;
     id: string;
     status: import("../../shop/types.js").OrderStatus;
     createdAt: Date;
     updatedAt: Date;
     language: string | null;
     carrierType: string | null;
-    currency: string;
     customerEmail: string;
     customerName: string | null;
     customerPhone: string | null;
@@ -201,13 +230,10 @@ export declare const updateOrderStatusCmd: import("@sveltejs/kit").RemoteCommand
     shipmentCreatedAt: Date | null;
     paymentMethod: string | null;
     paymentProviderRef: string | null;
-    consents: {
-        id: string;
-        accepted: boolean;
-        label: string;
-    }[] | null;
     notes: string | null;
     accessToken: string;
+    partialPayment: import("../../shop/types.js").PartialPayment | null;
+    balanceOwed: boolean;
 }>>;
 export declare const resendOrderEmailCmd: import("@sveltejs/kit").RemoteCommand<{
     orderId: string;
@@ -248,15 +274,15 @@ export declare const listShopableCollections: import("@sveltejs/kit").RemoteQuer
 }[]>;
 export declare const getOrderRefundsAdmin: import("@sveltejs/kit").RemoteQueryFunction<string, {
     refunds: {
+        amount: number;
+        currency: string;
         id: string;
         status: import("../../db-postgres/schema/shop/index.js").ShopRefundStatus;
         createdAt: Date;
         updatedAt: Date;
-        currency: string;
         orderId: string;
         provider: string;
         providerRef: string | null;
-        amount: number;
         paymentId: string | null;
         reason: string | null;
         createdBy: string | null;
@@ -272,6 +298,8 @@ export declare const refundOrderCmd: import("@sveltejs/kit").RemoteCommand<{
     orderId: string;
     amount?: number | undefined;
     reason?: string | undefined;
+    kind?: "full" | "deposit" | "balance" | undefined;
+    releaseStock?: boolean | undefined;
 }, Promise<{
     refund: import("../../shop/server/refund.js").ShopRefundRow;
     remainingRefundable: number;
@@ -281,9 +309,20 @@ export declare const refundOrderCmd: import("@sveltejs/kit").RemoteCommand<{
     error?: undefined;
 } | {
     success: false;
-    code: "order_not_found" | "order_not_paid" | "no_provider_ref" | "unknown_provider" | "refund_unsupported" | "invalid_amount" | "amount_exceeds_remaining" | "provider_error";
+    code: "order_not_found" | "order_not_paid" | "no_provider_ref" | "unknown_provider" | "refund_unsupported" | "invalid_amount" | "amount_exceeds_remaining" | "provider_error" | "no_payment_kind";
     error: string;
 }>>;
+export declare const generateBalanceLinkForOrder: import("@sveltejs/kit").RemoteCommand<string, Promise<{
+    success: false;
+    error: string;
+    url?: undefined;
+    balanceAmount?: undefined;
+} | {
+    success: true;
+    url: string;
+    balanceAmount: number;
+    error?: undefined;
+}>>;
 export declare const listCouponsAdmin: import("@sveltejs/kit").RemoteQueryFunction<void, {
     id: string;
     code: string;
@@ -312,7 +351,7 @@ export declare const getCouponAdmin: import("@sveltejs/kit").RemoteQueryFunction
 }>;
 export declare const createCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     code: string;
-    type: "fixed" | "percent";
+    type: "percent" | "fixed";
     value: number;
     minOrderAmount?: number | null | undefined;
     maxUses?: number | null | undefined;
@@ -335,7 +374,7 @@ export declare const updateCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     id: string;
     input: {
         code?: string | undefined;
-        type?: "fixed" | "percent" | undefined;
+        type?: "percent" | "fixed" | undefined;
         value?: number | undefined;
         minOrderAmount?: number | null | undefined;
         maxUses?: number | null | undefined;