includio-cms 0.27.0 → 0.33.0

package/dist/admin/client/shop/shop-orders-list-page.svelte

@@ -1,10 +1,14 @@
 <script lang="ts">
 	import { getRemotes } from '../../../sveltekit/index.js';
+	import { authClient } from '../../auth-client.js';
 	import { useInterfaceLanguage } from '../../state/interface-language.svelte.js';
 	import { getBreadcrumbs } from '../../state/breadcrumbs.svelte.js';
 	import { sidebarLang } from '../../components/layout/lang.js';
 	import { Button } from '../../../components/ui/button/index.js';
 	import DownloadIcon from '@tabler/icons-svelte/icons/download';
+	import TrashIcon from '@tabler/icons-svelte/icons/trash';
+	import ArrowBackIcon from '@tabler/icons-svelte/icons/arrow-back-up';
+	import RestoreOrderCell from './restore-order-cell.svelte';
 	import { formatCentsPrice, formatDateTime } from '../../utils/formatters.js';
 	import PageHeader from '../../components/layout/page-header.svelte';
 	import DataTable from '../collection/data-table.svelte';
@@ -13,6 +17,7 @@
 	import StateDisplay from '../collection/state-display.svelte';
 	import StatusBadge from '../collection/status-badge.svelte';
 	import EntryLink from '../collection/entry-link.svelte';
+	import { downloadCsv } from '../../utils/csv-export.js';
 	import { renderComponent } from '../../../components/ui/data-table/render-helpers.js';
 	import type { ColumnDef, PaginationState } from '@tanstack/table-core';
 	import type { InterfaceLanguage } from '../../../types/languages.js';
@@ -43,6 +48,9 @@
 	const interfaceLanguage = useInterfaceLanguage();
 	const breadcrumbs = getBreadcrumbs();
 
+	const session = authClient.useSession();
+	const isAdmin = $derived($session.data?.user?.role === 'admin');
+
 	$effect(() => {
 		const s = sidebarLang[interfaceLanguage.current].shop;
 		breadcrumbs.state = [{ label: s.title }, { label: s.orders }];
@@ -50,22 +58,30 @@
 
 	let statusFilter = $state<string | null>(null);
 	let searchQuery = $state('');
-	let appliedEmail = $state('');
+	let appliedSearch = $state('');
 	let pagination = $state<PaginationState>({ pageIndex: 0, pageSize: 50 });
 	let exporting = $state(false);
-	let emailDebounceTimer: ReturnType<typeof setTimeout> | null = null;
+	let trashMode = $state(false);
+	let searchDebounceTimer: ReturnType<typeof setTimeout> | null = null;
 
 	const ordersQuery = $derived(
 		useInjectedData
 			? null
 			: remotes.listOrdersAdmin({
 					status: (statusFilter as OrderStatus | null) ?? undefined,
-					email: appliedEmail || undefined,
+					search: appliedSearch || undefined,
+					deleted: trashMode ? 'only' : 'exclude',
 					limit: pagination.pageSize,
 					offset: pagination.pageIndex * pagination.pageSize
 				})
 	);
 
+	function toggleTrash() {
+		trashMode = !trashMode;
+		statusFilter = null;
+		pagination = { ...pagination, pageIndex: 0 };
+	}
+
 	const items = $derived<OrderRow[]>(
 		useInjectedData
 			? (injectedData ?? [])
@@ -114,12 +130,18 @@
 			statusCancelled: string;
 			statusPaymentRejected: string;
 			statusRefunded: string;
+			trash: string;
+			exitTrash: string;
+			trashTitle: string;
+			restore: string;
+			columnRestore: string;
+			trashEmpty: string;
 		}
 	> = {
 		en: {
 			title: 'Orders',
 			search: 'Search',
-			searchPlaceholder: 'Filter by customer email…',
+			searchPlaceholder: 'Search by number, email or name…',
 			filterStatus: 'Status',
 			columnNumber: 'Number',
 			columnDate: 'Date',
@@ -142,12 +164,18 @@
 			statusDone: 'Done',
 			statusCancelled: 'Cancelled',
 			statusPaymentRejected: 'Payment rejected',
-			statusRefunded: 'Refunded'
+			statusRefunded: 'Refunded',
+			trash: 'Trash',
+			exitTrash: 'Back to orders',
+			trashTitle: 'Trash',
+			restore: 'Restore',
+			columnRestore: '',
+			trashEmpty: 'Trash is empty.'
 		},
 		pl: {
 			title: 'Zamówienia',
 			search: 'Szukaj',
-			searchPlaceholder: 'Filtruj po e-mailu klienta…',
+			searchPlaceholder: 'Szukaj po numerze, e-mailu lub nazwie…',
 			filterStatus: 'Status',
 			columnNumber: 'Numer',
 			columnDate: 'Data',
@@ -170,7 +198,13 @@
 			statusDone: 'Zrealizowane',
 			statusCancelled: 'Anulowane',
 			statusPaymentRejected: 'Płatność odrzucona',
-			statusRefunded: 'Zwrócone'
+			statusRefunded: 'Zwrócone',
+			trash: 'Kosz',
+			exitTrash: 'Wróć do zamówień',
+			trashTitle: 'Kosz',
+			restore: 'Przywróć',
+			columnRestore: '',
+			trashEmpty: 'Kosz jest pusty.'
 		}
 	};
 	const t = $derived(lang[interfaceLanguage.current]);
@@ -194,10 +228,10 @@
 	]);
 	const activeDataFilters = $derived({ status: statusFilter });
 
