@mohasinac/appkit 4.30.13 → 4.30.16

package/dist/features/payments/repository/payout.repository.d.ts

@@ -20,17 +20,27 @@ export declare class PayoutRepository extends BaseRepository<PayoutDocument> {
     /** Decrypt PII fields on a payout document after Firestore read */
     private decryptPayout;
     /**
-     * Encrypt PII, then attach blind indices derived from the plaintext.
+     * Declared, not hand-rolled.
      *
-     * Previously this reassigned `encrypted = addPiiIndices(data, …)` — which
-     * re-reads the ORIGINAL plaintext and returns `{...data, ...indices}` — and
-     * then spread that over the ciphertext, so plaintext won and `sellerEmail`
-     * and `upiId` were written to Firestore in the clear beside a valid index.
-     * `piiIndicesFor` returns the index fields alone, so the ciphertext cannot be
-     * overwritten. The identical bug was fixed in UserRepository and never
-     * propagated here.
+     * `BaseRepository.applyWriteHooks` already does exactly what the private
+     * `encryptPayoutData` did — encrypt the listed fields, then add the mapped blind
+     * indices derived from the PLAINTEXT source. Declaring the fields means all
+     * nine mutating methods get it, including the `createWithId` / `*InTx` /
+     * `*InBatch` family that inherited unhooked base implementations while the
+     * encryption lived in a private method only three call sites remembered to
+     * call.
      */
-    private encryptPayoutData;
+    protected piiFields: readonly ["sellerEmail", "upiId"];
+    protected piiIndexMap: Record<string, string>;
+    /**
+     * The base hook, plus the nested objects it cannot see.
+     *
+     * `piiFields` is a flat list of top-level names, so a nested blob has to be
+     * encrypted separately. Calling `super.applyWriteHooks` FIRST keeps a single
+     * encryption path with one extra step on top, rather than two parallel paths
+     * that have to agree — which is what the hand-rolled override was.
+     */
+    protected applyWriteHooks<D extends object>(data: D): D;
     /** Override mapDoc to auto-decrypt PII on every Firestore read */
     protected mapDoc<D = PayoutDocument>(snap: import("../../../providers/db-firebase").DocumentSnapshot): D;
     /**

package/dist/features/payments/repository/payout.repository.js

@@ -7,10 +7,23 @@
 import { BaseRepository, prepareForFirestore, parseSieveDateValue, } from "../../../providers/db-firebase";
 import { PAYOUT_COLLECTION, PAYOUT_FIELDS, PAYOUT_TRACKED_FIELDS, createPayoutId } from "../schemas";
 import { withHistory } from "../../../_internal/shared/history/index";
-import { encryptPiiFields, decryptPiiFields, piiIndicesFor, PAYOUT_PII_FIELDS, PAYOUT_PII_INDEX_MAP, encryptPayoutBankAccount, decryptPayoutBankAccount, } from "../../../security";
+import { decryptPiiFields, PAYOUT_PII_FIELDS, PAYOUT_PII_INDEX_MAP, encryptPayoutBankAccount, decryptPayoutBankAccount, } from "../../../security";
 export class PayoutRepository extends BaseRepository {
     constructor() {
         super(PAYOUT_COLLECTION);
+        /**
+         * Declared, not hand-rolled.
+         *
+         * `BaseRepository.applyWriteHooks` already does exactly what the private
+         * `encryptPayoutData` did — encrypt the listed fields, then add the mapped blind
+         * indices derived from the PLAINTEXT source. Declaring the fields means all
+         * nine mutating methods get it, including the `createWithId` / `*InTx` /
+         * `*InBatch` family that inherited unhooked base implementations while the
+         * encryption lived in a private method only three call sites remembered to
+         * call.
+         */
+        this.piiFields = PAYOUT_PII_FIELDS;
+        this.piiIndexMap = PAYOUT_PII_INDEX_MAP;
     }
     /** Decrypt PII fields on a payout document after Firestore read */
     decryptPayout(doc) {
@@ -21,26 +34,19 @@ export class PayoutRepository extends BaseRepository {
         return decrypted;
     }
     /**
-     * Encrypt PII, then attach blind indices derived from the plaintext.
+     * The base hook, plus the nested objects it cannot see.
      *
-     * Previously this reassigned `encrypted = addPiiIndices(data, …)` — which
-     * re-reads the ORIGINAL plaintext and returns `{...data, ...indices}` — and
-     * then spread that over the ciphertext, so plaintext won and `sellerEmail`
-     * and `upiId` were written to Firestore in the clear beside a valid index.
-     * `piiIndicesFor` returns the index fields alone, so the ciphertext cannot be
-     * overwritten. The identical bug was fixed in UserRepository and never
-     * propagated here.
+     * `piiFields` is a flat list of top-level names, so a nested blob has to be
+     * encrypted separately. Calling `super.applyWriteHooks` FIRST keeps a single
+     * encryption path with one extra step on top, rather than two parallel paths
+     * that have to agree — which is what the hand-rolled override was.
      */
-    encryptPayoutData(data) {
-        const encrypted = {
-            ...encryptPiiFields(data, [...PAYOUT_PII_FIELDS]),
-            ...piiIndicesFor(data, PAYOUT_PII_INDEX_MAP),
-        };
-        const access = encrypted;
-        if (access.bankAccount) {
+    applyWriteHooks(data) {
+        const out = super.applyWriteHooks(data);
+        const access = out;
+        if (access.bankAccount)
             access.bankAccount = encryptPayoutBankAccount(access.bankAccount);
-        }
-        return encrypted;
+        return out;
     }
     /** Override mapDoc to auto-decrypt PII on every Firestore read */
     mapDoc(snap) {
@@ -61,7 +67,7 @@ export class PayoutRepository extends BaseRepository {
             updatedAt: now,
         };
         // Encrypt PII before persisting
-        const encrypted = this.encryptPayoutData(data);
+        const encrypted = this.applyWriteHooks(data);
         await this.db
             .collection(this.collection)
             .doc(id)
@@ -70,7 +76,7 @@ export class PayoutRepository extends BaseRepository {
     }
     /** Override base update to preserve encryption/indexing for changed PII fields. */
     async update(payoutId, data) {
-        const encrypted = this.encryptPayoutData(data);
+        const encrypted = this.applyWriteHooks(data);
         return super.update(payoutId, encrypted);
     }
     /**

package/dist/features/products/components/ProductFilters.d.ts

@@ -1,3 +1,4 @@
+import type { ReactNode } from "react";
 import type { FacetOption } from "../../filters/FilterFacetSection";
 import type { UrlTable } from "../../filters/FilterPanel";
 import type { AsyncFacetSectionProps } from "../../filters/AsyncFacetSection";
@@ -115,6 +116,23 @@ export interface ProductFiltersProps {
     sublistingCategoryOptions?: FacetOption[];
     /** Feature badge options for filtering by product features */
     featureOptions?: FacetOption[];
+    /**
+     * Listing-type facet options — `{ value: <canonical ListingType>, label }`.
+     *
+     * Opt-in: only the combined browse pages (`/products`, `/art`) span more than
+     * one listing type, so every other caller leaves this empty and the section
+     * does not render. Derive the options from `PRODUCT_TYPE_FILTER_TABS` /
+     * `ART_STICKERS_TYPE_FILTER_TABS` — never a hand-written list, which is what
+     * `audit-listing-type-tab-coverage.mjs` exists to prevent (Root Cause #61).
+     */
+    listingTypeOptions?: FacetOption[];
+    /**
+     * Rendered directly beneath the listing-type section. The caller owns it so
+     * this shared component does not have to know about the listing-type plugin
+     * registry — `/products` uses it for the "Full <type> filters →" link to a
+     * single selected type's dedicated browse page.
+     */
+    listingTypeFooter?: ReactNode;
     showStatus?: boolean;
     variant?: ProductFilterVariant;
     statusOptions?: FacetOption[];
@@ -124,4 +142,4 @@ export interface ProductFiltersProps {
     /** Show "part of a bundle" switch filter (default true) */
     showBundleFilter?: boolean;
 }
-export declare function ProductFilters({ table, categoryOptions, brandOptions, storeOptions, sellerOptions, tagOptions, sublistingCategoryOptions, featureOptions, showStatus, variant, statusOptions, currencyPrefix, showShipping, showBundleFilter, loadCategoryOptions, loadBrandOptions, loadStoreOptions, }: ProductFiltersProps): import("react").JSX.Element;
+export declare function ProductFilters({ table, categoryOptions, brandOptions, storeOptions, sellerOptions, tagOptions, sublistingCategoryOptions, featureOptions, listingTypeOptions, listingTypeFooter, showStatus, variant, statusOptions, currencyPrefix, showShipping, showBundleFilter, loadCategoryOptions, loadBrandOptions, loadStoreOptions, }: ProductFiltersProps): import("react").JSX.Element;

package/dist/features/products/components/ProductFilters.js

@@ -1,5 +1,5 @@
 "use client";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useTranslations } from "next-intl";
 import { FilterFacetSection } from "../../filters/FilterFacetSection";
 import { AsyncFacetSection } from "../../filters/AsyncFacetSection";
@@ -66,7 +66,7 @@ export function getProductSortOptions(variant) {
             return PRODUCT_PUBLIC_SORT_OPTIONS;
     }
 }
-export function ProductFilters({ table, categoryOptions = [], brandOptions = [], storeOptions = [], sellerOptions, tagOptions = [], sublistingCategoryOptions = [], featureOptions = [], showStatus = false, variant, statusOptions, currencyPrefix = "", showShipping = true, showBundleFilter = true, loadCategoryOptions, loadBrandOptions, loadStoreOptions, }) {
+export function ProductFilters({ table, categoryOptions = [], brandOptions = [], storeOptions = [], sellerOptions, tagOptions = [], sublistingCategoryOptions = [], featureOptions = [], listingTypeOptions = [], listingTypeFooter, showStatus = false, variant, statusOptions, currencyPrefix = "", showShipping = true, showBundleFilter = true, loadCategoryOptions, loadBrandOptions, loadStoreOptions, }) {
     const resolvedStoreOptions = storeOptions.length > 0 ? storeOptions : (sellerOptions ?? []);
     const t = useTranslations("filters");
     const conditionOptions = [
@@ -99,5 +99,13 @@ export function ProductFilters({ table, categoryOptions = [], brandOptions = [],
     const selectedStatuses = splitPipe(TABLE_KEYS.STATUS);
     const selectedSublistings = splitPipe(TABLE_KEYS.SUBLISTING_CATEGORY);
     const selectedFeatures = splitPipe(TABLE_KEYS.FEATURES);
-    return (_jsxs(Div, { children: [loadCategoryOptions ? (_jsx(AsyncFacetSection, { title: t("category"), loadOptions: loadCategoryOptions, selected: selectedCategories, onChange: (vals) => table.set(TABLE_KEYS.CATEGORY, vals.join("|")), defaultCollapsed: false })) : categoryOptions.length > 0 ? (_jsx(FilterFacetSection, { title: t("category"), options: categoryOptions, selected: selectedCategories, onChange: (vals) => table.set(TABLE_KEYS.CATEGORY, vals.join("|")), searchable: true, defaultCollapsed: categoryOptions.length > 6 })) : null, _jsx(FilterFacetSection, { title: t("condition"), options: conditionOptions, selected: selectedConditions, onChange: (vals) => table.set(TABLE_KEYS.CONDITION, vals.join("|")), searchable: false, defaultCollapsed: false }), _jsx(RangeFilter, { title: t("priceRange"), minValue: table.get(TABLE_KEYS.MIN_PRICE), maxValue: table.get(TABLE_KEYS.MAX_PRICE), onMinChange: (v) => table.set(TABLE_KEYS.MIN_PRICE, v), onMaxChange: (v) => table.set(TABLE_KEYS.MAX_PRICE, v), prefix: currencyPrefix, showSlider: true, minBound: 0, maxBound: 500000, step: 500, minPlaceholder: t("minPrice"), maxPlaceholder: t("maxPrice"), defaultCollapsed: false }), loadBrandOptions ? (_jsx(AsyncFacetSection, { title: t("brand"), loadOptions: loadBrandOptions, selected: selectedBrands, onChange: (vals) => table.set(TABLE_KEYS.BRAND, vals.join("|")), defaultCollapsed: false })) : brandOptions.length > 0 ? (_jsx(FilterFacetSection, { title: t("brand"), options: brandOptions, selected: selectedBrands, onChange: (vals) => table.set(TABLE_KEYS.BRAND, vals.join("|")), searchable: brandOptions.length > 4, defaultCollapsed: brandOptions.length > 6 })) : null, loadStoreOptions ? (_jsx(AsyncFacetSection, { title: t("store"), loadOptions: loadStoreOptions, selected: selectedSellers, onChange: (vals) => table.set(TABLE_KEYS.STORE_ID, vals.join("|")), defaultCollapsed: false })) : resolvedStoreOptions.length > 0 ? (_jsx(FilterFacetSection, { title: t("store"), options: resolvedStoreOptions, selected: selectedSellers, onChange: (vals) => table.set(TABLE_KEYS.STORE_ID, vals.join("|")), searchable: resolvedStoreOptions.length > 4, defaultCollapsed: resolvedStoreOptions.length > 6 })) : null, showShipping && (_jsx(SwitchFilter, { title: t("shipping"), label: t("freeShippingOnly"), checked: table.get(TABLE_KEYS.FREE_SHIPPING) === "true", onChange: (v) => table.set(TABLE_KEYS.FREE_SHIPPING, v ? "true" : ""), defaultCollapsed: false })), tagOptions.length > 0 && (_jsx(FilterFacetSection, { title: t("tags"), options: tagOptions, selected: selectedTags, onChange: (vals) => table.set(TABLE_KEYS.TAGS, vals.join("|")), searchable: tagOptions.length > 4, defaultCollapsed: tagOptions.length > 6 })), shouldShowStatus && (_jsx(FilterFacetSection, { title: t("status"), options: statusOptions ?? defaultStatusOptions, selected: selectedStatuses, onChange: (vals) => table.set(TABLE_KEYS.STATUS, vals.join("|")), searchable: false, defaultCollapsed: false })), sublistingCategoryOptions.length > 0 && (_jsx(FilterFacetSection, { title: "Sublisting Type", options: sublistingCategoryOptions, selected: selectedSublistings, onChange: (vals) => table.set(TABLE_KEYS.SUBLISTING_CATEGORY, vals.join("|")), searchable: sublistingCategoryOptions.length > 4, defaultCollapsed: false })), showBundleFilter && (_jsx(SwitchFilter, { title: "Bundles", label: "Part of a bundle only", checked: table.get(TABLE_KEYS.IS_PART_OF_BUNDLE) === "true", onChange: (v) => table.set(TABLE_KEYS.IS_PART_OF_BUNDLE, v ? "true" : ""), defaultCollapsed: false })), featureOptions.length > 0 && (_jsx(FilterFacetSection, { title: "Features", options: featureOptions, selected: selectedFeatures, onChange: (vals) => table.set(TABLE_KEYS.FEATURES, vals.join("|")), searchable: featureOptions.length > 4, defaultCollapsed: featureOptions.length > 4 }))] }));
+    const selectedListingTypes = splitPipe(TABLE_KEYS.LISTING_TYPE);
+    return (_jsxs(Div, { children: [listingTypeOptions.length > 0 && (_jsxs(_Fragment, { children: [_jsx(FilterFacetSection, { title: "Listing type", options: listingTypeOptions, selected: selectedListingTypes, onChange: (vals) => 
+                        // Serialise in the OPTIONS' order, not the order the boxes were
+                        // ticked — `auction|art` and `art|auction` are the same result
+                        // set but two different React Query keys and two different URLs.
+                        table.set(TABLE_KEYS.LISTING_TYPE, listingTypeOptions
+                            .filter((o) => vals.includes(o.value))
+                            .map((o) => o.value)
+                            .join("|")), searchable: false, defaultCollapsed: false }), listingTypeFooter] })), loadCategoryOptions ? (_jsx(AsyncFacetSection, { title: t("category"), loadOptions: loadCategoryOptions, selected: selectedCategories, onChange: (vals) => table.set(TABLE_KEYS.CATEGORY, vals.join("|")), defaultCollapsed: false })) : categoryOptions.length > 0 ? (_jsx(FilterFacetSection, { title: t("category"), options: categoryOptions, selected: selectedCategories, onChange: (vals) => table.set(TABLE_KEYS.CATEGORY, vals.join("|")), searchable: true, defaultCollapsed: categoryOptions.length > 6 })) : null, _jsx(FilterFacetSection, { title: t("condition"), options: conditionOptions, selected: selectedConditions, onChange: (vals) => table.set(TABLE_KEYS.CONDITION, vals.join("|")), searchable: false, defaultCollapsed: false }), _jsx(RangeFilter, { title: t("priceRange"), minValue: table.get(TABLE_KEYS.MIN_PRICE), maxValue: table.get(TABLE_KEYS.MAX_PRICE), onMinChange: (v) => table.set(TABLE_KEYS.MIN_PRICE, v), onMaxChange: (v) => table.set(TABLE_KEYS.MAX_PRICE, v), prefix: currencyPrefix, showSlider: true, minBound: 0, maxBound: 500000, step: 500, minPlaceholder: t("minPrice"), maxPlaceholder: t("maxPrice"), defaultCollapsed: false }), loadBrandOptions ? (_jsx(AsyncFacetSection, { title: t("brand"), loadOptions: loadBrandOptions, selected: selectedBrands, onChange: (vals) => table.set(TABLE_KEYS.BRAND, vals.join("|")), defaultCollapsed: false })) : brandOptions.length > 0 ? (_jsx(FilterFacetSection, { title: t("brand"), options: brandOptions, selected: selectedBrands, onChange: (vals) => table.set(TABLE_KEYS.BRAND, vals.join("|")), searchable: brandOptions.length > 4, defaultCollapsed: brandOptions.length > 6 })) : null, loadStoreOptions ? (_jsx(AsyncFacetSection, { title: t("store"), loadOptions: loadStoreOptions, selected: selectedSellers, onChange: (vals) => table.set(TABLE_KEYS.STORE_ID, vals.join("|")), defaultCollapsed: false })) : resolvedStoreOptions.length > 0 ? (_jsx(FilterFacetSection, { title: t("store"), options: resolvedStoreOptions, selected: selectedSellers, onChange: (vals) => table.set(TABLE_KEYS.STORE_ID, vals.join("|")), searchable: resolvedStoreOptions.length > 4, defaultCollapsed: resolvedStoreOptions.length > 6 })) : null, showShipping && (_jsx(SwitchFilter, { title: t("shipping"), label: t("freeShippingOnly"), checked: table.get(TABLE_KEYS.FREE_SHIPPING) === "true", onChange: (v) => table.set(TABLE_KEYS.FREE_SHIPPING, v ? "true" : ""), defaultCollapsed: false })), tagOptions.length > 0 && (_jsx(FilterFacetSection, { title: t("tags"), options: tagOptions, selected: selectedTags, onChange: (vals) => table.set(TABLE_KEYS.TAGS, vals.join("|")), searchable: tagOptions.length > 4, defaultCollapsed: tagOptions.length > 6 })), shouldShowStatus && (_jsx(FilterFacetSection, { title: t("status"), options: statusOptions ?? defaultStatusOptions, selected: selectedStatuses, onChange: (vals) => table.set(TABLE_KEYS.STATUS, vals.join("|")), searchable: false, defaultCollapsed: false })), sublistingCategoryOptions.length > 0 && (_jsx(FilterFacetSection, { title: "Sublisting Type", options: sublistingCategoryOptions, selected: selectedSublistings, onChange: (vals) => table.set(TABLE_KEYS.SUBLISTING_CATEGORY, vals.join("|")), searchable: sublistingCategoryOptions.length > 4, defaultCollapsed: false })), showBundleFilter && (_jsx(SwitchFilter, { title: "Bundles", label: "Part of a bundle only", checked: table.get(TABLE_KEYS.IS_PART_OF_BUNDLE) === "true", onChange: (v) => table.set(TABLE_KEYS.IS_PART_OF_BUNDLE, v ? "true" : ""), defaultCollapsed: false })), featureOptions.length > 0 && (_jsx(FilterFacetSection, { title: "Features", options: featureOptions, selected: selectedFeatures, onChange: (vals) => table.set(TABLE_KEYS.FEATURES, vals.join("|")), searchable: featureOptions.length > 4, defaultCollapsed: featureOptions.length > 4 }))] }));
 }

package/dist/features/products/components/ProductsIndexListing.d.ts

@@ -6,8 +6,10 @@ export interface ProductsIndexListingProps {
      * (e.g. `["art", "stickers"]`) to reuse this component for a different
      * combined browse page. */
     listingTypes?: readonly string[];
-    /** Type-filter chip tabs shown above the grid. Defaults to the generic
-     * Products tabs; pass a matching set when overriding `listingTypes`. */
+    /** Options for the "Listing type" checkbox facet in the filter drawer. `id`
+     * must be the canonical `ListingType` — it is passed straight into
+     * `sieveFilter("listingType", EQ, id)`. Defaults to the generic Products set;
+     * pass a matching set when overriding `listingTypes`. */
     typeTabs?: readonly {
         id: string;
         label: string;

package/dist/features/products/components/ProductsIndexListing.js

@@ -5,7 +5,7 @@ import { ShoppingCart, Heart, Columns } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useUrlTable } from "../../../react/hooks/useUrlTable";
 import { useProducts } from "../hooks/useProducts";
-import { BulkActionBar, Div, FilterChipGroup, FilterDrawer, ListingToolbar, LoginRequiredModal, Pagination, Row, Stack, useToast, StickyToolbar } from "../../../ui";
+import { BulkActionBar, Div, FilterDrawer, ListingToolbar, LoginRequiredModal, Pagination, Row, Stack, useToast, StickyToolbar } from "../../../ui";
 import { usePendingTable } from "../../../react/hooks/usePendingTable";
 import { useAuthGate } from "../../../react/hooks/useAuthGate";
 import { ACTION_ID, ACTION_META, COMPARE_MAX_ITEMS } from "../constants/action-defs";
@@ -40,7 +40,27 @@ const __O = {
     hidden: "overflow-hidden",
 };
 const DEFAULT_SORT = sortBy(PRODUCT_FIELDS.CREATED_AT);
-const FILTER_KEYS = [TABLE_KEYS.CATEGORY, TABLE_KEYS.CONDITION, TABLE_KEYS.MIN_PRICE, TABLE_KEYS.MAX_PRICE, TABLE_KEYS.BRAND, TABLE_KEYS.STORE_ID, TABLE_KEYS.FREE_SHIPPING, TABLE_KEYS.TAGS, TABLE_KEYS.FEATURES, TABLE_KEYS.IS_PART_OF_BUNDLE];
+// `LISTING_TYPE` is a managed filter key like any other: it stages in the
+// drawer, counts toward the filter badge, and is cleared by Reset. It used to
+// be driven by a separate always-visible chip row that wrote the URL directly,
+// which was the one facet bypassing the Apply model everything else uses.
+const FILTER_KEYS = [TABLE_KEYS.LISTING_TYPE, TABLE_KEYS.CATEGORY, TABLE_KEYS.CONDITION, TABLE_KEYS.MIN_PRICE, TABLE_KEYS.MAX_PRICE, TABLE_KEYS.BRAND, TABLE_KEYS.STORE_ID, TABLE_KEYS.FREE_SHIPPING, TABLE_KEYS.TAGS, TABLE_KEYS.FEATURES, TABLE_KEYS.IS_PART_OF_BUNDLE];
+/**
+ * The dedicated per-type browse page for a selection, when there is exactly
+ * one type and that type has its own page — which carries facets this generic
+ * one can't (bid range, delivery-date window, reveal status).
+ */
+function dedicatedPageFor(types) {
+    if (types.length !== 1)
+        return null;
+    const plugin = pluginFor(types[0]);
+    if (!plugin.browseRoute)
+        return null;
+    return {
+        href: plugin.browseRoute,
+        label: `Full ${plugin.pluralLabel} filters →`,
+    };
+}
 export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODUCT_LISTING_TYPES, typeTabs = PRODUCT_TYPE_FILTER_TABS, searchPlaceholder = "Search products...", }) {
     const router = useRouter();
     const table = useUrlTable({ defaults: { pageSize: "24", sort: DEFAULT_SORT } });
@@ -74,36 +94,39 @@ export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODU
     // keeps the SSR paint and the first refetch in agreement (Root Cause #30).
     const availability = table.get(TABLE_KEYS.AVAILABILITY) ||
         AVAILABILITY_VALUES.AVAILABLE;
-    // "Full <type> filters →" — a single selected type with a dedicated browse
-    // page gets a link to it, since that page carries facets this generic one
-    // can't (bid range, delivery-date window, reveal status).
-    const dedicatedPage = selectedTypes.length === 1 && pluginFor(selectedTypes[0]).browseRoute
-        ? {
-            href: pluginFor(selectedTypes[0]).browseRoute,
-            label: `Full ${pluginFor(selectedTypes[0]).pluralLabel} filters →`,
-        }
-        : null;
     const { pendingTable, filterActiveCount, onFilterApply, onFilterClear, onResetAll, onFilterReset } = usePendingTable(table, FILTER_KEYS);
+    // The drawer's own, uncommitted type selection. The "Full <type> filters →"
+    // link tracks THIS rather than the applied URL value, so it appears the
+    // moment the user ticks a single type instead of only after Apply.
+    const pendingTypes = parseSelectedListingTypes(pendingTable.get(TABLE_KEYS.LISTING_TYPE)).filter((t) => listingTypes.includes(t));
+    const dedicatedPage = dedicatedPageFor(pendingTypes);
+    const listingTypeOptions = typeTabs.map((t) => ({ value: t.id, label: t.label }));
     const openFilters = useCallback(() => {
         onFilterReset();
         setFilterOpen(true);
     }, [onFilterReset]);
     const applyFilters = useCallback(() => {
-        onFilterApply();
+        // A sort valid for the old type selection (say -auctionEndDate) can be
+        // invalid for the new one, so it is blanked in the SAME setMany as the
+        // filters — a follow-up table.set would read stale searchParams and
+        // overwrite this update (Root Cause #13).
+        const key = (types) => [...types].sort().join("|");
+        const typesChanged = key(pendingTypes) !== key(selectedTypes);
+        onFilterApply(typesChanged ? { [TABLE_KEYS.SORT]: "" } : undefined);
         setFilterOpen(false);
-    }, [onFilterApply]);
+    }, [onFilterApply, pendingTypes, selectedTypes]);
     const resetAll = useCallback(() => {
+        // `listingType` is a managed filter key now, so onResetAll clears it —
+        // repeating it here would be a second write of the same value.
         onResetAll({
             [TABLE_KEYS.QUERY]: "",
             [TABLE_KEYS.SORT]: "",
             [TABLE_KEYS.AVAILABILITY]: "",
-            [TABLE_KEYS.LISTING_TYPE]: "",
         });
         setSearchInput("");
     }, [onResetAll]);
     const hasActiveState = !!table.get(TABLE_KEYS.QUERY) ||
         availability !== AVAILABILITY_VALUES.AVAILABLE ||
-        !!typeParam ||
         table.get(TABLE_KEYS.SORT) !== DEFAULT_SORT ||
         filterActiveCount > 0;
     const localCart = useGuestCart();
@@ -263,17 +286,7 @@ export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODU
                     // → close for every toggle. The full facet set (category/price/brand/…)
                     // remains in <FilterDrawer> below.
                     { label: "Free shipping", active: table.get(TABLE_KEYS.FREE_SHIPPING) === "true", onChange: (next) => table.set(TABLE_KEYS.FREE_SHIPPING, next ? "true" : "") },
-                ] }), _jsx(Div, { padding: "y-sm", children: _jsx(AvailabilityTabs, { types: effectiveTypes }) }), _jsx(Div, { padding: "y-sm", children: _jsxs(Row, { justify: "between", align: "center", wrap: true, gap: "sm", children: [_jsx(FilterChipGroup, { multiple: true, label: "Type", tabs: typeTabs, value: selectedTypes.join("|"), onChange: (next) => {
-                                // Clear `sort` alongside the type change: a sort valid for the
-                                // old selection (say -auctionEndDate) can be invalid for the new
-                                // one, and useUrlTable's single router.replace means we must set
-                                // both in ONE call — a follow-up setPage/set would read stale
-                                // searchParams and overwrite this update (Root Cause #13).
-                                table.setMany({
-                                    [TABLE_KEYS.LISTING_TYPE]: next,
-                                    [TABLE_KEYS.SORT]: "",
-                                });
-                            } }), dedicatedPage && (_jsx(TextLink, { href: dedicatedPage.href, size: "sm", weight: "medium", children: dedicatedPage.label }))] }) }), _jsx(BulkActionBar, { selectedCount: selection.selectedCount, onClearSelection: selection.clearSelection, actions: [
+                ] }), _jsx(Div, { padding: "y-sm", children: _jsx(AvailabilityTabs, { types: effectiveTypes }) }), _jsx(BulkActionBar, { selectedCount: selection.selectedCount, onClearSelection: selection.clearSelection, actions: [
                     {
                         id: ACTION_ID.ADD_TO_CART,
                         label: ACTION_META[ACTION_ID.ADD_TO_CART].label,
@@ -321,5 +334,5 @@ export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODU
                 ] }), totalPages > 1 && (_jsx(StickyToolbar, { offset: "header+pagination", tone: "translucent", border: true, padding: "toolbar", children: _jsx(Row, { justify: "center", children: _jsx(Pagination, { currentPage: page, totalPages: totalPages, onPageChange: (p) => table.setPage(p) }) }) })), _jsx(Div, { padding: "y-lg", children: isLoading ? (_jsx(Div, { layout: "grid", gap: "4", className: "grid-cols-2 sm:grid-cols-3 lg:grid-cols-4", children: Array.from({ length: 10 }).map((_, i) => (_jsxs(Div, { className: `${__O.hidden} animate-pulse`, border: "subtle", rounded: "xl", children: [_jsx(Div, { className: "aspect-square", surface: "subtle" }), _jsxs(Stack, { className: `${__P.p3}`, gap: "sm", children: [_jsx(Div, { className: "h-3 w-3/4", surface: "subtle", rounded: "default" }), _jsx(Div, { className: "h-3 w-1/2", surface: "subtle", rounded: "default" }), _jsx(Div, { className: "h-4 w-1/3", surface: "subtle", rounded: "default" })] })] }, i))) })) : (_jsx(ProductGrid, { products: products, getProductHref: (p) => pluginFor(p.listingType ?? "standard").detailRoute(p.slug || p.id), view: view === "grid" ? "card" : "list", onWishlistToggle: handleWishlistToggle, wishlistedIds: wishlistedIds, onAddToCart: handleAddToCart, onBuyNow: handleBuyNow, selectionMode: selection.isSelecting, selectedIds: selection.selectedIdSet, onToggleSelect: selection.toggle })) }), _jsx(CompareOverlay, { isOpen: compareIds.length > 0, productIds: compareIds, productType: "product", onClose: () => {
                     setCompareIds([]);
                     selection.clearSelection();
-                }, onRemove: (id) => setCompareIds((ids) => ids.filter((i) => i !== id)) }), _jsx(FilterDrawer, { open: filterOpen, onOpen: openFilters, onClose: () => setFilterOpen(false), onApply: applyFilters, onReset: onFilterClear, activeCount: filterActiveCount, hideTrigger: true, children: _jsx(ProductFilters, { table: pendingTable, currencyPrefix: "\u20B9", categoryOptions: categoryOptions, brandOptions: brandOptions, featureOptions: featureOptions }) }), _jsx(LoginRequiredModal, { isOpen: modalOpen, onClose: closeModal, message: modalMessage })] }));
+                }, onRemove: (id) => setCompareIds((ids) => ids.filter((i) => i !== id)) }), _jsx(FilterDrawer, { open: filterOpen, onOpen: openFilters, onClose: () => setFilterOpen(false), onApply: applyFilters, onReset: onFilterClear, activeCount: filterActiveCount, hideTrigger: true, children: _jsx(ProductFilters, { table: pendingTable, currencyPrefix: "\u20B9", listingTypeOptions: listingTypeOptions, listingTypeFooter: dedicatedPage ? (_jsx(Div, { padding: "x-md", className: "pb-[var(--appkit-space-3)]", children: _jsx(TextLink, { href: dedicatedPage.href, size: "sm", weight: "medium", children: dedicatedPage.label }) })) : null, categoryOptions: categoryOptions, brandOptions: brandOptions, featureOptions: featureOptions }) }), _jsx(LoginRequiredModal, { isOpen: modalOpen, onClose: closeModal, message: modalMessage })] }));
 }

