@mohasinac/appkit 2.7.11 → 2.7.12

package/dist/features/events/components/EventsIndexListing.js

@@ -7,18 +7,22 @@ import { useEvents } from "../hooks/useEvents";
 import { Pagination, ListingToolbar } from "../../../ui";
 import { EventCard } from "./EventCard";
 import { EventFilters, EVENT_PUBLIC_SORT_OPTIONS } from "./EventFilters";
+import { EVENT_FIELDS } from "../../../constants/field-names";
+import { sieveFilter, sieveMultiEq, sieveAnd, SIEVE_OP } from "../../../utils/sieve-builder";
+import { TABLE_KEYS, VIEW_MODE } from "../../../constants/table-keys";
+import { sortBy } from "../../../constants/sort";
 const PAGE_SIZE = 24;
-const FILTER_KEYS = ["type", "status", "dateFrom", "dateTo", "showExpired"];
+const FILTER_KEYS = [TABLE_KEYS.TYPE, TABLE_KEYS.STATUS, TABLE_KEYS.DATE_FROM, TABLE_KEYS.DATE_TO, TABLE_KEYS.SHOW_EXPIRED];
 export function EventsIndexListing({ initialData }) {
-    const table = useUrlTable({ defaults: { pageSize: String(PAGE_SIZE), sort: "startsAt" } });
-    const [searchInput, setSearchInput] = useState(table.get("q") || "");
+    const table = useUrlTable({ defaults: { pageSize: String(PAGE_SIZE), sort: sortBy(EVENT_FIELDS.STARTS_AT, "ASC") } });
+    const [searchInput, setSearchInput] = useState(table.get(TABLE_KEYS.QUERY) || "");
     const [filterOpen, setFilterOpen] = useState(false);
-    const [view, setView] = useState(table.get("view") || "grid");
+    const [view, setView] = useState(table.get(TABLE_KEYS.VIEW) || VIEW_MODE.GRID);
     const handleViewToggle = (next) => {
         if (next === "table")
             return;
         setView(next);
-        table.set("view", next);
+        table.set(TABLE_KEYS.VIEW, next);
     };
     // Pending filter state — buffered until "Apply Filters" clicked
     const [pendingFilters, setPendingFilters] = useState(() => Object.fromEntries(FILTER_KEYS.map((k) => [k, table.get(k)])));
@@ -62,51 +66,52 @@ export function EventsIndexListing({ initialData }) {
         setPendingFilters(Object.fromEntries(FILTER_KEYS.map((k) => [k, ""])));
     }, []);
     const resetAll = useCallback(() => {
-        const updates = { q: "", sort: "" };
+        const updates = { [TABLE_KEYS.QUERY]: "", [TABLE_KEYS.SORT]: "" };
         for (const k of FILTER_KEYS)
             updates[k] = "";
         table.setMany(updates);
         setSearchInput("");
     }, [table]);
     const activeFilterCount = FILTER_KEYS.filter((k) => !!table.get(k)).length;
-    const hasActiveState = !!table.get("q") ||
-        table.get("sort") !== "startsAt" ||
+    const hasActiveState = !!table.get(TABLE_KEYS.QUERY) ||
+        table.get(TABLE_KEYS.SORT) !== sortBy(EVENT_FIELDS.STARTS_AT, "ASC") ||
         activeFilterCount > 0;
     // Build client-side filter string from URL params
-    const typeRaw = table.get("type");
-    const statusRaw = table.get("status");
-    const dateFrom = table.get("dateFrom");
-    const dateTo = table.get("dateTo");
+    const typeRaw = table.get(TABLE_KEYS.TYPE);
+    const statusRaw = table.get(TABLE_KEYS.STATUS);
+    const dateFrom = table.get(TABLE_KEYS.DATE_FROM);
+    const dateTo = table.get(TABLE_KEYS.DATE_TO);
     const filterParts = [];
     if (typeRaw) {
         const types = typeRaw.split("|").filter(Boolean);
         if (types.length === 1)
-            filterParts.push(`type==${types[0]}`);
+            filterParts.push(sieveFilter(EVENT_FIELDS.TYPE, SIEVE_OP.EQ, types[0]));
+        // BUG FIX: pipe is invalid for ==; expand to multiple AND clauses
         else if (types.length > 1)
-            filterParts.push(`type==${types.join("|")}`);
+            filterParts.push(sieveMultiEq(EVENT_FIELDS.TYPE, types));
     }
     if (statusRaw) {
         const statuses = statusRaw.split("|").filter(Boolean);
         if (statuses.length === 1)
-            filterParts.push(`status==${statuses[0]}`);
+            filterParts.push(sieveFilter(EVENT_FIELDS.STATUS, SIEVE_OP.EQ, statuses[0]));
         else if (statuses.length > 1)
-            filterParts.push(`status==${statuses.join("|")}`);
+            filterParts.push(sieveMultiEq(EVENT_FIELDS.STATUS, statuses));
     }
     if (dateFrom)