-	function scheduleEmailFilterUpdate(value: string) {
-		if (emailDebounceTimer) clearTimeout(emailDebounceTimer);
-		emailDebounceTimer = setTimeout(() => {
-			appliedEmail = value.trim();
+	function scheduleSearchUpdate(value: string) {
+		if (searchDebounceTimer) clearTimeout(searchDebounceTimer);
+		searchDebounceTimer = setTimeout(() => {
+			appliedSearch = value.trim();
 			pagination = { ...pagination, pageIndex: 0 };
 		}, 350);
 	}
@@ -205,22 +239,14 @@
 	async function handleExportCsv() {
 		exporting = true;
 		try {
-			const opts: { status?: OrderStatus; email?: string } = {};
+			const opts: { status?: OrderStatus; search?: string } = {};
 			if (statusFilter) opts.status = statusFilter as OrderStatus;
-			if (appliedEmail) opts.email = appliedEmail;
+			if (appliedSearch) opts.search = appliedSearch;
 			const result = await remotes.exportOrdersCsv(
 				Object.keys(opts).length > 0 ? opts : undefined
 			);
-			const blob = new Blob(['' + result.csv], { type: 'text/csv;charset=utf-8' });
-			const url = URL.createObjectURL(blob);
-			const a = document.createElement('a');
 			const ts = new Date().toISOString().slice(0, 10);
-			a.href = url;
-			a.download = `orders-${ts}.csv`;
-			document.body.appendChild(a);
-			a.click();
-			a.remove();
-			URL.revokeObjectURL(url);
+			downloadCsv({ filename: `orders-${ts}.csv`, csv: result.csv });
 		} catch (err) {
 			alert(err instanceof Error ? err.message : t.exportError);
 		} finally {
@@ -273,25 +299,53 @@
 					variant: 'order',
 					status: info.row.original.status
 				})
-		}
+		},
+		...(trashMode && isAdmin
+			? [
+					{
+						id: 'restore',
+						header: t.columnRestore,
+						cell: (info) =>
+							renderComponent(RestoreOrderCell, {
+								orderId: info.row.original.id,
+								label: t.restore,
+								onRestored: () => ordersQuery?.refresh()
+							})
+					} satisfies ColumnDef<OrderRow>
+				]
+			: [])
 	]);
 </script>
 
 <div class="p-5 pb-24 md:p-7">