package/dist/features/reviews/repository/reviews.repository.d.ts

@@ -11,16 +11,18 @@ declare class ReviewRepository extends BaseRepository<ReviewDocument> {
     constructor();
     private decryptSieveResult;
     /**
-     * Encrypt PII, then attach blind indices derived from the plaintext.
+     * Declared, not hand-rolled.
      *
-     * Previously this reassigned `encrypted = addPiiIndices(data, …)` — which
-     * re-reads the ORIGINAL plaintext and returns `{...data, ...indices}` — and
-     * then spread that over the ciphertext, so plaintext won and `userName` was
-     * written to Firestore in the clear beside a valid index. `piiIndicesFor`
-     * returns the index fields alone, so the ciphertext cannot be overwritten.
-     * The identical bug was fixed in UserRepository and never propagated here.
+     * `BaseRepository.applyWriteHooks` already does exactly what the private
+     * `encryptReviewData` did — encrypt the listed fields, then add the mapped blind
+     * indices derived from the PLAINTEXT source. Declaring the fields means all
+     * nine mutating methods get it, including the `createWithId` / `*InTx` /
+     * `*InBatch` family that inherited unhooked base implementations while the
+     * encryption lived in a private method only three call sites remembered to
+     * call.
      */
-    private encryptReviewData;
+    protected piiFields: readonly ["userName"];
+    protected piiIndexMap: Record<string, string>;
     protected mapDoc<D = ReviewDocument>(snap: import("../../../providers/db-firebase").DocumentSnapshot): D;
     create(input: ReviewCreateInput): Promise<ReviewDocument>;
     update(reviewId: string, data: Partial<ReviewDocument>): Promise<ReviewDocument>;

package/dist/features/reviews/repository/reviews.repository.js

@@ -1,7 +1,7 @@
 import { BaseRepository, getFirestoreCount, prepareForFirestore, parseSieveDateValue, } from "../../../providers/db-firebase";
 import { NotFoundError } from "../../../errors";
 import { REVIEW_MAX_RATING, REVIEW_MIN_RATING } from "../../../_internal/shared/features/reviews/config";
-import { decryptPiiFields, encryptPiiFields, piiIndicesFor, REVIEW_PII_FIELDS, REVIEW_PII_INDEX_MAP, } from "../../../security";
+import { decryptPiiFields, REVIEW_PII_FIELDS, REVIEW_PII_INDEX_MAP, } from "../../../security";
 import { createReviewId, REVIEW_COLLECTION, } from "../schemas";
 import { buildReviewSearchTxt } from "../../../utils/search-txt-builders";
 import { planSearchTxt, refineSearchTxt, emptySearchResult, } from "../../../utils/search-txt-query";
@@ -21,6 +21,19 @@ const REVIEW_FIELDS = {
 class ReviewRepository extends BaseRepository {
     constructor() {
         super(REVIEW_COLLECTION);
+        /**
+         * Declared, not hand-rolled.
+         *
+         * `BaseRepository.applyWriteHooks` already does exactly what the private
+         * `encryptReviewData` did — encrypt the listed fields, then add the mapped blind
+         * indices derived from the PLAINTEXT source. Declaring the fields means all
+         * nine mutating methods get it, including the `createWithId` / `*InTx` /
+         * `*InBatch` family that inherited unhooked base implementations while the
+         * encryption lived in a private method only three call sites remembered to
+         * call.
+         */
+        this.piiFields = REVIEW_PII_FIELDS;
+        this.piiIndexMap = REVIEW_PII_INDEX_MAP;
     }
     decryptSieveResult(result) {
         return {
@@ -30,22 +43,6 @@ class ReviewRepository extends BaseRepository {
             ])),
         };
     }
-    /**
-     * Encrypt PII, then attach blind indices derived from the plaintext.
-     *
-     * Previously this reassigned `encrypted = addPiiIndices(data, …)` — which
-     * re-reads the ORIGINAL plaintext and returns `{...data, ...indices}` — and
-     * then spread that over the ciphertext, so plaintext won and `userName` was
-     * written to Firestore in the clear beside a valid index. `piiIndicesFor`
-     * returns the index fields alone, so the ciphertext cannot be overwritten.
-     * The identical bug was fixed in UserRepository and never propagated here.
-     */
-    encryptReviewData(data) {
-        return {
-            ...encryptPiiFields(data, [...REVIEW_PII_FIELDS]),
-            ...piiIndicesFor(data, REVIEW_PII_INDEX_MAP),
-        };
-    }
     mapDoc(snap) {
         const raw = super.mapDoc(snap);
         // `helpfulVoterIds` is an idempotency key, not review content — publishing it
@@ -71,7 +68,7 @@ class ReviewRepository extends BaseRepository {
             createdAt: new Date(),
             updatedAt: new Date(),
         };
-        const encrypted = this.encryptReviewData(reviewData);
+        const encrypted = this.applyWriteHooks(reviewData);
         await this.db
             .collection(this.collection)
             .doc(id)
@@ -79,7 +76,7 @@ class ReviewRepository extends BaseRepository {
         return { id, ...reviewData };
     }
     async update(reviewId, data) {
-        const encrypted = this.encryptReviewData(data);
+        const encrypted = this.applyWriteHooks(data);
         return super.update(reviewId, encrypted);
     }
     async findByProduct(productId) {

package/dist/features/scams/repository/scammer.repository.d.ts

@@ -1,5 +1,6 @@
 import { BaseRepository, parseSieveDateValue, type FirebaseSieveResult, type SieveModel } from "../../../providers/db-firebase";
 import { type HistoryActor } from "../../../_internal/shared/history/index";
+import type { JsonValue } from "../../../schemas/types";
 /** Who/why for a scammer write that lands in `statusHistory`. */
 export interface ScammerWriteContext {
     actor?: HistoryActor;
@@ -11,6 +12,10 @@ import { type ScammerDocument, type ScammerIncidentDocument, type ScammerComment
 declare class ScammerRepository extends BaseRepository<ScammerDocument> {
     constructor();
     static readonly SIEVE_FIELDS: {
+        searchTxt: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
         id: {
             canFilter: boolean;
             canSort: boolean;
@@ -58,7 +63,11 @@ declare class ScammerRepository extends BaseRepository<ScammerDocument> {
         };
     };
     listVerified(model: SieveModel): Promise<FirebaseSieveResult<ScammerDocument>>;
-    listAll(model: SieveModel): Promise<FirebaseSieveResult<ScammerDocument>>;
+    /** Derived on every write path via `applyWriteHooks`. */
+    protected buildSearchTxtFor(data: Record<string, JsonValue>): string[] | null;
+    listAll(model: SieveModel, opts?: {
+        search?: string;
+    }): Promise<FirebaseSieveResult<ScammerDocument>>;
     findBySeoSlug(seoSlug: string): Promise<ScammerDocument | null>;
     create(input: ScammerCreateInput): Promise<ScammerDocument>;
     /**

package/dist/features/scams/repository/scammer.repository.js

@@ -5,6 +5,8 @@ import { serverLogger } from "../../../monitoring/server-logger";
 import { increment } from "../../../contracts/field-ops";
 import { withHistory } from "../../../_internal/shared/history/index";
 import { SCAMMER_TRACKED_FIELDS, SCAMMER_HISTORY_PII_FIELDS } from "../schemas/firestore";
+import { buildScammerSearchTxt } from "../../../utils/search-txt-builders";
+import { planSearchTxt, refineSearchTxt, emptySearchResult, } from "../../../utils/search-txt-query";
 import { SCAMMER_COLLECTION, SCAMMER_FIELDS, SCAMMER_INCIDENTS_SUBCOLLECTION, SCAMMER_COMMENTS_SUBCOLLECTION, DEFAULT_SCAMMER_DATA, } from "../schemas/firestore";
 class ScammerRepository extends BaseRepository {
     constructor() {
@@ -18,11 +20,26 @@ class ScammerRepository extends BaseRepository {
             maxPageSize: 50,
         });
     }
-    async listAll(model) {
-        return this.sieveQuery(model, ScammerRepository.SIEVE_FIELDS, {
+    /** Derived on every write path via `applyWriteHooks`. */
+    buildSearchTxtFor(data) {
+        return buildScammerSearchTxt(data);
+    }
+    async listAll(model, opts) {
+        const plan = planSearchTxt(opts?.search);
+        // A search that narrowed to no usable term must return NOTHING, not the
+        // entire scam registry.
+        if (plan.empty)
+            return emptySearchResult();
+        let baseQuery = this.getCollection();
+        if (plan.head) {
+            baseQuery = baseQuery.where(SCAMMER_FIELDS.SEARCH_TXT, "array-contains", plan.head);
+        }
+        const result = await this.sieveQuery(model, ScammerRepository.SIEVE_FIELDS, {
+            baseQuery,
             defaultPageSize: 50,
             maxPageSize: 200,
         });
+        return refineSearchTxt(result, plan.rest);
     }
     async findBySeoSlug(seoSlug) {
         try {
@@ -203,6 +220,7 @@ class ScammerRepository extends BaseRepository {
     }
 }
 ScammerRepository.SIEVE_FIELDS = {
+    searchTxt: { canFilter: true, canSort: false },
     id: { canFilter: true, canSort: false },
     status: { canFilter: true, canSort: true },
     scamType: { canFilter: true, canSort: true },

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

@@ -105,6 +105,15 @@ export interface ScammerDocument extends BaseDocument {
     upiIds: string[];
     /** Email addresses used by the scammer. Stored plaintext for SEO. */
     emails: string[];
+    /**
+     * Word-prefix n-grams over the identity fields, for `array-contains`
+     * search. Derived by `buildScammerSearchTxt` on every write.
+     *
+     * Optional because documents written before this field existed do not have
+     * it. Never filter with an inequality on it — that would exclude exactly
+     * those rows, which is the whole pre-existing registry.
+     */
+    searchTxt?: string[];
     /** Social media profiles where the scammer operated. */
     socialMedia: ScammerSocialMedia[];
     /** Primary scam type for this profile (most common across incidents). */
@@ -338,6 +347,7 @@ export type ScammerAdminUpdateInput = Partial<Pick<ScammerDocument, "status" | "
 export declare const SCAMMER_FIELDS: {
     readonly ID: "id";
     readonly SEO_SLUG: "seoSlug";
+    readonly SEARCH_TXT: "searchTxt";
     readonly DISPLAY_NAMES: "displayNames";
     readonly PHONES: "phones";
     readonly UPI_IDS: "upiIds";

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

@@ -170,6 +170,7 @@ export const MAX_PENDING_SCAMMER_REPORTS_PER_USER = 5;
 export const SCAMMER_FIELDS = {
     ID: "id",
     SEO_SLUG: "seoSlug",
+    SEARCH_TXT: "searchTxt",
     DISPLAY_NAMES: "displayNames",
     PHONES: "phones",
     UPI_IDS: "upiIds",