Files
vmall/apps/mall/pages/search.vue
T
james ce3e8db5b1 feat(mall): restore real brand and sales facets
Wave 6, the last substantive piece of the mock-API migration. Wave 1 removed the
brand facet and the sales/comments sorts for want of a model; sales turn out to
be derivable from order_items and a brand model is a table plus a column.

- a `brands` table with a nullable `products.brand_id` and an ordered admin
  replace, mirroring categories and storefront content; a public `GET /api/brands`
  and a `brand_id` filter on the catalog, which the search page's facet uses
- `sold_count` per product, computed from `order_items` joined to orders that
  reached payment, so an abandoned or cancelled checkout cannot count as a sale.
  It is computed per read rather than stored, so it cannot drift from the orders
  that produced it
- `sort=sales` alongside `sort=price`; anything else is still a 400
- merchants can set a product's brand through the existing product upsert
- the review UI is gone: the card's review figure and the product detail page's
  reviews tab, summary and replies. There is no reviews model, and the mall
  attributed invented comments to named shoppers and showed a "good rate". The
  now-unreferenced fabrication helpers went with it (`salesOf`, `commentCountOf`,
  `commentsFor`, `commentStats`, `salesRankFor`, `productDetail`, `storeDetail`)

Two bugs found by checking rather than trusting: the fixed-data `listProducts`
had silently ignored `brand_id`, `sort` and `order`, so the restored facet
rendered but filtered nothing until the rollback check caught it; and the seed's
brand lookup read back through the shared `r` variable the product loop
reassigns, working once and then throwing.

Verified: 29 backend tests green including a new brand-and-sales case; all three
frontends build; searching filters by brand (24 to 6) and sorts by sales with
counts matching the API; a product page offers detail and after-sale tabs only,
with a real sold count; the fixed-data rollback filters by brand too.

OpenSpec change: openspec/changes/replace-mock-api-wave-6
2026-09-17 17:35:28 +00:00

283 lines
9.0 KiB
Vue