-	<PageHeader title={t.title} count={!isLoading && !isError ? total : undefined}>
+	<PageHeader
+		title={trashMode ? t.trashTitle : t.title}
+		count={!isLoading && !isError ? total : undefined}
+	>
 		{#snippet secondaryActions()}
-			<Button variant="outline" size="sm" onclick={handleExportCsv} disabled={exporting}>
-				<DownloadIcon class="size-4" />
-				{exporting ? t.exporting : t.exportCsv}
-			</Button>
+			{#if isAdmin && !useInjectedData}
+				<Button variant={trashMode ? 'default' : 'outline'} size="sm" onclick={toggleTrash}>
+					{#if trashMode}
+						<ArrowBackIcon class="size-4" />
+						{t.exitTrash}
+					{:else}
+						<TrashIcon class="size-4" />
+						{t.trash}
+					{/if}
+				</Button>
+			{/if}
+			{#if !trashMode}
+				<Button variant="outline" size="sm" onclick={handleExportCsv} disabled={exporting}>
+					<DownloadIcon class="size-4" />
+					{exporting ? t.exporting : t.exportCsv}
+				</Button>
+			{/if}
 		{/snippet}
 	</PageHeader>
 
-	{#if isError}
-		<StateDisplay kind="error" />
-	{:else if isLoading && total === 0}
-		<StateDisplay kind="loading" />
-	{:else if total === 0 && !statusFilter && !appliedEmail}
+	{#if !isLoading && !isError && total === 0 && trashMode}
+		<StateDisplay kind="empty" title={t.trashEmpty} />
+	{:else if !isLoading && !isError && total === 0 && !statusFilter && !appliedSearch}
 		<StateDisplay kind="empty" title={t.emptyTitle} description={t.emptyDescription} />
 	{:else}
 		<TableToolbar
@@ -300,7 +354,7 @@
 			searchLabel={t.search}
 			onSearchChange={(q) => {
 				searchQuery = q;
-				scheduleEmailFilterUpdate(q);
+				scheduleSearchUpdate(q);
 			}}
 			hideStatusFilter
 			hideViewToggle
@@ -313,26 +367,32 @@
 		/>
 
 		<div class="overflow-hidden rounded-xl border bg-card shadow-sm">
-			<DataTable
-				data={items}
-				{columns}
-				enablePagination
-				manualPagination
-				{pageCount}
-				rowCount={total}
-				{pagination}
-				onPaginationChange={(p) => (pagination = p)}
-				emptyTitle={t.noResults}
-			/>
+			{#if isError}
+				<StateDisplay kind="error" />
+			{:else if isLoading && items.length === 0}
+				<StateDisplay kind="loading" />
+			{:else}
+				<DataTable
+					data={items}
+					{columns}
+					enablePagination
+					manualPagination
+					{pageCount}
+					rowCount={total}
+					{pagination}
+					onPaginationChange={(p) => (pagination = p)}
+					emptyTitle={t.noResults}
+				/>
 
-			<TablePagination
-				pageIndex={pagination.pageIndex}
-				pageSize={pagination.pageSize}
-				{pageCount}
-				totalItems={total}
-				onPageChange={(p) => (pagination = { ...pagination, pageIndex: p })}
-				onPageSizeChange={(s) => (pagination = { pageIndex: 0, pageSize: s })}
-			/>
+				<TablePagination
+					pageIndex={pagination.pageIndex}
+					pageSize={pagination.pageSize}
+					{pageCount}
+					totalItems={total}
+					onPageChange={(p) => (pagination = { ...pagination, pageIndex: p })}
+					onPageSizeChange={(s) => (pagination = { pageIndex: 0, pageSize: s })}
+				/>
+			{/if}
 		</div>
 	{/if}
 </div>

package/dist/admin/components/layout/app-sidebar.svelte

@@ -7,6 +7,7 @@
 	import NavFooter from './nav-footer.svelte';
 	import NavForms from './nav-forms.svelte';
 	import NavShop from './nav-shop.svelte';
+	import NavCustom from './nav-custom.svelte';
 	import NavSearch from './nav-search.svelte';
 	import { resolve } from '$app/paths';
 	import { useInterfaceLanguage } from '../../state/interface-language.svelte.js';
@@ -41,6 +42,7 @@
 			<NavCollections />
 			<NavForms />
 			<NavShop />
+			<NavCustom />
 		</nav>
 	</Sidebar.Content>
 	<Sidebar.Footer class="p-0">

package/dist/admin/components/layout/nav-custom.svelte

@@ -0,0 +1,26 @@
+<script lang="ts">
+	/**
+	 * Renders sidebar entries from `CMSConfig.admin.extraNavItems`.
+	 * Sits below the built-in Shop section (or wherever the consumer mounts
+	 * `<NavCustom />` in their sidebar). Hidden when no items are configured.
+	 * @internal — consumed by `app-sidebar.svelte`, not user-facing.
+	 */
+	import { getRemotes } from '../../../sveltekit/index.js';
+	import { page } from '$app/state';
+	import NavSection, { type NavSectionItem } from './nav-section.svelte';
+
+	const remotes = getRemotes();
+	const itemsQuery = $derived(remotes.getAdminExtraNavItems());
+	const items = $derived<NavSectionItem[]>(
+		(itemsQuery.current ?? []).map((i) => ({ title: i.title, url: i.url }))
+	);
+
+	function isActive(url: string) {
+		const pathname = page.url.pathname;
+		return pathname === url || pathname.startsWith(url + '/');
+	}
+</script>
+
+{#if items.length}
+	<NavSection {items} {isActive} withTopBorder />
+{/if}

package/dist/admin/components/layout/nav-custom.svelte.d.ts

@@ -0,0 +1,3 @@
+declare const NavCustom: import("svelte").Component<Record<string, never>, {}, "">;
+type NavCustom = ReturnType<typeof NavCustom>;
+export default NavCustom;

package/dist/admin/components/layout/page-header.svelte

@@ -1,8 +1,18 @@
 <script lang="ts" module>
 	/**
-	 * @internal
-	 * Internal helper — page header pattern (title + description + count badge + actions).
-	 * Used by list/detail pages in admin (sesje 6-8). Not exported publicly.
+	 * Page header pattern for admin list/detail pages — title + optional
+	 * description, count badge, and primary/secondary action slots. Use this
+	 * in custom admin routes to keep visual parity with the built-in
+	 * `CollectionPage`, `ShopOrdersListPage` etc.
+	 *
+	 * Props:
+	 * - `title` (string, required) — main heading.
+	 * - `description?` (string) — small grey caption under the title.
+	 * - `count?` (number) — small pill badge next to the title (e.g. result count).
+	 * - `primaryActions?` (Snippet) — right-side primary CTA(s).
+	 * - `secondaryActions?` (Snippet) — left-of-primary actions (e.g. export buttons).
+	 *
+	 * @public
 	 */
 	import type { Snippet } from 'svelte';
 </script>

package/dist/admin/components/layout/page-header.svelte.d.ts

@@ -1,7 +1,17 @@
 /**
- * @internal
- * Internal helper — page header pattern (title + description + count badge + actions).
- * Used by list/detail pages in admin (sesje 6-8). Not exported publicly.
+ * Page header pattern for admin list/detail pages — title + optional
+ * description, count badge, and primary/secondary action slots. Use this
+ * in custom admin routes to keep visual parity with the built-in
+ * `CollectionPage`, `ShopOrdersListPage` etc.
+ *
+ * Props:
+ * - `title` (string, required) — main heading.
+ * - `description?` (string) — small grey caption under the title.
+ * - `count?` (number) — small pill badge next to the title (e.g. result count).
+ * - `primaryActions?` (Snippet) — right-side primary CTA(s).
+ * - `secondaryActions?` (Snippet) — left-of-primary actions (e.g. export buttons).
+ *
+ * @public
  */
 import type { Snippet } from 'svelte';
 type $$ComponentProps = {

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

@@ -0,0 +1,7 @@
+import type { AdminNavItem } from '../types.js';
+/**
+ * Returns the consumer-configured extra sidebar items
+ * (`CMSConfig.admin.extraNavItems`). Empty array when not set.
+ * @public
+ */
+export declare const getAdminExtraNavItems: import("@sveltejs/kit").RemoteQueryFunction<void, AdminNavItem[]>;

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

@@ -0,0 +1,10 @@
+import { query } from '$app/server';
+import { getCMS } from '../../core/cms.js';
+/**
+ * Returns the consumer-configured extra sidebar items
+ * (`CMSConfig.admin.extraNavItems`). Empty array when not set.
+ * @public
+ */
+export const getAdminExtraNavItems = query(async () => {
+    return getCMS().adminConfig?.extraNavItems ?? [];
+});

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

@@ -7,7 +7,7 @@ export declare const getRawEntries: import("@sveltejs/kit").RemoteQueryFunction<
     limit?: number | undefined;
     offset?: number | undefined;
     orderBy?: {
-        column: "createdAt" | "updatedAt" | "sortOrder";
+        column: "sortOrder" | "createdAt" | "updatedAt";
         direction: "asc" | "desc";
     } | undefined;
 }, {
@@ -22,7 +22,7 @@ export declare const getEntries: import("@sveltejs/kit").RemoteQueryFunction<{
     status?: "draft" | "published" | "scheduled" | "archived" | undefined;
     slug?: string | undefined;
     orderBy?: {
-        column: "createdAt" | "updatedAt" | "sortOrder";
+        column: "sortOrder" | "createdAt" | "updatedAt";
         direction: "asc" | "desc";
     } | undefined;
 }, import("../../types/entries.js").Entry[]>;

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

@@ -9,3 +9,4 @@ export * from './ai.remote.js';
 export * from './preview.remote.js';
 export * from './email.remote.js';
 export * from './shop.remote.js';
+export * from './admin.remote.js';

package/dist/admin/remote/index.js

@@ -9,3 +9,4 @@ export * from './ai.remote.js';
 export * from './preview.remote.js';
 export * from './email.remote.js';
 export * from './shop.remote.js';
+export * from './admin.remote.js';

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

@@ -1,8 +1,8 @@
 import type { UserRole } from '../../types/roles.js';
 export declare function createInvitation(email: string, role: UserRole, createdBy: string): Promise<{
     id: string;
-    role: string;
     createdAt: Date;
+    role: string;
     email: string;
     expiresAt: Date;
     createdBy: string;