-        filterParts.push(`startsAt>=${dateFrom}`);
+        filterParts.push(sieveFilter(EVENT_FIELDS.STARTS_AT, SIEVE_OP.GTE, dateFrom));
     if (dateTo)
-        filterParts.push(`endsAt<=${dateTo}`);
+        filterParts.push(sieveFilter(EVENT_FIELDS.ENDS_AT, SIEVE_OP.LTE, dateTo));
     const params = {
-        q: table.get("q") || undefined,
-        page: table.getNumber("page", 1),
-        pageSize: table.getNumber("pageSize", PAGE_SIZE),
-        sort: table.get("sort") || "startsAt",
-        filters: filterParts.length > 0 ? filterParts.join(",") : undefined,
+        q: table.get(TABLE_KEYS.QUERY) || undefined,
+        page: table.getNumber(TABLE_KEYS.PAGE, 1),
+        pageSize: table.getNumber(TABLE_KEYS.PAGE_SIZE, PAGE_SIZE),
+        sort: table.get(TABLE_KEYS.SORT) || sortBy(EVENT_FIELDS.STARTS_AT, "ASC"),
+        filters: filterParts.length > 0 ? sieveAnd(...filterParts) : undefined,
     };
     const { events, total, totalPages, isLoading } = useEvents(params, { initialData });
-    const currentPage = table.getNumber("page", 1);
+    const currentPage = table.getNumber(TABLE_KEYS.PAGE, 1);
     const commitSearch = useCallback(() => {
-        table.set("q", searchInput.trim());
+        table.set(TABLE_KEYS.QUERY, searchInput.trim());
     }, [searchInput, table]);