<script setup lang="ts">
import { t as pick } from "@vmall/shared";
import type { Brand, Category, Paged, Product } from "@vmall/shared";
// Sorts the catalog model can answer: price and real sales. Comments still have
// no model, so that facet stays out.
type SortType = "default" | "price" | "sales";
type OrderType = "asc" | "desc";
const route = useRoute();
const router = useRouter();
const { locale, t } = useI18n();
const { $api } = useNuxtApp();
const queryValue = (value: unknown): string => {
if (Array.isArray(value)) return typeof value[0] === "string" ? value[0] : "";
return typeof value === "string" ? value : "";
};
const parseSort = (raw: string): SortType =>
raw === "price" || raw === "sales" ? raw : "default";
const state = computed(() => {
const sort = parseSort(queryValue(route.query.sort));
const order: OrderType = queryValue(route.query.order) === "asc" ? "asc" : "desc";
const pageValue = Number.parseInt(queryValue(route.query.page), 10);
return {
q: queryValue(route.query.q),
category: queryValue(route.query.category),
brand: queryValue(route.query.brand),
sort,
order,
page: Number.isFinite(pageValue) && pageValue > 0 ? pageValue : 1,
};
});
const emptyPage: Paged<Product> = { items: [], total: 0, page: 1, per_page: 20 };
const { data: result } = await useAsyncData(
"search-results",
() =>
$api.listProducts({
q: state.value.q || undefined,
category_id: state.value.category || undefined,
brand_id: state.value.brand || undefined,
sort: state.value.sort === "default" ? undefined : state.value.sort,
order: state.value.sort === "default" ? undefined : state.value.order,
page: state.value.page,
per_page: 20,
}),
{ watch: [state], default: () => emptyPage },
);
// Shared with the shell's category menu, so the tree is not refetched.
const { data: categories } = await useAsyncData("shell-categories", () => $api.listCategories());
const allCategories = computed(() => categories.value ?? []);
const byPosition = (a: Category, b: Category): number => a.position - b.position;
const topLevelCategories = computed(() =>
allCategories.value.filter((category) => category.parent_id === null).sort(byPosition),
);
// Shared with the product page; the fixed-data adapter serves the same list.
const { data: brands } = await useAsyncData("brands", () => $api.listBrands(), {
default: () => [] as Brand[],
});
const replaceQuery = async (patch: Record<string, string | undefined>): Promise<void> => {
const next: Record<string, string> = {};
for (const [key, value] of Object.entries({
q: state.value.q,
category: state.value.category,
brand: state.value.brand,
sort: state.value.sort,
order: state.value.order,
page: String(state.value.page),
...patch,
})) {
if (value) next[key] = value;
}
if (next.sort === "default" || next.sort === undefined) {
delete next.sort;
delete next.order;
}
if (next.page === "1") delete next.page;
await router.replace({ query: next });
};
const chooseCategory = (id?: string): void => {
void replaceQuery({ category: id, page: "1" });
};
const chooseBrand = (id?: string): void => {
void replaceQuery({ brand: id, page: "1" });
};
const chooseSort = (sort: SortType): void => {
const order: OrderType = state.value.sort === sort && sort !== "default"
? state.value.order === "asc" ? "desc" : "asc"
: "asc";
void replaceQuery({ sort, order, page: "1" });
};
const categoryById = (id: string): Category | undefined =>
allCategories.value.find((category) => category.id === id);
const selectedPath = computed(() => {
const path: Category[] = [];
let current = state.value.category ? categoryById(state.value.category) : undefined;
while (current) {
path.unshift(current);
current = current.parent_id ? categoryById(current.parent_id) : undefined;
}
return path;
});
const categoryChildren = computed(() => {
const selected = selectedPath.value[selectedPath.value.length - 1];
return selected
? allCategories.value.filter((category) => category.parent_id === selected.id).sort(byPosition)
: [];
});
const breadcrumbItems = computed(() => [
{ label: t("search.home"), to: "/" },
{
label: state.value.q
? t("search.searchResults", { keyword: state.value.q })
: t("search.productList"),
},
]);
const sortOptions = computed(() => [
{ key: "default" as SortType, label: t("search.defaultSort") },
{ key: "price" as SortType, label: t("search.price") },
{ key: "sales" as SortType, label: t("search.sales") },
]);
</script>
<template>
<div class="search-page section-bg">
<UiBreadcrumb :items="breadcrumbItems" />
<main class="w1200">
<section class="filter mpanel" :aria-label="t('search.sort')">
<div class="filter-row">
<strong>{{ t("search.category") }}</strong>
<div class="filter-options">
<button type="button" :class="{ active: !state.category }" @click="chooseCategory()">{{ t("search.all") }}</button>
<button
v-for="category in topLevelCategories"
:key="category.id"
type="button"
:class="{ active: category.id === state.category }"
@click="chooseCategory(category.id)"
>{{ pick(category.name, locale) }}</button>
<template v-if="selectedPath.length">
<button
v-for="category in selectedPath.slice(1)"
:key="`path-${category.id}`"
type="button"
:class="{ active: category.id === state.category }"
@click="chooseCategory(category.id)"
>{{ pick(category.name, locale) }}</button>
</template>
<button
v-for="category in categoryChildren"
:key="`child-${category.id}`"
type="button"
:class="{ active: category.id === state.category }"
@click="chooseCategory(category.id)"
>{{ pick(category.name, locale) }}</button>
</div>
</div>
<div v-if="brands.length" class="filter-row">
<strong>{{ t("search.brand") }}</strong>
<div class="filter-options">
<button type="button" :class="{ active: !state.brand }" @click="chooseBrand()">{{ t("search.all") }}</button>
<button
v-for="brand in brands"
:key="brand.id"
type="button"
:class="{ active: brand.id === state.brand }"
@click="chooseBrand(brand.id)"
>{{ pick(brand.name, locale) }}</button>
</div>
</div>
<div class="filter-row sort-row">
<strong>{{ t("search.sort") }}</strong>
<div class="filter-options">
<button
v-for="option in sortOptions"
:key="option.key"
type="button"
:class="{ active: state.sort === option.key }"
:aria-label="option.key === state.sort ? (state.order === 'asc' ? t('search.ascending') : t('search.descending')) : undefined"
@click="chooseSort(option.key)"
>
{{ option.label }}
<span v-if="state.sort === option.key && option.key !== 'default'" aria-hidden="true">{{ state.order === "asc" ? "↑" : "↓" }}</span>
</button>
</div>
</div>
</section>
<div class="result-head">
<span>{{ t("search.resultCount", { n: result.total }) }}</span>
</div>
<div v-if="result.items.length" class="product-grid">
<UiProductCard v-for="product in result.items" :key="product.id" :product="product" />
</div>
<UiEmptyState v-else :text="t('search.empty')" />
<UiPagination :page="result.page" :total="result.total" :per-page="result.per_page" @change="(page) => replaceQuery({ page: String(page) })" />
</main>
</div>
</template>
<style scoped>
.search-page {
min-height: 650px;
padding-bottom: 50px;
}
.filter {
background: #fff;
border: 1px solid var(--mall-line);
padding: 2px 20px;
}
.filter-row {
display: flex;
min-height: 48px;
align-items: flex-start;
border-bottom: 1px solid var(--mall-line);
padding: 12px 0 8px;
}
.filter-row:last-child {
border-bottom: 0;
}
.filter-row strong {
width: 90px;
flex: 0 0 90px;
color: var(--mall-ink);
font-size: 13px;
line-height: 28px;
}
.filter-options {
display: flex;
flex-wrap: wrap;
gap: 4px 8px;
}
.filter-options button {
border: 0;
background: transparent;
color: var(--mall-muted);
cursor: pointer;
font-size: 13px;
line-height: 28px;
padding: 0 10px;
}
.filter-options button:hover,
.filter-options button.active {
background: var(--mall-red);
color: #fff;
border-radius: var(--mall-radius);
}
.sort-row .filter-options button {
min-width: 60px;
}
.result-head {
color: var(--mall-muted);
font-size: 13px;
padding: 22px 2px 12px;
}
.product-grid {
display: grid;
grid-template-columns: repeat(5, minmax(0, 1fr));
gap: 16px;
}
@media (max-width: 900px) {
.product-grid {
grid-template-columns: repeat(3, minmax(0, 1fr));
}
}
</style>