-    return (_jsxs("div", { className: "min-h-screen", children: [_jsx(ListingToolbar, { filterCount: activeFilterCount, onFiltersClick: openFilters, searchValue: searchInput, searchPlaceholder: "Search events...", onSearchChange: setSearchInput, onSearchCommit: commitSearch, sortValue: table.get("sort") || "startsAt", sortOptions: EVENT_PUBLIC_SORT_OPTIONS, onSortChange: (v) => { table.set("sort", v); }, view: view, onViewChange: handleViewToggle, onResetAll: resetAll, hasActiveState: hasActiveState }), totalPages > 1 && (_jsx("div", { className: "sticky top-[calc(var(--header-height,0px)+44px)] z-10 flex justify-center bg-white/95 dark:bg-slate-900/95 backdrop-blur-sm border-b border-zinc-200 dark:border-slate-700 px-3 py-1.5", children: _jsx(Pagination, { currentPage: currentPage, totalPages: totalPages, onPageChange: (p) => table.setPage(p) }) })), _jsx("div", { className: "py-6", children: isLoading ? (_jsx("div", { className: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6", children: Array.from({ length: 6 }).map((_, i) => (_jsxs("div", { className: "rounded-xl border border-zinc-100 dark:border-slate-700 overflow-hidden animate-pulse", children: [_jsx("div", { className: "aspect-video bg-zinc-200 dark:bg-slate-700" }), _jsxs("div", { className: "p-4 space-y-2", children: [_jsx("div", { className: "h-4 bg-zinc-200 dark:bg-slate-700 rounded w-3/4" }), _jsx("div", { className: "h-3 bg-zinc-200 dark:bg-slate-700 rounded w-full" }), _jsx("div", { className: "h-3 bg-zinc-200 dark:bg-slate-700 rounded w-2/3" }), _jsx("div", { className: "h-8 bg-zinc-200 dark:bg-slate-700 rounded mt-2" })] })] }, i))) })) : events.length === 0 ? (_jsx("p", { className: "py-12 text-center text-sm text-zinc-500 dark:text-zinc-400", children: "No events found." })) : view === "list" ? (_jsx("div", { className: "flex flex-col divide-y divide-zinc-100 dark:divide-zinc-800 rounded-xl border border-zinc-100 dark:border-zinc-800", children: events.map((event) => (_jsx(EventCard, { event: event }, event.id))) })) : (_jsx("div", { className: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6", children: events.map((event) => (_jsx(EventCard, { event: event }, event.id))) })) }), filterOpen && (_jsxs(_Fragment, { children: [_jsx("div", { className: "fixed inset-0 z-40 bg-black/40", "aria-hidden": "true", onClick: () => setFilterOpen(false) }), _jsxs("div", { className: "fixed inset-y-0 left-0 z-50 flex w-80 flex-col bg-white dark:bg-slate-900 shadow-2xl", children: [_jsxs("div", { className: "flex items-center justify-between border-b border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: [_jsx("span", { className: "flex items-center gap-2 text-base font-semibold text-zinc-900 dark:text-zinc-100", children: "Filters" }), _jsxs("div", { className: "flex items-center gap-2", children: [activeFilterCount > 0 && (_jsx("button", { type: "button", onClick: clearFilters, className: "text-xs text-zinc-500 hover:text-rose-500 dark:text-zinc-400 transition-colors", children: "Clear all" })), _jsx("button", { type: "button", onClick: () => setFilterOpen(false), "aria-label": "Close filters", className: "rounded-lg p-1.5 text-zinc-500 hover:bg-zinc-100 dark:hover:bg-slate-800 transition-colors", children: _jsx(X, { className: "h-5 w-5" }) })] })] }), _jsx("div", { className: "flex-1 overflow-y-auto px-4 py-4", children: _jsx(EventFilters, { table: pendingTable, variant: "public" }) }), _jsx("div", { className: "border-t border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: _jsxs("button", { type: "button", onClick: applyFilters, className: "w-full rounded-lg bg-primary py-2.5 text-sm font-semibold text-white hover:bg-primary-600 transition-colors active:scale-[0.98]", children: ["Apply Filters", activeFilterCount > 0 ? ` (${activeFilterCount})` : ""] }) })] })] }))] }));
+    return (_jsxs("div", { className: "min-h-screen", children: [_jsx(ListingToolbar, { filterCount: activeFilterCount, onFiltersClick: openFilters, searchValue: searchInput, searchPlaceholder: "Search events...", onSearchChange: setSearchInput, onSearchCommit: commitSearch, sortValue: table.get(TABLE_KEYS.SORT) || sortBy(EVENT_FIELDS.STARTS_AT, "ASC"), sortOptions: EVENT_PUBLIC_SORT_OPTIONS, onSortChange: (v) => { table.set(TABLE_KEYS.SORT, v); }, view: view, onViewChange: handleViewToggle, onResetAll: resetAll, hasActiveState: hasActiveState }), totalPages > 1 && (_jsx("div", { className: "sticky top-[calc(var(--header-height,0px)+44px)] z-10 flex justify-center bg-white/95 dark:bg-slate-900/95 backdrop-blur-sm border-b border-zinc-200 dark:border-slate-700 px-3 py-1.5", children: _jsx(Pagination, { currentPage: currentPage, totalPages: totalPages, onPageChange: (p) => table.setPage(p) }) })), _jsx("div", { className: "py-6", children: isLoading ? (_jsx("div", { className: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6", children: Array.from({ length: 6 }).map((_, i) => (_jsxs("div", { className: "rounded-xl border border-zinc-100 dark:border-slate-700 overflow-hidden animate-pulse", children: [_jsx("div", { className: "aspect-video bg-zinc-200 dark:bg-slate-700" }), _jsxs("div", { className: "p-4 space-y-2", children: [_jsx("div", { className: "h-4 bg-zinc-200 dark:bg-slate-700 rounded w-3/4" }), _jsx("div", { className: "h-3 bg-zinc-200 dark:bg-slate-700 rounded w-full" }), _jsx("div", { className: "h-3 bg-zinc-200 dark:bg-slate-700 rounded w-2/3" }), _jsx("div", { className: "h-8 bg-zinc-200 dark:bg-slate-700 rounded mt-2" })] })] }, i))) })) : events.length === 0 ? (_jsx("p", { className: "py-12 text-center text-sm text-zinc-500 dark:text-zinc-400", children: "No events found." })) : view === "list" ? (_jsx("div", { className: "flex flex-col divide-y divide-zinc-100 dark:divide-zinc-800 rounded-xl border border-zinc-100 dark:border-zinc-800", children: events.map((event) => (_jsx(EventCard, { event: event }, event.id))) })) : (_jsx("div", { className: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6", children: events.map((event) => (_jsx(EventCard, { event: event }, event.id))) })) }), filterOpen && (_jsxs(_Fragment, { children: [_jsx("div", { className: "fixed inset-0 z-40 bg-black/40", "aria-hidden": "true", onClick: () => setFilterOpen(false) }), _jsxs("div", { className: "fixed inset-y-0 left-0 z-50 flex w-80 flex-col bg-white dark:bg-slate-900 shadow-2xl", children: [_jsxs("div", { className: "flex items-center justify-between border-b border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: [_jsx("span", { className: "flex items-center gap-2 text-base font-semibold text-zinc-900 dark:text-zinc-100", children: "Filters" }), _jsxs("div", { className: "flex items-center gap-2", children: [activeFilterCount > 0 && (_jsx("button", { type: "button", onClick: clearFilters, className: "text-xs text-zinc-500 hover:text-rose-500 dark:text-zinc-400 transition-colors", children: "Clear all" })), _jsx("button", { type: "button", onClick: () => setFilterOpen(false), "aria-label": "Close filters", className: "rounded-lg p-1.5 text-zinc-500 hover:bg-zinc-100 dark:hover:bg-slate-800 transition-colors", children: _jsx(X, { className: "h-5 w-5" }) })] })] }), _jsx("div", { className: "flex-1 overflow-y-auto px-4 py-4", children: _jsx(EventFilters, { table: pendingTable, variant: "public" }) }), _jsx("div", { className: "border-t border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: _jsxs("button", { type: "button", onClick: applyFilters, className: "w-full rounded-lg bg-primary py-2.5 text-sm font-semibold text-white hover:bg-primary-600 transition-colors active:scale-[0.98]", children: ["Apply Filters", activeFilterCount > 0 ? ` (${activeFilterCount})` : ""] }) })] })] }))] }));
 }

package/dist/features/events/components/EventsListPageView.js

@@ -3,42 +3,45 @@ import { eventRepository } from "../../../repositories";
 import { AdSlot } from "../../homepage/components/AdSlot";
 import { Container, Heading, Main, Section } from "../../../ui";
 import { EventsIndexListing } from "./EventsIndexListing";
+import { EVENT_FIELDS } from "../../../constants/field-names";
+import { sieveFilter, sieveMultiEq, sieveAnd, SIEVE_OP } from "../../../utils/sieve-builder";
+import { sortBy } from "../../../constants/sort";
 function sp(params, key) {
     const v = params[key];
     return Array.isArray(v) ? v[0] ?? "" : v ?? "";
 }
 function buildEventFilters(params) {
-    // Public page defaults to published status; allow overriding to active/ended
     const statusRaw = sp(params, "status");
     const parts = [];
     if (statusRaw) {
         const values = statusRaw.split("|").filter(Boolean);
         if (values.length === 1)
-            parts.push(`status==${values[0]}`);
+            parts.push(sieveFilter(EVENT_FIELDS.STATUS, SIEVE_OP.EQ, values[0]));
+        // BUG FIX: pipe is invalid for ==; expand to multiple AND clauses
         else if (values.length > 1)
-            parts.push(`status==${values.join("|")}`);
+            parts.push(sieveMultiEq(EVENT_FIELDS.STATUS, values));
     }
     else {
-        parts.push("status==active");
+        parts.push(sieveFilter(EVENT_FIELDS.STATUS, SIEVE_OP.EQ, EVENT_FIELDS.STATUS_VALUES.ACTIVE));
     }
     const type = sp(params, "type");
     if (type) {
         const values = type.split("|").filter(Boolean);
         if (values.length === 1)
-            parts.push(`type==${values[0]}`);
+            parts.push(sieveFilter(EVENT_FIELDS.TYPE, SIEVE_OP.EQ, values[0]));
         else if (values.length > 1)
-            parts.push(`type==${values.join("|")}`);
+            parts.push(sieveMultiEq(EVENT_FIELDS.TYPE, values));
     }
     const dateFrom = sp(params, "dateFrom");
     const dateTo = sp(params, "dateTo");
     if (dateFrom)
-        parts.push(`startsAt>=${dateFrom}`);
+        parts.push(sieveFilter(EVENT_FIELDS.STARTS_AT, SIEVE_OP.GTE, dateFrom));
     if (dateTo)
-        parts.push(`endsAt<=${dateTo}`);
-    return parts.join(",");
+        parts.push(sieveFilter(EVENT_FIELDS.ENDS_AT, SIEVE_OP.LTE, dateTo));
+    return sieveAnd(...parts);
 }
 export async function EventsListPageView({ searchParams = {} }) {
-    const sort = sp(searchParams, "sort") || "startsAt";
+    const sort = sp(searchParams, "sort") || sortBy(EVENT_FIELDS.STARTS_AT, "ASC");
     const page = Number(sp(searchParams, "page")) || 1;
     const pageSize = Number(sp(searchParams, "pageSize")) || 24;
     const filters = buildEventFilters(searchParams);

package/dist/features/events/schemas/firestore.d.ts

@@ -95,6 +95,7 @@ export declare const EVENT_FIELDS: {
         readonly ACTIVE: EventStatus;
         readonly PAUSED: EventStatus;
         readonly ENDED: EventStatus;
+        readonly CANCELLED: EventStatus;
     };
     readonly TYPE_VALUES: {
         readonly SALE: EventType;

package/dist/features/events/schemas/firestore.js

@@ -39,6 +39,7 @@ export const EVENT_FIELDS = {
         ACTIVE: "active",
         PAUSED: "paused",
         ENDED: "ended",
+        CANCELLED: "cancelled",
     },
     TYPE_VALUES: {
         SALE: "sale",

package/dist/features/events/schemas/index.d.ts

@@ -288,6 +288,7 @@ export declare const eventItemSchema: z.ZodObject<{
         type: "image";
     } | null;
     startsAt: string;
+    endsAt: string;
     additionalImages: {
         type: "video" | "image" | "file";
         url: string;
@@ -296,7 +297,6 @@ export declare const eventItemSchema: z.ZodObject<{
         thumbnailUrl?: string | undefined;
         youtubeId?: string | undefined;
     }[];
-    endsAt: string;
     eventImages: {
         type: "video" | "image" | "file";
         url: string;

package/dist/features/events/types/index.d.ts

@@ -8,7 +8,7 @@ export interface SpinPrize {
     weight: number;
     isActive: boolean;
 }
-export type EventStatus = "draft" | "active" | "paused" | "ended";
+export type EventStatus = "draft" | "active" | "paused" | "ended" | "cancelled";
 export type EntryReviewStatus = "pending" | "approved" | "flagged";
 export type PollResultsVisibility = "always" | "after_vote" | "after_end";
 export type FormFieldType = "text" | "textarea" | "email" | "phone" | "number" | "select" | "multiselect" | "checkbox" | "radio" | "date" | "rating" | "file";

package/dist/features/faq/actions/faq-actions.d.ts

@@ -33,15 +33,15 @@ export declare const faqCreateSchema: z.ZodEffects<z.ZodObject<{
     question: string;
     showInFooter: boolean;
     showOnHomepage: boolean;
-    isPinned: boolean;
     answer: {
         text: string;
         format: "html" | "plain" | "markdown";
     };
+    isPinned: boolean;
     useSiteSettings: boolean;
     template?: string | undefined;
-    variables?: Record<string, string> | undefined;
     tags?: string[] | undefined;
+    variables?: Record<string, string> | undefined;
     relatedFAQs?: string[] | undefined;
 }, {
     category: string;
@@ -54,8 +54,8 @@ export declare const faqCreateSchema: z.ZodEffects<z.ZodObject<{
     order?: number | undefined;
     priority?: number | undefined;
     isActive?: boolean | undefined;
-    variables?: Record<string, string> | undefined;
     tags?: string[] | undefined;
+    variables?: Record<string, string> | undefined;
     showInFooter?: boolean | undefined;
     showOnHomepage?: boolean | undefined;
     isPinned?: boolean | undefined;
@@ -69,15 +69,15 @@ export declare const faqCreateSchema: z.ZodEffects<z.ZodObject<{
     question: string;
     showInFooter: boolean;
     showOnHomepage: boolean;
-    isPinned: boolean;
     answer: {
         text: string;
         format: "html" | "plain" | "markdown";
     };
+    isPinned: boolean;
     useSiteSettings: boolean;
     template?: string | undefined;
-    variables?: Record<string, string> | undefined;
     tags?: string[] | undefined;
+    variables?: Record<string, string> | undefined;
     relatedFAQs?: string[] | undefined;
 }, {
     category: string;
@@ -90,8 +90,8 @@ export declare const faqCreateSchema: z.ZodEffects<z.ZodObject<{
     order?: number | undefined;
     priority?: number | undefined;
     isActive?: boolean | undefined;
-    variables?: Record<string, string> | undefined;
     tags?: string[] | undefined;
+    variables?: Record<string, string> | undefined;
     showInFooter?: boolean | undefined;
     showOnHomepage?: boolean | undefined;
     isPinned?: boolean | undefined;
@@ -128,16 +128,16 @@ export declare const faqUpdateSchema: z.ZodObject<{
     priority?: number | undefined;
     isActive?: boolean | undefined;
     category?: string | undefined;
-    variables?: Record<string, string> | undefined;
     tags?: string[] | undefined;
+    variables?: Record<string, string> | undefined;
     question?: string | undefined;
     showInFooter?: boolean | undefined;
     showOnHomepage?: boolean | undefined;
-    isPinned?: boolean | undefined;
     answer?: {
         text: string;
         format: "html" | "plain" | "markdown";
     } | undefined;
+    isPinned?: boolean | undefined;
     relatedFAQs?: string[] | undefined;
     useSiteSettings?: boolean | undefined;
 }, {
@@ -146,16 +146,16 @@ export declare const faqUpdateSchema: z.ZodObject<{
     priority?: number | undefined;
     isActive?: boolean | undefined;
     category?: string | undefined;
-    variables?: Record<string, string> | undefined;
     tags?: string[] | undefined;
+    variables?: Record<string, string> | undefined;
     question?: string | undefined;
     showInFooter?: boolean | undefined;
     showOnHomepage?: boolean | undefined;
-    isPinned?: boolean | undefined;
     answer?: {
         text: string;
         format?: "html" | "plain" | "markdown" | undefined;
     } | undefined;
+    isPinned?: boolean | undefined;
     relatedFAQs?: string[] | undefined;
     useSiteSettings?: boolean | undefined;
 }>;

package/dist/features/faq/schemas/index.d.ts

@@ -83,7 +83,7 @@ export declare const faqSchema: z.ZodObject<{
     updatedAt: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     id: string;
-    category: "general" | "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support";
+    category: "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support" | "general";
     question: string;
     answer: {
         text: string;
@@ -109,7 +109,7 @@ export declare const faqSchema: z.ZodObject<{
     relatedFAQs?: string[] | undefined;
 }, {
     id: string;
-    category: "general" | "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support";
+    category: "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support" | "general";
     question: string;
     answer: {
         text: string;
@@ -145,13 +145,13 @@ export declare const faqListParamsSchema: z.ZodObject<{
     perPage?: number | undefined;
     q?: string | undefined;
     page?: number | undefined;
-    category?: "general" | "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support" | undefined;
+    category?: "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support" | "general" | undefined;
     homepage?: boolean | undefined;
 }, {
     perPage?: number | undefined;
     q?: string | undefined;
     page?: number | undefined;
-    category?: "general" | "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support" | undefined;
+    category?: "orders_payment" | "shipping_delivery" | "returns_refunds" | "product_information" | "account_security" | "technical_support" | "general" | undefined;
     homepage?: boolean | undefined;
 }>;
 export * from "./firestore";

package/dist/features/orders/components/OrderFilters.d.ts

@@ -5,66 +5,66 @@ export declare const ORDER_FILTER_KEYS: {
     readonly user: readonly ["status", "paymentStatus", "minAmount", "maxAmount", "dateFrom", "dateTo"];
 };
 export declare const ORDER_ADMIN_SORT_OPTIONS: readonly [{
-    readonly value: "-createdAt";
+    readonly value: string;
     readonly label: "Newest First";
 }, {
-    readonly value: "createdAt";
+    readonly value: string;
     readonly label: "Oldest First";
 }, {
-    readonly value: "-totalPrice";
+    readonly value: string;
     readonly label: "Amount: High to Low";
 }, {
-    readonly value: "totalPrice";
+    readonly value: string;
     readonly label: "Amount: Low to High";
 }, {
-    readonly value: "-orderDate";
+    readonly value: string;
     readonly label: "Order Date: Newest";
 }, {
-    readonly value: "orderDate";
+    readonly value: string;
     readonly label: "Order Date: Oldest";
 }, {
-    readonly value: "userName";
+    readonly value: string;
     readonly label: "Customer A–Z";
 }, {
-    readonly value: "productTitle";
+    readonly value: string;
     readonly label: "Product A–Z";
 }];
 export declare const ORDER_SELLER_SORT_OPTIONS: readonly [{
-    readonly value: "-createdAt";
+    readonly value: string;
     readonly label: "Newest First";
 }, {
-    readonly value: "createdAt";
+    readonly value: string;
     readonly label: "Oldest First";
 }, {
-    readonly value: "-totalPrice";
+    readonly value: string;
     readonly label: "Amount: High to Low";
 }, {
-    readonly value: "totalPrice";
+    readonly value: string;
     readonly label: "Amount: Low to High";
 }, {
-    readonly value: "-orderDate";
+    readonly value: string;
     readonly label: "Order Date: Newest";
 }, {
-    readonly value: "userName";
+    readonly value: string;
     readonly label: "Customer A–Z";
 }];
 export declare const ORDER_USER_SORT_OPTIONS: readonly [{
-    readonly value: "-createdAt";
+    readonly value: string;
     readonly label: "Newest First";
 }, {
-    readonly value: "createdAt";
+    readonly value: string;
     readonly label: "Oldest First";
 }, {
-    readonly value: "-totalPrice";
+    readonly value: string;
     readonly label: "Amount: High to Low";
 }, {
-    readonly value: "totalPrice";
+    readonly value: string;
     readonly label: "Amount: Low to High";
 }, {
-    readonly value: "-orderDate";
+    readonly value: string;
     readonly label: "Order Date: Newest";
 }, {
-    readonly value: "orderDate";
+    readonly value: string;
     readonly label: "Order Date: Oldest";
 }];
 /** Controls which Sieve field set to expose in the filter UI */

package/dist/features/orders/components/OrderFilters.js

@@ -4,58 +4,61 @@ import { useTranslations } from "next-intl";
 import { FilterFacetSection } from "../../filters/FilterFacetSection";
 import { RangeFilter } from "../../filters/RangeFilter";
 import { Div } from "../../../ui";
+import { TABLE_KEYS } from "../../../constants/table-keys";
+import { ORDER_FIELDS } from "../../../constants/field-names";
+import { sortBy } from "../../../constants/sort";
 export const ORDER_FILTER_KEYS = {
     admin: [
-        "status",
+        TABLE_KEYS.STATUS,
         "paymentStatus",
-        "payoutStatus",
+        TABLE_KEYS.PAYOUT_STATUS,
         "minAmount",
         "maxAmount",
-        "dateFrom",
-        "dateTo",
+        TABLE_KEYS.DATE_FROM,
+        TABLE_KEYS.DATE_TO,
     ],
     seller: [
-        "status",
+        TABLE_KEYS.STATUS,
         "paymentStatus",
         "minAmount",
         "maxAmount",
-        "dateFrom",
-        "dateTo",
+        TABLE_KEYS.DATE_FROM,
+        TABLE_KEYS.DATE_TO,
     ],
     user: [
-        "status",
+        TABLE_KEYS.STATUS,
         "paymentStatus",
         "minAmount",
         "maxAmount",
-        "dateFrom",
-        "dateTo",
+        TABLE_KEYS.DATE_FROM,
+        TABLE_KEYS.DATE_TO,
     ],
 };
 export const ORDER_ADMIN_SORT_OPTIONS = [
-    { value: "-createdAt", label: "Newest First" },
-    { value: "createdAt", label: "Oldest First" },
-    { value: "-totalPrice", label: "Amount: High to Low" },
-    { value: "totalPrice", label: "Amount: Low to High" },
-    { value: "-orderDate", label: "Order Date: Newest" },
-    { value: "orderDate", label: "Order Date: Oldest" },
-    { value: "userName", label: "Customer A–Z" },
-    { value: "productTitle", label: "Product A–Z" },
+    { value: sortBy(ORDER_FIELDS.CREATED_AT), label: "Newest First" },
+    { value: sortBy(ORDER_FIELDS.CREATED_AT, "ASC"), label: "Oldest First" },
+    { value: sortBy(ORDER_FIELDS.TOTAL_PRICE), label: "Amount: High to Low" },
+    { value: sortBy(ORDER_FIELDS.TOTAL_PRICE, "ASC"), label: "Amount: Low to High" },
+    { value: sortBy(ORDER_FIELDS.ORDER_DATE), label: "Order Date: Newest" },
+    { value: sortBy(ORDER_FIELDS.ORDER_DATE, "ASC"), label: "Order Date: Oldest" },
+    { value: sortBy(ORDER_FIELDS.USER_NAME, "ASC"), label: "Customer A–Z" },
+    { value: sortBy(ORDER_FIELDS.PRODUCT_TITLE, "ASC"), label: "Product A–Z" },
 ];
 export const ORDER_SELLER_SORT_OPTIONS = [
-    { value: "-createdAt", label: "Newest First" },
-    { value: "createdAt", label: "Oldest First" },
-    { value: "-totalPrice", label: "Amount: High to Low" },
-    { value: "totalPrice", label: "Amount: Low to High" },
-    { value: "-orderDate", label: "Order Date: Newest" },
-    { value: "userName", label: "Customer A–Z" },
+    { value: sortBy(ORDER_FIELDS.CREATED_AT), label: "Newest First" },
+    { value: sortBy(ORDER_FIELDS.CREATED_AT, "ASC"), label: "Oldest First" },
+    { value: sortBy(ORDER_FIELDS.TOTAL_PRICE), label: "Amount: High to Low" },
+    { value: sortBy(ORDER_FIELDS.TOTAL_PRICE, "ASC"), label: "Amount: Low to High" },
+    { value: sortBy(ORDER_FIELDS.ORDER_DATE), label: "Order Date: Newest" },
+    { value: sortBy(ORDER_FIELDS.USER_NAME, "ASC"), label: "Customer A–Z" },
 ];
 export const ORDER_USER_SORT_OPTIONS = [
-    { value: "-createdAt", label: "Newest First" },
-    { value: "createdAt", label: "Oldest First" },
-    { value: "-totalPrice", label: "Amount: High to Low" },
-    { value: "totalPrice", label: "Amount: Low to High" },
-    { value: "-orderDate", label: "Order Date: Newest" },
-    { value: "orderDate", label: "Order Date: Oldest" },
+    { value: sortBy(ORDER_FIELDS.CREATED_AT), label: "Newest First" },
+    { value: sortBy(ORDER_FIELDS.CREATED_AT, "ASC"), label: "Oldest First" },
+    { value: sortBy(ORDER_FIELDS.TOTAL_PRICE), label: "Amount: High to Low" },
+    { value: sortBy(ORDER_FIELDS.TOTAL_PRICE, "ASC"), label: "Amount: Low to High" },
+    { value: sortBy(ORDER_FIELDS.ORDER_DATE), label: "Order Date: Newest" },
+    { value: sortBy(ORDER_FIELDS.ORDER_DATE, "ASC"), label: "Order Date: Oldest" },
 ];
 export function getOrderFilterKeys(variant) {
     return ORDER_FILTER_KEYS[variant];

package/dist/features/orders/repository/orders.repository.js

@@ -3,21 +3,7 @@ import { BaseRepository, prepareForFirestore, } from "../../../providers/db-fire
 import { decryptPiiFields, encryptPiiFields, ORDER_PII_FIELDS, } from "../../../security";
 import { serverTimestamp } from "../../../contracts/field-ops";
 import { createOrderId, ORDER_COLLECTION, OrderStatusValues, } from "../schemas";
-const ORDER_FIELDS = {
-    USER_ID: "userId",
-    PRODUCT_ID: "productId",
-    BUNDLE_ID: "bundleId",
-    STATUS: "status",
-    STATUS_VALUES: {
-        PENDING: "pending",
-        CONFIRMED: "confirmed",
-        PROCESSING: "processing",
-        SHIPPED: "shipped",
-        DELIVERED: "delivered",
-        CANCELLED: "cancelled",
-        REFUNDED: "refunded",
-    },
-};
+import { ORDER_FIELDS } from "../../../constants/field-names";
 /**
  * Statuses that count toward a user's per-product / per-bundle purchase
  * allowance (SB6 maxPerUser enforcement). Cancelled and refunded orders are

package/dist/features/orders/schemas/index.d.ts

@@ -147,9 +147,9 @@ export declare const orderSchema: z.ZodObject<{
     couponCode?: string | undefined;
     shippingCarrier?: string | undefined;
     tax?: number | undefined;
+    discount?: number | undefined;
     paymentGateway?: string | undefined;
     shippingCost?: number | undefined;
-    discount?: number | undefined;
     timeline?: {
         status: "pending" | "processing" | "refunded" | "confirmed" | "shipped" | "delivered" | "cancelled" | "return_requested" | "returned";
         timestamp: string;
@@ -182,9 +182,9 @@ export declare const orderSchema: z.ZodObject<{
     couponCode?: string | undefined;
     shippingCarrier?: string | undefined;
     tax?: number | undefined;
+    discount?: number | undefined;
     paymentGateway?: string | undefined;
     shippingCost?: number | undefined;
-    discount?: number | undefined;
     timeline?: {
         status: "pending" | "processing" | "refunded" | "confirmed" | "shipped" | "delivered" | "cancelled" | "return_requested" | "returned";
         timestamp: string;