Compare commits
65
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28be46e14b | ||
|
|
ee90284129 | ||
|
|
71dccbc590 | ||
|
|
bf082c59fe | ||
|
|
1651fd00a2 | ||
|
|
f59dd6ebec | ||
|
|
2f178db2c6 | ||
|
|
28485d51f7 | ||
|
|
24362b89d7 | ||
|
|
159e4a4cbf | ||
|
|
13a7919c91 | ||
|
|
d670690816 | ||
|
|
62c58c7c89 | ||
|
|
0b4d9a8463 | ||
|
|
51ca8c7e34 | ||
|
|
64047054b8 | ||
|
|
3f5258a76c | ||
|
|
3b93308b71 | ||
|
|
bf53f2e17c | ||
|
|
c2eca11a3b | ||
|
|
4c3f8de1fb | ||
|
|
b3e1869724 | ||
|
|
624f58c723 | ||
|
|
aedc0f6979 | ||
|
|
1e53ceeda6 | ||
|
|
f08ed0c22c | ||
|
|
ee0f877d97 | ||
|
|
b3d4e08914 | ||
|
|
ec9dd83e77 | ||
|
|
4930e2a870 | ||
|
|
5e21cc76fc | ||
|
|
529110a693 | ||
|
|
0b5f2a88cc | ||
|
|
ff6f04fe46 | ||
|
|
2e9a0e30c1 | ||
|
|
ad0acaccc2 | ||
|
|
30019a02d8 | ||
|
|
87999be3d2 | ||
|
|
4ce9f6000c | ||
|
|
0529962391 | ||
|
|
14c45e4f6c | ||
|
|
1c38b95fb0 | ||
|
|
dab66a2dce | ||
|
|
86eb0cfcae | ||
|
|
d3aa10c769 | ||
|
|
15524609fe | ||
|
|
aacb91ac70 | ||
|
|
f91502026b | ||
|
|
7f2f638f38 | ||
|
|
7879ead486 | ||
|
|
dda1caf3e0 | ||
|
|
bb483d3e68 | ||
|
|
73bc79b4bb | ||
|
|
9520426a66 | ||
|
|
b077423ab2 | ||
|
|
94867fbd5a | ||
|
|
6a37f2f4c7 | ||
|
|
b54338f91f | ||
|
|
c7b95b4d2b | ||
|
|
8e4388c325 | ||
|
|
305995cbe2 | ||
|
|
468170349d | ||
|
|
52446592e7 | ||
|
|
7bca0ef335 | ||
|
|
80717680a1 |
No files matched your search
@@ -2,6 +2,7 @@ FROM node:20-alpine AS builder
|
||||
USER root
|
||||
RUN http_proxy=http://172.17.0.1:8888 https_proxy=http://172.17.0.1:8888 apk add --no-cache openssl || apk add --no-cache openssl || true
|
||||
WORKDIR /app
|
||||
ENV PRISMA_HIDE_UPDATE_MESSAGE=true
|
||||
ENV PRISMA_SKIP_POSTINSTALL_GENERATE=true
|
||||
ENV PRISMA_ENGINES_MIRROR=https://registry.npmmirror.com/-/binary/prisma
|
||||
ENV DISABLE_OPENCOLLECTIVE=1
|
||||
@@ -33,6 +34,7 @@ USER root
|
||||
RUN http_proxy=http://172.17.0.1:8888 https_proxy=http://172.17.0.1:8888 apk add --no-cache openssl || apk add --no-cache openssl || true
|
||||
RUN mkdir -p /app/uploads && chown node:node /app/uploads
|
||||
WORKDIR /app
|
||||
ENV PRISMA_HIDE_UPDATE_MESSAGE=true
|
||||
COPY --chown=node:node --from=builder /app/package*.json ./
|
||||
COPY --chown=node:node --from=builder /app/tsconfig.json ./tsconfig.json
|
||||
COPY --chown=node:node --from=builder /app/eslint.config.mjs ./eslint.config.mjs
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
ALTER TABLE blogs ADD COLUMN IF NOT EXISTS author_team VARCHAR(200);
|
||||
ALTER TABLE blogs ADD COLUMN IF NOT EXISTS author_role VARCHAR(200);
|
||||
ALTER TABLE blogs ADD COLUMN IF NOT EXISTS content_updated_at TIMESTAMPTZ;
|
||||
@@ -179,6 +179,8 @@ model Blog {
|
||||
content String @db.Text
|
||||
excerpt String? @db.Text
|
||||
authorId String? @map("author_id") @db.Uuid
|
||||
authorTeam String? @map("author_team") @db.VarChar(200)
|
||||
authorRole String? @map("author_role") @db.VarChar(200)
|
||||
categoryId String? @map("category_id") @db.Uuid
|
||||
imageUrl String? @map("image_url") @db.Text
|
||||
imageAlt String? @map("image_alt") @db.VarChar(255)
|
||||
@@ -198,6 +200,7 @@ model Blog {
|
||||
isPublished Boolean @default(true) @map("is_published")
|
||||
publishedAt DateTime? @map("published_at") @db.Timestamptz()
|
||||
scheduledAt DateTime? @map("scheduled_at") @db.Timestamptz()
|
||||
contentUpdatedAt DateTime? @map("content_updated_at") @db.Timestamptz()
|
||||
readingTime Int @default(3) @map("reading_time")
|
||||
featured Boolean @default(false)
|
||||
allowComments Boolean @default(true) @map("allow_comments")
|
||||
|
||||
@@ -57,7 +57,7 @@ export class AdminController {
|
||||
@ApiQuery({ name: "search", required: false, description: "جستجو" })
|
||||
async getUsers(@Query() query: AdminQueryDto) {
|
||||
const result = await this.adminService.getUsers(query);
|
||||
return { success: true, ...result };
|
||||
return result;
|
||||
}
|
||||
|
||||
@Post("users")
|
||||
@@ -145,7 +145,7 @@ export class AdminController {
|
||||
@ApiQuery({ name: "search", required: false, description: "جستجو" })
|
||||
async getProducts(@Query() query: AdminQueryDto) {
|
||||
const result = await this.adminService.getProducts(query);
|
||||
return { success: true, ...result };
|
||||
return result;
|
||||
}
|
||||
|
||||
@Post("products")
|
||||
@@ -206,7 +206,7 @@ export class AdminController {
|
||||
@ApiQuery({ name: "status", required: false, description: "فیلتر وضعیت" })
|
||||
async getOrders(@Query() query: AdminQueryDto) {
|
||||
const result = await this.adminService.getOrders(query);
|
||||
return { success: true, ...result };
|
||||
return result;
|
||||
}
|
||||
|
||||
@Get("orders/:id")
|
||||
@@ -354,4 +354,34 @@ export class AdminController {
|
||||
await this.settingsService.updateBulkUiTexts(body);
|
||||
return { success: true, data: body };
|
||||
}
|
||||
|
||||
|
||||
@Get("symptoms")
|
||||
@ApiOperation({ summary: "لیست کامل علائم درمانی با صفحهبندی، جستجو و متادیتا" })
|
||||
async getSymptoms(@Query() query: { page?: number; limit?: number; search?: string }) {
|
||||
const res = await this.adminService.getSymptoms(query);
|
||||
return res;
|
||||
}
|
||||
|
||||
@Post("symptoms")
|
||||
@ApiOperation({ summary: "افزودن علامت درمانی جدید" })
|
||||
async createSymptom(@Body() body: { name: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
|
||||
const res = await this.adminService.createSymptom(body);
|
||||
return { success: true, data: res };
|
||||
}
|
||||
|
||||
@Put("symptoms/:id")
|
||||
@ApiOperation({ summary: "ویرایش کامل علامت درمانی و متادیتاهای سئو" })
|
||||
async updateSymptom(@Param("id") id: string, @Body() body: any) {
|
||||
const res = await this.adminService.updateSymptom(id, body);
|
||||
return { success: true, data: res };
|
||||
}
|
||||
|
||||
@Delete("symptoms/:id")
|
||||
@ApiOperation({ summary: "حذف علامت درمانی" })
|
||||
async deleteSymptom(@Param("id") id: string) {
|
||||
const res = await this.adminService.deleteSymptom(id);
|
||||
return res;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1869,4 +1869,164 @@ export class AdminService {
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
async getSymptoms(params?: { page?: number; limit?: number; search?: string }) {
|
||||
const page = Math.max(1, Number(params?.page) || 1);
|
||||
const limit = Math.max(1, Number(params?.limit) || 20);
|
||||
const offset = (page - 1) * limit;
|
||||
const search = params?.search?.trim() || '';
|
||||
|
||||
let items: any[] = [];
|
||||
let total = 0;
|
||||
|
||||
if (search) {
|
||||
const searchPattern = `%${search}%`;
|
||||
const [listResult, countResult] = await Promise.all([
|
||||
this.prisma.$queryRaw<any[]>`
|
||||
SELECT
|
||||
s.id,
|
||||
s.name,
|
||||
s.slug,
|
||||
s.description,
|
||||
s.meta_title as "metaTitle",
|
||||
s.meta_description as "metaDescription",
|
||||
s.keywords,
|
||||
s.icon,
|
||||
s.created_at as "createdAt",
|
||||
COALESCE(COUNT(ps.product_id), 0)::int as "productsCount"
|
||||
FROM symptoms s
|
||||
LEFT JOIN product_symptoms ps ON ps.symptom = s.name
|
||||
WHERE s.name ILIKE ${searchPattern} OR s.slug ILIKE ${searchPattern}
|
||||
GROUP BY s.id, s.name, s.slug, s.description, s.meta_title, s.meta_description, s.keywords, s.icon, s.created_at
|
||||
ORDER BY s.name ASC
|
||||
LIMIT ${limit} OFFSET ${offset};
|
||||
`,
|
||||
this.prisma.$queryRaw<any[]>`
|
||||
SELECT COUNT(*)::int as total
|
||||
FROM symptoms s
|
||||
WHERE s.name ILIKE ${searchPattern} OR s.slug ILIKE ${searchPattern};
|
||||
`,
|
||||
]);
|
||||
items = listResult;
|
||||
total = countResult[0]?.total || 0;
|
||||
} else {
|
||||
const [listResult, countResult] = await Promise.all([
|
||||
this.prisma.$queryRaw<any[]>`
|
||||
SELECT
|
||||
s.id,
|
||||
s.name,
|
||||
s.slug,
|
||||
s.description,
|
||||
s.meta_title as "metaTitle",
|
||||
s.meta_description as "metaDescription",
|
||||
s.keywords,
|
||||
s.icon,
|
||||
s.created_at as "createdAt",
|
||||
COALESCE(COUNT(ps.product_id), 0)::int as "productsCount"
|
||||
FROM symptoms s
|
||||
LEFT JOIN product_symptoms ps ON ps.symptom = s.name
|
||||
GROUP BY s.id, s.name, s.slug, s.description, s.meta_title, s.meta_description, s.keywords, s.icon, s.created_at
|
||||
ORDER BY s.name ASC
|
||||
LIMIT ${limit} OFFSET ${offset};
|
||||
`,
|
||||
this.prisma.$queryRaw<any[]>`
|
||||
SELECT COUNT(*)::int as total
|
||||
FROM symptoms s;
|
||||
`,
|
||||
]);
|
||||
items = listResult;
|
||||
total = countResult[0]?.total || 0;
|
||||
}
|
||||
|
||||
const lastPage = Math.ceil(total / limit) || 1;
|
||||
|
||||
return {
|
||||
data: items,
|
||||
meta: {
|
||||
page,
|
||||
limit,
|
||||
total,
|
||||
lastPage,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
async createSymptom(dto: { name: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
|
||||
if (!dto.name?.trim()) throw new BadRequestException('نام علامت الزامی است');
|
||||
const name = dto.name.trim();
|
||||
const slug = dto.slug?.trim() || name.replace(/\s+/g, '-').toLowerCase();
|
||||
|
||||
return await this.prisma.$queryRawUnsafe(`
|
||||
INSERT INTO symptoms (name, slug, description, meta_title, meta_description, keywords)
|
||||
VALUES ($1, $2, $3, $4, $5, $6)
|
||||
RETURNING id, name, slug, description, meta_title as "metaTitle", meta_description as "metaDescription", keywords;
|
||||
`, name, slug, dto.description || '', dto.metaTitle || '', dto.metaDescription || '', dto.keywords || '');
|
||||
}
|
||||
|
||||
async updateSymptom(id: string, dto: { name?: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
|
||||
// 1. Get existing symptom
|
||||
const existing = await this.prisma.$queryRawUnsafe<any[]>(`SELECT * FROM symptoms WHERE id = $1::uuid LIMIT 1`, id);
|
||||
if (!existing || existing.length === 0) throw new NotFoundException('علامت یافت نشد');
|
||||
const oldName = existing[0].name;
|
||||
const newName = dto.name?.trim() || oldName;
|
||||
const newSlug = dto.slug?.trim() || existing[0].slug;
|
||||
|
||||
return await this.prisma.$transaction(async (tx) => {
|
||||
// Update symptoms table
|
||||
const updated = await tx.$queryRawUnsafe(`
|
||||
UPDATE symptoms
|
||||
SET
|
||||
name = $2,
|
||||
slug = $3,
|
||||
description = $4,
|
||||
meta_title = $5,
|
||||
meta_description = $6,
|
||||
keywords = $7,
|
||||
updated_at = CURRENT_TIMESTAMP
|
||||
WHERE id = $1::uuid
|
||||
RETURNING id, name, slug, description, meta_title as "metaTitle", meta_description as "metaDescription", keywords;
|
||||
`, id, newName, newSlug, dto.description ?? existing[0].description, dto.metaTitle ?? existing[0].meta_title, dto.metaDescription ?? existing[0].meta_description, dto.keywords ?? existing[0].keywords);
|
||||
|
||||
// If name changed, cascade update across product_symptoms & products JSON
|
||||
if (oldName !== newName) {
|
||||
await tx.$executeRaw`UPDATE product_symptoms SET symptom = ${newName} WHERE symptom = ${oldName};`;
|
||||
await tx.$executeRaw`
|
||||
UPDATE products
|
||||
SET dosage_config = jsonb_set(
|
||||
dosage_config,
|
||||
'{symptoms}',
|
||||
(
|
||||
SELECT jsonb_agg(
|
||||
CASE
|
||||
WHEN elem::text = to_jsonb(${oldName}::text)::text THEN to_jsonb(${newName}::text)
|
||||
ELSE elem
|
||||
END
|
||||
)
|
||||
FROM jsonb_array_elements(dosage_config->'symptoms') AS elem
|
||||
)
|
||||
)
|
||||
WHERE dosage_config ? 'symptoms'
|
||||
AND dosage_config->'symptoms' @> to_jsonb(${oldName}::text);
|
||||
`;
|
||||
}
|
||||
|
||||
return updated;
|
||||
});
|
||||
}
|
||||
|
||||
async deleteSymptom(id: string) {
|
||||
const existing = await this.prisma.$queryRawUnsafe<any[]>(`SELECT * FROM symptoms WHERE id = $1::uuid LIMIT 1`, id);
|
||||
if (!existing || existing.length === 0) throw new NotFoundException('علامت یافت نشد');
|
||||
const name = existing[0].name;
|
||||
|
||||
return await this.prisma.$transaction(async (tx) => {
|
||||
// Delete join links
|
||||
await tx.$executeRaw`DELETE FROM product_symptoms WHERE symptom = ${name};`;
|
||||
// Delete symptom row
|
||||
await tx.$queryRawUnsafe(`DELETE FROM symptoms WHERE id = $1::uuid;`, id);
|
||||
return { success: true, message: `علامت «${name}» با موفقیت حذف شد` };
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
import { BadRequestException } from "@nestjs/common";
|
||||
import { ApprovalsController } from "./approvals.controller";
|
||||
|
||||
function fixture(category: string, status = "PENDING") {
|
||||
const approval = { id: "approval-1", department: "seo", category, title: "Proposal", status };
|
||||
const tx = {
|
||||
approvalRequest: {
|
||||
findUnique: jest.fn().mockResolvedValue(approval),
|
||||
updateMany: jest.fn().mockResolvedValue({ count: 1 }),
|
||||
findFirst: jest.fn().mockResolvedValue({ ...approval, status: "APPROVED" }),
|
||||
},
|
||||
departmentTask: {
|
||||
findFirst: jest.fn().mockResolvedValue(null),
|
||||
create: jest.fn().mockResolvedValue({ id: "task-1" }),
|
||||
update: jest.fn(),
|
||||
},
|
||||
};
|
||||
const prisma = { $transaction: jest.fn((fn: (client: typeof tx) => Promise<unknown>) => fn(tx)) };
|
||||
return { controller: new ApprovalsController(prisma as any), prisma, tx };
|
||||
}
|
||||
|
||||
describe("approval routing", () => {
|
||||
it("keeps supplier strategy managerial and does not enqueue", async () => {
|
||||
const { controller, tx } = fixture("B2B_SUPPLIER_STRATEGY");
|
||||
await controller.decide("approval-1", { decision: "APPROVED", ceoNotes: "Review with supplier" });
|
||||
expect(tx.approvalRequest.updateMany).toHaveBeenCalledWith(expect.objectContaining({ where: { id: "approval-1", status: "PENDING" } }));
|
||||
expect(tx.departmentTask.create).not.toHaveBeenCalled();
|
||||
expect(tx.departmentTask.update).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("enqueues an approved SEO digital proposal once within the transaction", async () => {
|
||||
const { controller, prisma, tx } = fixture("SEO");
|
||||
await controller.decide("approval-1", { decision: "APPROVED", ceoNotes: "Go" });
|
||||
expect(prisma.$transaction).toHaveBeenCalledTimes(1);
|
||||
expect(tx.departmentTask.create).toHaveBeenCalledWith(expect.objectContaining({ data: expect.objectContaining({ approvalId: "approval-1", status: "TODO" }) }));
|
||||
tx.approvalRequest.updateMany.mockResolvedValue({ count: 0 });
|
||||
await controller.decide("approval-1", { decision: "APPROVED", ceoNotes: "Go" });
|
||||
expect(tx.departmentTask.create).toHaveBeenCalledTimes(1);
|
||||
expect(tx.departmentTask.update).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("refuses an unknown category instead of entering the automatic queue", async () => {
|
||||
const { controller, tx } = fixture("UNKNOWN_FUTURE_CATEGORY");
|
||||
await expect(controller.decide("approval-1", { decision: "APPROVED" })).rejects.toBeInstanceOf(BadRequestException);
|
||||
expect(tx.departmentTask.create).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not requeue an already approved proposal", async () => {
|
||||
const { controller, tx } = fixture("SEO", "APPROVED");
|
||||
await controller.decide("approval-1", { decision: "APPROVED" });
|
||||
expect(tx.approvalRequest.updateMany).not.toHaveBeenCalled();
|
||||
expect(tx.departmentTask.create).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -144,70 +144,66 @@ export class ApprovalsController {
|
||||
throw new BadRequestException("Decision must be either APPROVED or REJECTED");
|
||||
}
|
||||
|
||||
const item = await (this.prisma as any).approvalRequest.findUnique({
|
||||
where: { id },
|
||||
});
|
||||
if (!item) {
|
||||
throw new NotFoundException(`Approval request ${id} not found`);
|
||||
}
|
||||
return (this.prisma as any).$transaction(async (tx: any) => {
|
||||
const item = await tx.approvalRequest.findUnique({ where: { id } });
|
||||
if (!item) throw new NotFoundException(`Approval request ${id} not found`);
|
||||
|
||||
if (dto.decision === "REJECTED") {
|
||||
// 5. رد توسط مدیرعامل: تسک و درخواست کلاً از سیستم پاکسازی کامل میشوند
|
||||
await (this.prisma as any).departmentTask.deleteMany({
|
||||
where: { approvalId: id },
|
||||
});
|
||||
await (this.prisma as any).approvalRequest.delete({
|
||||
where: { id },
|
||||
if (dto.decision === "REJECTED") {
|
||||
if (item.status !== "PENDING") {
|
||||
throw new BadRequestException("Only pending requests can be rejected");
|
||||
}
|
||||
await tx.departmentTask.deleteMany({ where: { approvalId: id } });
|
||||
await tx.approvalRequest.delete({ where: { id, status: "PENDING" } });
|
||||
return { success: true, message: "درخواست با موفقیت رد و از سیستم پاکسازی شد." };
|
||||
}
|
||||
|
||||
// Only explicitly digital site work may enter the automated task queue.
|
||||
// Supplier strategy and every unknown category remain outside orchestration.
|
||||
const automatedCategories = new Set(["SEO", "SEO_DIGITAL", "CEO_EXPEDITE"]);
|
||||
if (item.category !== "B2B_SUPPLIER_STRATEGY" && !automatedCategories.has(item.category)) {
|
||||
throw new BadRequestException(`Approval category ${item.category} is not routed to automated tasks`);
|
||||
}
|
||||
if (item.status !== "PENDING") {
|
||||
return { success: true, message: "درخواست پیشتر تایید شده است.", data: item };
|
||||
}
|
||||
|
||||
// The conditional write locks the approval row. A racing decision loses
|
||||
// the PENDING predicate and must not create a second task or reset one.
|
||||
const claimed = await tx.approvalRequest.updateMany({
|
||||
where: { id, status: "PENDING" },
|
||||
data: { status: "APPROVED", ceoNotes: dto.ceoNotes || null, executedAt: new Date() },
|
||||
});
|
||||
if (claimed.count !== 1) {
|
||||
const current = await tx.approvalRequest.findUnique({ where: { id } });
|
||||
if (!current) throw new NotFoundException(`Approval request ${id} not found`);
|
||||
return { success: true, message: "درخواست پیشتر بررسی شده است.", data: current };
|
||||
}
|
||||
const updated = await tx.approvalRequest.findUnique({ where: { id } });
|
||||
if (automatedCategories.has(item.category)) {
|
||||
const existingTask = await tx.departmentTask.findFirst({ where: { approvalId: id } });
|
||||
if (!existingTask) {
|
||||
await tx.departmentTask.create({
|
||||
data: {
|
||||
code: "TSK-" + item.id,
|
||||
department: item.department,
|
||||
title: item.title,
|
||||
description: dto.ceoNotes ? item.title + "\n\n[یادداشت مدیرعامل]: " + dto.ceoNotes : item.title,
|
||||
status: "TODO",
|
||||
priority: "HIGH",
|
||||
assignee: "AI_AGENT",
|
||||
approvalId: item.id,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
return {
|
||||
success: true,
|
||||
message: "درخواست با موفقیت رد و از سیستم پاکسازی شد.",
|
||||
message: automatedCategories.has(item.category)
|
||||
? "درخواست تایید شد و مأموریت به صف اقدام (TODO) دپارتمان منتقل گردید."
|
||||
: "طرح تامینکننده تایید شد؛ تسک خودکار ایجاد نشد.",
|
||||
data: updated,
|
||||
};
|
||||
}
|
||||
|
||||
// 1. تایید مدیرعامل: وضعیت درخواست APPROVED و وضعیت تسک در صف اقدام به TODO تغییر مییابد
|
||||
const updated = await (this.prisma as any).approvalRequest.update({
|
||||
where: { id },
|
||||
data: {
|
||||
status: "APPROVED",
|
||||
ceoNotes: dto.ceoNotes || null,
|
||||
executedAt: new Date(),
|
||||
},
|
||||
});
|
||||
|
||||
// جستجو یا ایجاد تسک متناظر با استاتوس TODO
|
||||
const existingTask = await (this.prisma as any).departmentTask.findFirst({
|
||||
where: { approvalId: id },
|
||||
});
|
||||
|
||||
if (existingTask) {
|
||||
await (this.prisma as any).departmentTask.update({
|
||||
where: { id: existingTask.id },
|
||||
data: {
|
||||
status: "TODO",
|
||||
description: dto.ceoNotes ? (existingTask.description || "") + "\n\n[یادداشت مدیرعامل]: " + dto.ceoNotes : existingTask.description,
|
||||
},
|
||||
});
|
||||
} else {
|
||||
await (this.prisma as any).departmentTask.create({
|
||||
data: {
|
||||
code: "TSK-" + Date.now().toString().slice(-6),
|
||||
department: item.department,
|
||||
title: item.title,
|
||||
description: dto.ceoNotes ? (item.title + "\n\n[یادداشت مدیرعامل]: " + dto.ceoNotes) : item.title,
|
||||
status: "TODO",
|
||||
priority: "HIGH",
|
||||
assignee: "AI_AGENT",
|
||||
approvalId: item.id,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: "درخواست تایید شد و مأموریت به صف اقدام (TODO) دپارتمان منتقل گردید.",
|
||||
data: updated,
|
||||
};
|
||||
}
|
||||
|
||||
@Delete(":id")
|
||||
|
||||
@@ -229,6 +229,15 @@ describe("BlogsController (Admin)", () => {
|
||||
expect(result).toEqual({ success: true, data: createdBlog });
|
||||
});
|
||||
|
||||
it("propagates create validation failures", async () => {
|
||||
const req = { user: { id: "admin-user-id" } };
|
||||
const body = { title: "Bad date", contentUpdatedAt: "invalid", createdAt: "2000-01-01" };
|
||||
mockBlogsService.createBlog.mockRejectedValueOnce(new Error("Invalid contentUpdatedAt"));
|
||||
|
||||
await expect(controller.createBlog(body, req)).rejects.toThrow("Invalid contentUpdatedAt");
|
||||
expect(service.createBlog).toHaveBeenCalledWith(body, req.user.id);
|
||||
});
|
||||
|
||||
it("updateBlog should update blog details and return success: true", async () => {
|
||||
const blogId = "blog-10";
|
||||
const body = {
|
||||
@@ -244,6 +253,14 @@ describe("BlogsController (Admin)", () => {
|
||||
expect(result).toEqual({ success: true, data: updatedBlog });
|
||||
});
|
||||
|
||||
it("propagates invalid content timestamp rejection without accepting createdAt", async () => {
|
||||
const body = { contentUpdatedAt: "invalid", createdAt: "2000-01-01" };
|
||||
mockBlogsService.updateBlog.mockRejectedValueOnce(new Error("Invalid contentUpdatedAt"));
|
||||
|
||||
await expect(controller.updateBlog("blog-10", body)).rejects.toThrow("Invalid contentUpdatedAt");
|
||||
expect(service.updateBlog).toHaveBeenCalledWith("blog-10", body);
|
||||
});
|
||||
|
||||
it("deleteBlog should delete blog and return success: true", async () => {
|
||||
const blogId = "blog-10";
|
||||
mockBlogsService.deleteBlog.mockResolvedValue(undefined);
|
||||
|
||||
@@ -203,6 +203,50 @@ describe("Admin BlogsService", () => {
|
||||
expect(result).toEqual(createdBlog);
|
||||
});
|
||||
|
||||
it("allowlists create fields and blocks server-owned and unknown fields", async () => {
|
||||
mockPrisma.blog.create.mockResolvedValue({ id: "created", slug: "safe-post" });
|
||||
|
||||
await service.createBlog(
|
||||
{
|
||||
title: "Safe post",
|
||||
slug: "safe-post",
|
||||
content: "Safe content",
|
||||
id: "client-id",
|
||||
createdAt: "2000-01-01T00:00:00.000Z",
|
||||
updatedAt: "2000-01-01T00:00:00.000Z",
|
||||
viewCount: 999999,
|
||||
serverOwned: "must-not-pass",
|
||||
},
|
||||
"user-admin-1",
|
||||
);
|
||||
|
||||
const payload = mockPrisma.blog.create.mock.calls[0][0].data;
|
||||
expect(payload).toEqual(expect.objectContaining({
|
||||
title: "Safe post",
|
||||
slug: "safe-post",
|
||||
content: "Safe content",
|
||||
}));
|
||||
expect(payload).not.toHaveProperty("id");
|
||||
expect(payload).not.toHaveProperty("createdAt");
|
||||
expect(payload).not.toHaveProperty("updatedAt");
|
||||
expect(payload).not.toHaveProperty("viewCount");
|
||||
expect(payload).not.toHaveProperty("serverOwned");
|
||||
});
|
||||
|
||||
it.each([
|
||||
["contentUpdatedAt", { contentUpdatedAt: "not-a-date" }, "Invalid contentUpdatedAt"],
|
||||
["publishedAt", { publishedAt: "not-a-date" }, "Invalid publishedAt"],
|
||||
["scheduledAt", { scheduledAt: "not-a-date" }, "Invalid scheduledAt"],
|
||||
])("rejects invalid explicit %s", async (_field, timestamps, message) => {
|
||||
await expect(
|
||||
service.createBlog(
|
||||
{ title: "Bad date", slug: "bad-date", content: "Content", ...timestamps },
|
||||
"user-admin-1",
|
||||
),
|
||||
).rejects.toThrow(message);
|
||||
expect(mockPrisma.blog.create).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("should create a SCHEDULED blog if scheduledAt is in the future", async () => {
|
||||
const futureDate = new Date(Date.now() + 86400000).toISOString();
|
||||
const blogData = {
|
||||
@@ -274,6 +318,81 @@ describe("Admin BlogsService", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("material freshness and scheduled publishing", () => {
|
||||
it("sets contentUpdatedAt intentionally and never rewrites createdAt", async () => {
|
||||
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post", createdAt: new Date("2025-01-01") });
|
||||
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
|
||||
await service.updateBlog("b1", { title: "Material edit", markContentUpdated: true });
|
||||
const payload = mockPrisma.blog.update.mock.calls[0][0].data;
|
||||
expect(payload.contentUpdatedAt).toEqual(expect.any(Date));
|
||||
expect(payload).not.toHaveProperty("markContentUpdated");
|
||||
expect(payload).not.toHaveProperty("createdAt");
|
||||
});
|
||||
it("automatically marks freshness when material article content changes", async () => {
|
||||
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post", content: "Old content" });
|
||||
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
|
||||
await service.updateBlog("b1", { content: "Meaningfully revised content" });
|
||||
expect(mockPrisma.blog.update.mock.calls[0][0].data.contentUpdatedAt).toEqual(expect.any(Date));
|
||||
});
|
||||
it("does not mark freshness for attribution-only changes", async () => {
|
||||
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post", content: "Same content" });
|
||||
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
|
||||
await service.updateBlog("b1", { authorTeam: "Clinical team", authorRole: "Review" });
|
||||
expect(mockPrisma.blog.update.mock.calls[0][0].data).not.toHaveProperty("contentUpdatedAt");
|
||||
});
|
||||
it("allows explicitly clearing contentUpdatedAt", async () => {
|
||||
mockPrisma.blog.findUnique.mockResolvedValue({ id: "b1", slug: "post" });
|
||||
mockPrisma.blog.update.mockResolvedValue({ id: "b1", slug: "post" });
|
||||
await service.updateBlog("b1", { contentUpdatedAt: null });
|
||||
expect(mockPrisma.blog.update.mock.calls[0][0].data.contentUpdatedAt).toBeNull();
|
||||
});
|
||||
it("publishes due posts without rewriting createdAt", async () => {
|
||||
const scheduledAt = new Date("2025-02-01T10:00:00Z");
|
||||
mockPrisma.blog.findMany.mockResolvedValue([{ id: "b1", slug: "post", title: "Post", scheduledAt }]);
|
||||
mockPrisma.blog.update.mockResolvedValue({});
|
||||
await service.publishDueScheduledBlogs();
|
||||
expect(mockPrisma.blog.update).toHaveBeenCalledWith({ where: { id: "b1" }, data: { status: "PUBLISHED", isPublished: true, publishedAt: scheduledAt } });
|
||||
});
|
||||
});
|
||||
|
||||
describe("updateBlog security and freshness validation", () => {
|
||||
beforeEach(() => {
|
||||
mockPrisma.blog.findUnique.mockResolvedValue({ id: "blog-1", slug: "safe" });
|
||||
mockPrisma.blog.update.mockResolvedValue({ id: "blog-1", slug: "safe" });
|
||||
});
|
||||
|
||||
it("allowlists mutable fields and ignores createdAt and unrecognized fields", async () => {
|
||||
await service.updateBlog("blog-1", {
|
||||
title: "Allowed title",
|
||||
createdAt: "2000-01-01T00:00:00.000Z",
|
||||
serverOwned: "must-not-pass",
|
||||
});
|
||||
|
||||
const payload = mockPrisma.blog.update.mock.calls[0][0].data;
|
||||
expect(payload.title).toBe("Allowed title");
|
||||
expect(payload).not.toHaveProperty("createdAt");
|
||||
expect(payload).not.toHaveProperty("serverOwned");
|
||||
});
|
||||
|
||||
it("rejects an invalid explicit contentUpdatedAt", async () => {
|
||||
await expect(
|
||||
service.updateBlog("blog-1", { contentUpdatedAt: "not-a-date" }),
|
||||
).rejects.toThrow("Invalid contentUpdatedAt");
|
||||
expect(mockPrisma.blog.update).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("preserves explicit null clearing and markContentUpdated precedence", async () => {
|
||||
await service.updateBlog("blog-1", { contentUpdatedAt: null });
|
||||
expect(mockPrisma.blog.update.mock.calls[0][0].data.contentUpdatedAt).toBeNull();
|
||||
|
||||
await service.updateBlog("blog-1", {
|
||||
contentUpdatedAt: "not-a-date",
|
||||
markContentUpdated: true,
|
||||
});
|
||||
expect(mockPrisma.blog.update.mock.calls[1][0].data.contentUpdatedAt).toEqual(expect.any(Date));
|
||||
});
|
||||
});
|
||||
|
||||
describe("deleteBlog", () => {
|
||||
it("should throw NotFoundException if blog not found", async () => {
|
||||
mockPrisma.blog.findUnique.mockResolvedValue(null);
|
||||
@@ -468,7 +587,6 @@ describe("Admin BlogsService", () => {
|
||||
status: "PUBLISHED",
|
||||
isPublished: true,
|
||||
publishedAt: scheduledDate,
|
||||
createdAt: scheduledDate,
|
||||
},
|
||||
});
|
||||
expect(mockRevalidationService.revalidateBlog).toHaveBeenCalledWith(
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
OnModuleInit,
|
||||
@@ -141,16 +142,31 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
|
||||
|
||||
async createBlog(data: any, currentUserId: string) {
|
||||
const {
|
||||
tags,
|
||||
tagNames,
|
||||
categoryId,
|
||||
authorId,
|
||||
publishedAt,
|
||||
scheduledAt,
|
||||
readingTime,
|
||||
...rest
|
||||
markContentUpdated,
|
||||
contentUpdatedAt,
|
||||
} = data;
|
||||
|
||||
const parseOptionalDate = (value: unknown, field: string): Date | null => {
|
||||
if (value === undefined || value === null || value === "") return null;
|
||||
const parsed = new Date(value as string | number | Date);
|
||||
if (!Number.isFinite(parsed.getTime())) {
|
||||
throw new BadRequestException(`Invalid ${field}`);
|
||||
}
|
||||
return parsed;
|
||||
};
|
||||
|
||||
const parsedPublishedAt = parseOptionalDate(publishedAt, "publishedAt");
|
||||
const parsedScheduledAt = parseOptionalDate(scheduledAt, "scheduledAt");
|
||||
const parsedContentUpdatedAt = markContentUpdated
|
||||
? new Date()
|
||||
: parseOptionalDate(contentUpdatedAt, "contentUpdatedAt");
|
||||
|
||||
// Connect or create tags
|
||||
const tagConnectOrCreate = [];
|
||||
if (Array.isArray(tagNames) && tagNames.length > 0) {
|
||||
@@ -171,13 +187,12 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
|
||||
|
||||
const targetAuthorId = authorId || currentUserId;
|
||||
const now = new Date();
|
||||
const parsedScheduledAt = scheduledAt ? new Date(scheduledAt) : null;
|
||||
const isFutureSchedule = parsedScheduledAt && parsedScheduledAt > now;
|
||||
|
||||
let finalStatus = rest.status || "PUBLISHED";
|
||||
let finalStatus = data.status || "PUBLISHED";
|
||||
let finalIsPublished =
|
||||
rest.isPublished !== undefined ? rest.isPublished : true;
|
||||
let finalPublishedAt = publishedAt ? new Date(publishedAt) : null;
|
||||
data.isPublished !== undefined ? data.isPublished : true;
|
||||
let finalPublishedAt = parsedPublishedAt;
|
||||
|
||||
if (isFutureSchedule) {
|
||||
finalStatus = "SCHEDULED";
|
||||
@@ -191,19 +206,45 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
|
||||
finalPublishedAt = now;
|
||||
}
|
||||
|
||||
const createPayload: Prisma.BlogCreateInput = {
|
||||
...rest,
|
||||
const createPayload = {
|
||||
title: data.title,
|
||||
slug: data.slug,
|
||||
content: data.content,
|
||||
excerpt: data.excerpt,
|
||||
authorTeam: data.authorTeam,
|
||||
authorRole: data.authorRole,
|
||||
imageUrl: data.imageUrl,
|
||||
imageAlt: data.imageAlt,
|
||||
imageCaption: data.imageCaption,
|
||||
metaTitle: data.metaTitle,
|
||||
metaDescription: data.metaDescription,
|
||||
keywords: data.keywords,
|
||||
focusKeywords: data.focusKeywords,
|
||||
canonicalUrl: data.canonicalUrl,
|
||||
noIndex: data.noIndex,
|
||||
noFollow: data.noFollow,
|
||||
schemaType: data.schemaType,
|
||||
ogTitle: data.ogTitle,
|
||||
ogDescription: data.ogDescription,
|
||||
ogImage: data.ogImage,
|
||||
status: finalStatus,
|
||||
isPublished: finalIsPublished,
|
||||
readingTime: readingTime ? Number(readingTime) : 3,
|
||||
featured: data.featured,
|
||||
allowComments: data.allowComments,
|
||||
showOnHome: data.showOnHome,
|
||||
homeDisplayMode: data.homeDisplayMode,
|
||||
relatedProductIds: data.relatedProductIds,
|
||||
relatedBlogIds: data.relatedBlogIds,
|
||||
readingTime: readingTime !== undefined ? Number(readingTime) : 3,
|
||||
publishedAt: finalPublishedAt,
|
||||
scheduledAt: parsedScheduledAt,
|
||||
contentUpdatedAt: parsedContentUpdatedAt,
|
||||
author: { connect: { id: targetAuthorId } },
|
||||
...(categoryId ? { category: { connect: { id: categoryId } } } : {}),
|
||||
...(tagConnectOrCreate.length > 0
|
||||
? { tags: { connectOrCreate: tagConnectOrCreate } }
|
||||
: {}),
|
||||
};
|
||||
} satisfies Prisma.BlogCreateInput;
|
||||
|
||||
const created = await this.prisma.blog.create({
|
||||
data: createPayload,
|
||||
@@ -223,19 +264,83 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
|
||||
if (!blog) throw new NotFoundException("Blog not found");
|
||||
|
||||
const {
|
||||
tags,
|
||||
tagNames,
|
||||
categoryId,
|
||||
authorId,
|
||||
publishedAt,
|
||||
scheduledAt,
|
||||
readingTime,
|
||||
...rest
|
||||
markContentUpdated,
|
||||
contentUpdatedAt,
|
||||
} = data;
|
||||
|
||||
const mutableScalarFields = [
|
||||
"title",
|
||||
"slug",
|
||||
"content",
|
||||
"excerpt",
|
||||
"authorTeam",
|
||||
"authorRole",
|
||||
"imageUrl",
|
||||
"imageAlt",
|
||||
"imageCaption",
|
||||
"metaTitle",
|
||||
"metaDescription",
|
||||
"keywords",
|
||||
"focusKeywords",
|
||||
"canonicalUrl",
|
||||
"noIndex",
|
||||
"noFollow",
|
||||
"schemaType",
|
||||
"ogTitle",
|
||||
"ogDescription",
|
||||
"ogImage",
|
||||
"status",
|
||||
"isPublished",
|
||||
"featured",
|
||||
"allowComments",
|
||||
"showOnHome",
|
||||
"homeDisplayMode",
|
||||
"relatedProductIds",
|
||||
"relatedBlogIds",
|
||||
] as const;
|
||||
const updatePayload: Prisma.BlogUpdateInput = {};
|
||||
for (const field of mutableScalarFields) {
|
||||
if (data[field] !== undefined) {
|
||||
(updatePayload as Record<string, unknown>)[field] = data[field];
|
||||
}
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const updatePayload: Prisma.BlogUpdateInput = {
|
||||
...rest,
|
||||
const materialContentFields = [
|
||||
"title",
|
||||
"content",
|
||||
"excerpt",
|
||||
"imageUrl",
|
||||
"imageAlt",
|
||||
"imageCaption",
|
||||
] as const;
|
||||
const hasMaterialContentChange = materialContentFields.some(
|
||||
(field) => data[field] !== undefined && data[field] !== blog[field],
|
||||
);
|
||||
if (markContentUpdated || (contentUpdatedAt === undefined && hasMaterialContentChange)) {
|
||||
(updatePayload as Record<string, unknown>).contentUpdatedAt = now;
|
||||
} else if (contentUpdatedAt !== undefined) {
|
||||
if (contentUpdatedAt === null || contentUpdatedAt === "") {
|
||||
(updatePayload as Record<string, unknown>).contentUpdatedAt = null;
|
||||
} else {
|
||||
const parsedContentUpdatedAt = new Date(contentUpdatedAt);
|
||||
if (!Number.isFinite(parsedContentUpdatedAt.getTime())) {
|
||||
throw new BadRequestException("Invalid contentUpdatedAt");
|
||||
}
|
||||
(updatePayload as Record<string, unknown>).contentUpdatedAt = parsedContentUpdatedAt;
|
||||
}
|
||||
}
|
||||
|
||||
Object.assign(updatePayload, {
|
||||
...(readingTime !== undefined
|
||||
? { readingTime: Number(readingTime) }
|
||||
: {}),
|
||||
...(readingTime !== undefined
|
||||
? { readingTime: Number(readingTime) }
|
||||
: {}),
|
||||
@@ -245,7 +350,7 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
|
||||
? { category: { connect: { id: categoryId } } }
|
||||
: { category: { disconnect: true } }
|
||||
: {}),
|
||||
};
|
||||
});
|
||||
|
||||
if (scheduledAt !== undefined) {
|
||||
const parsedScheduledAt = scheduledAt ? new Date(scheduledAt) : null;
|
||||
@@ -259,7 +364,6 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
|
||||
updatePayload.status = "PUBLISHED";
|
||||
updatePayload.isPublished = true;
|
||||
updatePayload.publishedAt = parsedScheduledAt;
|
||||
updatePayload.createdAt = parsedScheduledAt;
|
||||
}
|
||||
} else if (publishedAt !== undefined) {
|
||||
updatePayload.publishedAt = publishedAt ? new Date(publishedAt) : null;
|
||||
@@ -472,7 +576,6 @@ export class BlogsService implements OnModuleInit, OnModuleDestroy {
|
||||
status: "PUBLISHED",
|
||||
isPublished: true,
|
||||
publishedAt: publishDate,
|
||||
createdAt: publishDate,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
import { BadRequestException } from "@nestjs/common";
|
||||
import { assertTaskCanComplete } from "./department-task-completion.policy";
|
||||
|
||||
describe("department task completion policy", () => {
|
||||
it("rejects model-only output without a live deliverable", () => {
|
||||
expect(() =>
|
||||
assertTaskCanComplete({
|
||||
deliverableUrl: null,
|
||||
acceptanceCriteria: { criteria: ["live URL responds 200"] },
|
||||
executionLogs: [{ status: "COMPLETED_BY_AGENT" }],
|
||||
}),
|
||||
).toThrow(BadRequestException);
|
||||
});
|
||||
|
||||
it("rejects completion without acceptance criteria", () => {
|
||||
expect(() =>
|
||||
assertTaskCanComplete({
|
||||
deliverableUrl: "https://canina.ir/blog/verified",
|
||||
acceptanceCriteria: null,
|
||||
executionLogs: [{ status: "QA_PASSED" }],
|
||||
}),
|
||||
).toThrow(BadRequestException);
|
||||
});
|
||||
|
||||
it("rejects completion without QA evidence", () => {
|
||||
expect(() =>
|
||||
assertTaskCanComplete({
|
||||
deliverableUrl: "https://canina.ir/blog/verified",
|
||||
acceptanceCriteria: { criteria: ["HTTP 200"] },
|
||||
executionLogs: [{ status: "COMPLETED_BY_AGENT" }],
|
||||
}),
|
||||
).toThrow(BadRequestException);
|
||||
});
|
||||
|
||||
it("allows completion with URL, criteria and QA evidence", () => {
|
||||
expect(() =>
|
||||
assertTaskCanComplete({
|
||||
deliverableUrl: "https://canina.ir/blog/verified",
|
||||
acceptanceCriteria: { criteria: ["HTTP 200"] },
|
||||
executionLogs: [{ status: "QA_PASSED" }],
|
||||
}),
|
||||
).not.toThrow();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,40 @@
|
||||
import { BadRequestException } from "@nestjs/common";
|
||||
|
||||
interface CompletabaleTask {
|
||||
deliverableUrl?: string | null;
|
||||
acceptanceCriteria?: unknown;
|
||||
executionLogs?: unknown;
|
||||
}
|
||||
|
||||
function hasAcceptanceCriteria(criteria: unknown): boolean {
|
||||
if (!criteria) return false;
|
||||
if (typeof criteria === "string") return criteria.trim().length > 0;
|
||||
if (Array.isArray(criteria)) return criteria.length > 0;
|
||||
if (typeof criteria === "object") {
|
||||
const value = criteria as Record<string, unknown>;
|
||||
const items = value.criteria;
|
||||
return Array.isArray(items) ? items.length > 0 : Object.keys(value).length > 0;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function hasQaEvidence(logs: unknown): boolean {
|
||||
if (!Array.isArray(logs)) return false;
|
||||
return logs.some((log) => {
|
||||
if (!log || typeof log !== "object") return false;
|
||||
const status = String((log as Record<string, unknown>).status || "").toUpperCase();
|
||||
return ["QA_PASSED", "VERIFIED", "PRODUCTION_VERIFIED"].includes(status);
|
||||
});
|
||||
}
|
||||
|
||||
export function assertTaskCanComplete(task: CompletabaleTask): void {
|
||||
if (!task.deliverableUrl?.trim()) {
|
||||
throw new BadRequestException("DONE requires a verifiable deliverable URL");
|
||||
}
|
||||
if (!hasAcceptanceCriteria(task.acceptanceCriteria)) {
|
||||
throw new BadRequestException("DONE requires explicit acceptance criteria");
|
||||
}
|
||||
if (!hasQaEvidence(task.executionLogs)) {
|
||||
throw new BadRequestException("DONE requires QA/production verification evidence");
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
UseGuards,
|
||||
NotFoundException,
|
||||
} from "@nestjs/common";
|
||||
import { assertTaskCanComplete } from "./department-task-completion.policy";
|
||||
import { ApiTags, ApiBearerAuth, ApiOperation } from "@nestjs/swagger";
|
||||
import { JwtAuthGuard } from "../auth/jwt-auth.guard";
|
||||
import { RolesGuard } from "../common/guards/roles.guard";
|
||||
@@ -165,6 +166,15 @@ export class DepartmentTasksController {
|
||||
});
|
||||
}
|
||||
|
||||
const candidateDeliverableUrl = body.deliverableUrl || existing.deliverableUrl;
|
||||
if (body.status === "DONE") {
|
||||
assertTaskCanComplete({
|
||||
deliverableUrl: candidateDeliverableUrl,
|
||||
acceptanceCriteria: existing.acceptanceCriteria,
|
||||
executionLogs: logs,
|
||||
});
|
||||
}
|
||||
|
||||
const updateData: any = {
|
||||
status: body.status,
|
||||
executionLogs: logs,
|
||||
|
||||
@@ -76,7 +76,7 @@ describe("MediaService", () => {
|
||||
|
||||
const validFile = {
|
||||
originalname: "product-cover.webp",
|
||||
buffer: Buffer.from("dummy-image-bytes"),
|
||||
buffer: Buffer.from([0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x45, 0x42, 0x50, 0x56, 0x50, 0x38]),
|
||||
mimetype: "image/webp",
|
||||
size: 5000,
|
||||
} as any;
|
||||
|
||||
@@ -79,6 +79,28 @@ export class MediaService {
|
||||
"پسوند فایل ارسالی مجاز نیست (فرمت SVG و فایلهای اجرایی مسدود هستند).",
|
||||
);
|
||||
}
|
||||
|
||||
// SEC-01: Magic number verification for uploaded binary content
|
||||
const buf = file.buffer;
|
||||
if (!buf || buf.length < 4) {
|
||||
throw new BadRequestException("فایل نامعتبر یا آسیبدیده است.");
|
||||
}
|
||||
|
||||
const isJpeg = buf[0] === 0xff && buf[1] === 0xd8 && buf[2] === 0xff;
|
||||
const isPng = buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4e && buf[3] === 0x47;
|
||||
const isGif = buf[0] === 0x47 && buf[1] === 0x49 && buf[2] === 0x46; // GIF87a or GIF89a
|
||||
const isPdf = buf[0] === 0x25 && buf[1] === 0x50 && buf[2] === 0x44 && buf[3] === 0x46; // %PDF
|
||||
const isWebp =
|
||||
buf.length >= 12 &&
|
||||
buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46 && // RIFF
|
||||
buf[8] === 0x57 && buf[9] === 0x45 && buf[10] === 0x42 && buf[11] === 0x50; // WEBP
|
||||
|
||||
if (!isJpeg && !isPng && !isGif && !isPdf && !isWebp) {
|
||||
throw new BadRequestException(
|
||||
"محتوای باینری فایل با پسوند یا هدر ادعایی همخوانی ندارد (اعتبارسنجی امضای فایل رد شد).",
|
||||
);
|
||||
}
|
||||
|
||||
const filename = `${uniqueSuffix}${ext}`;
|
||||
const filePath = path.join(uploadDir, filename);
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { TasksModule } from './common/services/tasks.module';
|
||||
import { Module, NestModule, MiddlewareConsumer } from "@nestjs/common";
|
||||
import { PrismaModule } from "./prisma/prisma.module";
|
||||
import { SupportChatModule } from './support-chat/support-chat.module';
|
||||
@@ -79,6 +80,7 @@ import { Request, Response, NextFunction } from "express";
|
||||
B2BModule,
|
||||
FaqModule,
|
||||
MenuModule,
|
||||
TasksModule,
|
||||
],
|
||||
controllers: [MetricsController],
|
||||
providers: [
|
||||
|
||||
@@ -50,7 +50,8 @@ describe("BlogsService", () => {
|
||||
expect(result.data).toEqual(blogs);
|
||||
expect(result.meta.total).toBe(1);
|
||||
const query = mockPrisma.blog.findMany.mock.calls[0][0];
|
||||
expect(query.include.author).toBeUndefined();
|
||||
expect(query.include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
|
||||
expect(query.orderBy).toEqual([{ publishedAt: "desc" }, { id: "asc" }]);
|
||||
});
|
||||
|
||||
it("should filter by categorySlug and search term", async () => {
|
||||
@@ -69,7 +70,19 @@ describe("BlogsService", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("selects the minimal public author identity for list results", async () => {
|
||||
mockPrisma.blog.findMany.mockResolvedValue([]); mockPrisma.blog.count.mockResolvedValue(0);
|
||||
await service.findAll({});
|
||||
expect(mockPrisma.blog.findMany.mock.calls[0][0].include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
|
||||
});
|
||||
|
||||
describe("findHomepage", () => {
|
||||
it("selects the minimal public author identity for homepage results", async () => {
|
||||
mockPrisma.blog.findMany.mockResolvedValueOnce([]).mockResolvedValueOnce([]);
|
||||
await service.findHomepage();
|
||||
for (const call of mockPrisma.blog.findMany.mock.calls.slice(0, 2)) expect(call[0].include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
|
||||
});
|
||||
|
||||
it("should return selected blogs if showOnHome posts exist", async () => {
|
||||
const selected = [{ id: "b1", title: "Hero Blog", showOnHome: true }];
|
||||
mockPrisma.blog.findMany.mockResolvedValueOnce(selected);
|
||||
@@ -92,6 +105,12 @@ describe("BlogsService", () => {
|
||||
});
|
||||
|
||||
describe("findOneBySlug", () => {
|
||||
it("selects the minimal public author identity for detail results", async () => {
|
||||
mockPrisma.blog.findFirst.mockResolvedValue(null);
|
||||
await expect(service.findOneBySlug("missing")).rejects.toThrow(NotFoundException);
|
||||
expect(mockPrisma.blog.findFirst.mock.calls[0][0].include.author).toEqual({ select: { id: true, firstName: true, lastName: true } });
|
||||
});
|
||||
|
||||
it("should throw NotFoundException if slug is empty or blog not found", async () => {
|
||||
mockPrisma.blog.findFirst.mockResolvedValue(null);
|
||||
await expect(service.findOneBySlug("unknown-slug")).rejects.toThrow(
|
||||
|
||||
@@ -64,10 +64,16 @@ export class BlogsService {
|
||||
where: whereClause,
|
||||
skip,
|
||||
take: Number(limit),
|
||||
orderBy: {
|
||||
[sortBy === "createdAt" ? "createdAt" : "publishedAt"]: sortOrder,
|
||||
},
|
||||
orderBy: [
|
||||
{
|
||||
[sortBy === "createdAt" ? "createdAt" : "publishedAt"]: sortOrder,
|
||||
},
|
||||
{ id: "asc" },
|
||||
],
|
||||
include: {
|
||||
author: {
|
||||
select: { id: true, firstName: true, lastName: true },
|
||||
},
|
||||
category: {
|
||||
select: { id: true, name: true, slug: true },
|
||||
},
|
||||
@@ -105,8 +111,11 @@ export class BlogsService {
|
||||
const selectedBlogs = await this.prisma.blog.findMany({
|
||||
where: { ...baseWhere, showOnHome: true },
|
||||
take: 4,
|
||||
orderBy: { publishedAt: "desc" },
|
||||
orderBy: [{ publishedAt: "desc" }, { id: "asc" }],
|
||||
include: {
|
||||
author: {
|
||||
select: { id: true, firstName: true, lastName: true },
|
||||
},
|
||||
category: { select: { id: true, name: true, slug: true } },
|
||||
tags: { select: { id: true, name: true, slug: true } },
|
||||
_count: { select: { comments: { where: { status: "APPROVED" } } } },
|
||||
@@ -121,8 +130,11 @@ export class BlogsService {
|
||||
const newestBlogs = await this.prisma.blog.findMany({
|
||||
where: baseWhere,
|
||||
take: 4,
|
||||
orderBy: { publishedAt: "desc" },
|
||||
orderBy: [{ publishedAt: "desc" }, { id: "asc" }],
|
||||
include: {
|
||||
author: {
|
||||
select: { id: true, firstName: true, lastName: true },
|
||||
},
|
||||
category: { select: { id: true, name: true, slug: true } },
|
||||
tags: { select: { id: true, name: true, slug: true } },
|
||||
_count: { select: { comments: { where: { status: "APPROVED" } } } },
|
||||
@@ -158,6 +170,7 @@ export class BlogsService {
|
||||
],
|
||||
},
|
||||
include: {
|
||||
author: { select: { id: true, firstName: true, lastName: true } },
|
||||
category: {
|
||||
select: { id: true, name: true, slug: true },
|
||||
},
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import { CallHandler, ExecutionContext } from "@nestjs/common";
|
||||
import { of, lastValueFrom } from "rxjs";
|
||||
import { AdminRevalidationInterceptor } from "./admin-revalidation.interceptor";
|
||||
import { RevalidationService } from "./revalidation.service";
|
||||
|
||||
describe("AdminRevalidationInterceptor", () => {
|
||||
const revalidation = { revalidate: jest.fn().mockResolvedValue(true) } as unknown as RevalidationService;
|
||||
const interceptor = new AdminRevalidationInterceptor(revalidation);
|
||||
const next = { handle: () => of({ ok: true }) } as CallHandler;
|
||||
|
||||
beforeEach(() => jest.clearAllMocks());
|
||||
|
||||
function context(method: string, url: string): ExecutionContext {
|
||||
return { switchToHttp: () => ({ getRequest: () => ({ method, originalUrl: url }) }) } as unknown as ExecutionContext;
|
||||
}
|
||||
|
||||
it("invalidates blog list and detail after an admin blog mutation", async () => {
|
||||
await lastValueFrom(interceptor.intercept(context("PUT", "/api/admin/blogs/blog-1"), next));
|
||||
expect(revalidation.revalidate).toHaveBeenCalledWith(
|
||||
expect.arrayContaining(["blogs", "blog-categories", "blog-tags", "home-data"]),
|
||||
expect.arrayContaining(["/", "/blog"]),
|
||||
);
|
||||
});
|
||||
|
||||
it.each([
|
||||
["/api/admin/products/p1", "products"],
|
||||
["/api/admin/categories/c1", "categories"],
|
||||
["/api/admin/wiki/glucosamine", "wiki"],
|
||||
["/api/admin/settings", "settings"],
|
||||
["/api/admin/cms/hero-banners/b1", "banners"],
|
||||
["/api/admin/cms/vet-testimonials/t1", "testimonials"],
|
||||
["/api/admin/reviews/r1", "products"],
|
||||
["/api/admin/media/m1", "products"],
|
||||
])("maps %s mutations to %s cache invalidation", async (url, expectedTag) => {
|
||||
await lastValueFrom(interceptor.intercept(context("DELETE", url), next));
|
||||
expect(revalidation.revalidate).toHaveBeenCalledWith(expect.arrayContaining([expectedTag]), expect.any(Array));
|
||||
});
|
||||
|
||||
it("does not invalidate cache for reads or internal-only admin CRUD", async () => {
|
||||
await lastValueFrom(interceptor.intercept(context("GET", "/api/admin/blogs"), next));
|
||||
await lastValueFrom(interceptor.intercept(context("PUT", "/api/admin/users/u1"), next));
|
||||
expect(revalidation.revalidate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it.each([
|
||||
["/api/banners/banner-1", "banners"],
|
||||
["/api/menu/menu-1", "menu"],
|
||||
["/api/videos/video-1", "videos"],
|
||||
["/api/testimonials/testimonial-1", "testimonials"],
|
||||
["/api/faq/faq-1", "faq"],
|
||||
["/api/ingredients/ingredient-1", "ingredients"],
|
||||
["/api/doctors/doctor-1", "doctors"],
|
||||
["/api/settings/seo", "seo-config"],
|
||||
["/api/settings/ui-texts/HERO_TITLE", "ui-texts"],
|
||||
["/api/contact/info", "settings"],
|
||||
["/api/smart-advisor/rules/rule-1", "smart-advisor"],
|
||||
])("maps storefront mutation %s to %s cache invalidation", async (url, expectedTag) => {
|
||||
await lastValueFrom(interceptor.intercept(context("PATCH", url), next));
|
||||
expect(revalidation.revalidate).toHaveBeenCalledWith(expect.arrayContaining([expectedTag]), expect.any(Array));
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,48 @@
|
||||
import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from "@nestjs/common";
|
||||
import { Observable, tap } from "rxjs";
|
||||
import { RevalidationService } from "./revalidation.service";
|
||||
|
||||
type Target = { tags: string[]; paths: string[] };
|
||||
|
||||
const TARGETS: Array<{ pattern: RegExp; target: Target }> = [
|
||||
{ pattern: /^\/api\/banners(?:\/|$)/, target: { tags: ["banners", "home-data"], paths: ["/"] } },
|
||||
{ pattern: /^\/api\/menu(?:\/|$)/, target: { tags: ["menu", "settings"], paths: ["/"] } },
|
||||
{ pattern: /^\/api\/videos(?:\/|$)/, target: { tags: ["videos", "home-data"], paths: ["/", "/videos"] } },
|
||||
{ pattern: /^\/api\/testimonials(?:\/|$)/, target: { tags: ["testimonials", "home-data"], paths: ["/"] } },
|
||||
{ pattern: /^\/api\/faq(?:\/|$)/, target: { tags: ["faq"], paths: ["/faq"] } },
|
||||
{ pattern: /^\/api\/ingredients(?:\/|$)/, target: { tags: ["ingredients", "products", "wiki"], paths: ["/shop", "/wiki"] } },
|
||||
{ pattern: /^\/api\/doctors(?:\/|$)/, target: { tags: ["doctors", "settings"], paths: ["/contact"] } },
|
||||
{ pattern: /^\/api\/settings\/seo(?:\/|$)/, target: { tags: ["seo-config", "settings"], paths: ["/", "/sitemap.xml"] } },
|
||||
{ pattern: /^\/api\/settings\/(?:ui-texts|system|financial)(?:\/|$)/, target: { tags: ["ui-texts", "settings", "home-data"], paths: ["/"] } },
|
||||
{ pattern: /^\/api\/contact\/info(?:\/|$)/, target: { tags: ["settings"], paths: ["/contact", "/"] } },
|
||||
{ pattern: /^\/api\/smart-advisor\/rules(?:\/|$)/, target: { tags: ["smart-advisor", "products"], paths: ["/smart-advisor"] } },
|
||||
{ pattern: /^\/api\/admin\/blogs(?:\/|$)/, target: { tags: ["blogs", "blog-categories", "blog-tags", "home-data"], paths: ["/", "/blog", "/sitemap.xml"] } },
|
||||
{ pattern: /^\/api\/admin\/categories(?:\/|$)/, target: { tags: ["products", "categories", "home-data"], paths: ["/", "/shop", "/sitemap.xml"] } },
|
||||
{ pattern: /^\/api\/admin\/wiki(?:\/|$)/, target: { tags: ["wiki", "scientific-terms"], paths: ["/wiki", "/sitemap.xml"] } },
|
||||
{ pattern: /^\/api\/admin\/(?:settings|pricing)(?:\/|$)/, target: { tags: ["settings", "ui-texts", "seo-config", "products", "home-data"], paths: ["/", "/shop"] } },
|
||||
{ pattern: /^\/api\/admin\/cms\/hero-banners(?:\/|$)/, target: { tags: ["banners", "home-data"], paths: ["/"] } },
|
||||
{ pattern: /^\/api\/admin\/cms\/vet-testimonials(?:\/|$)/, target: { tags: ["testimonials", "home-data"], paths: ["/"] } },
|
||||
{ pattern: /^\/api\/admin\/reviews(?:\/|$)/, target: { tags: ["products", "home-data"], paths: ["/", "/shop"] } },
|
||||
{ pattern: /^\/api\/admin\/media(?:\/|$)/, target: { tags: ["products", "blogs", "wiki", "home-data"], paths: ["/", "/shop", "/blog", "/wiki"] } },
|
||||
{ pattern: /^\/api\/admin\/products(?:\/|$)/, target: { tags: ["products", "home-data"], paths: ["/", "/shop", "/sitemap.xml"] } },
|
||||
];
|
||||
|
||||
@Injectable()
|
||||
export class AdminRevalidationInterceptor implements NestInterceptor {
|
||||
constructor(private readonly revalidation: RevalidationService) {}
|
||||
|
||||
intercept(context: ExecutionContext, next: CallHandler): Observable<unknown> {
|
||||
const request = context.switchToHttp().getRequest<{ method?: string; originalUrl?: string; url?: string }>();
|
||||
const method = (request.method || "GET").toUpperCase();
|
||||
const url = (request.originalUrl || request.url || "").split("?")[0];
|
||||
const target = method === "GET" || method === "HEAD" || method === "OPTIONS"
|
||||
? undefined
|
||||
: TARGETS.find((entry) => entry.pattern.test(url))?.target;
|
||||
|
||||
return next.handle().pipe(
|
||||
tap(() => {
|
||||
if (target) void this.revalidation.revalidate(target.tags, target.paths);
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
import { Global, Module } from "@nestjs/common";
|
||||
import { APP_INTERCEPTOR } from "@nestjs/core";
|
||||
import { AdminRevalidationInterceptor } from "./admin-revalidation.interceptor";
|
||||
import { RevalidationService } from "./revalidation.service";
|
||||
|
||||
@Global()
|
||||
@Module({
|
||||
providers: [RevalidationService],
|
||||
providers: [RevalidationService, { provide: APP_INTERCEPTOR, useClass: AdminRevalidationInterceptor }],
|
||||
exports: [RevalidationService],
|
||||
})
|
||||
export class RevalidationModule {}
|
||||
@@ -110,4 +110,22 @@ describe("RevalidationService", () => {
|
||||
expect(pathSpy).toHaveBeenCalledWith("/shop/ART-100");
|
||||
});
|
||||
});
|
||||
|
||||
describe("revalidate batch", () => {
|
||||
it("should send deduplicated tags and paths in one request", async () => {
|
||||
const mockFetch = jest.spyOn(global, "fetch" as any).mockResolvedValue({ ok: true, status: 200 } as any);
|
||||
|
||||
const result = await service.revalidate(["blogs", "blogs"], ["/blog", "/blog"]);
|
||||
|
||||
expect(result).toBe(true);
|
||||
expect(mockFetch).toHaveBeenCalledTimes(1);
|
||||
expect(mockFetch).toHaveBeenCalledWith(
|
||||
"http://frontend_mock:8080/api/revalidate",
|
||||
expect.objectContaining({
|
||||
method: "POST",
|
||||
body: JSON.stringify({ tags: ["blogs"], paths: ["/blog"] }),
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -31,6 +31,32 @@ export class RevalidationService {
|
||||
return secret;
|
||||
}
|
||||
|
||||
async revalidate(tags: string[] = [], paths: string[] = []): Promise<boolean> {
|
||||
const cleanTags = [...new Set(tags.filter(Boolean))];
|
||||
const cleanPaths = [...new Set(paths.filter((path) => path.startsWith("/")))];
|
||||
if (!cleanTags.length && !cleanPaths.length) return true;
|
||||
|
||||
try {
|
||||
const url = `${this.frontendUrl}/api/revalidate`;
|
||||
const res = await fetch(url, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"x-revalidate-secret": this.secret,
|
||||
},
|
||||
body: JSON.stringify({ tags: cleanTags, paths: cleanPaths }),
|
||||
});
|
||||
if (!res.ok) {
|
||||
this.logger.warn(`Failed to revalidate cache batch: ${res.status} ${res.statusText}`);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
} catch (err: any) {
|
||||
this.logger.debug(`Batch revalidation skipped or frontend offline: ${err?.message}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async revalidateTag(tag: string): Promise<boolean> {
|
||||
try {
|
||||
const url = `${this.frontendUrl}/api/revalidate`;
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { TasksService } from './tasks.service';
|
||||
import { OrdersModule } from '../../orders/orders.module';
|
||||
import { PaymentModule } from '../../payment/payment.module';
|
||||
import { RedisModule } from '../../redis/redis.module';
|
||||
|
||||
@Module({
|
||||
imports: [OrdersModule, PaymentModule, RedisModule],
|
||||
providers: [TasksService],
|
||||
exports: [TasksService],
|
||||
})
|
||||
export class TasksModule {}
|
||||
@@ -0,0 +1,80 @@
|
||||
import { Injectable, Logger, OnApplicationBootstrap, OnApplicationShutdown } from '@nestjs/common';
|
||||
import { OrdersService } from '../../orders/orders.service';
|
||||
import { RedisService } from '../../redis/redis.service';
|
||||
import { PaymentService } from '../../payment/payment.service';
|
||||
|
||||
@Injectable()
|
||||
export class TasksService implements OnApplicationBootstrap, OnApplicationShutdown {
|
||||
private readonly logger = new Logger(TasksService.name);
|
||||
private reservationTimer: NodeJS.Timeout | null = null;
|
||||
private reconciliationTimer: NodeJS.Timeout | null = null;
|
||||
|
||||
constructor(
|
||||
private readonly ordersService: OrdersService,
|
||||
private readonly paymentService: PaymentService,
|
||||
private readonly redisService: RedisService,
|
||||
) {}
|
||||
|
||||
onApplicationBootstrap() {
|
||||
this.logger.log('Starting background maintenance tasks...');
|
||||
|
||||
// 1. Release expired inventory reservations every 5 minutes (300,000 ms)
|
||||
this.reservationTimer = setInterval(async () => {
|
||||
const lockAcquired = await this.redisService.acquireLock('task:inventory_release', 240);
|
||||
if (!lockAcquired) {
|
||||
this.logger.debug('[Task:Inventory] Another instance holds the lock, skipping execution.');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const result = await this.ordersService.releaseExpiredInventoryReservations();
|
||||
if (result.releasedCount > 0) {
|
||||
this.logger.log(`[Task:Inventory] Automatically released ${result.releasedCount} expired inventory reservations.`);
|
||||
}
|
||||
} catch (err) {
|
||||
this.logger.error('[Task:Inventory] Failed to release expired inventory reservations:', err);
|
||||
} finally {
|
||||
await this.redisService.releaseLock('task:inventory_release');
|
||||
}
|
||||
}, 5 * 60 * 1000);
|
||||
|
||||
// 2. Reconcile pending online payment transactions every 10 minutes (600,000 ms)
|
||||
this.reconciliationTimer = setInterval(async () => {
|
||||
const lockAcquired = await this.redisService.acquireLock('task:payment_reconciliation', 540);
|
||||
if (!lockAcquired) {
|
||||
this.logger.debug('[Task:PaymentReconciliation] Another instance holds the lock, skipping execution.');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const result = await this.paymentService.reconcilePendingTransactions();
|
||||
if (result.total > 0) {
|
||||
this.logger.log(`[Task:PaymentReconciliation] Checked ${result.total} transactions: ${result.verified} verified, ${result.failed} failed.`);
|
||||
}
|
||||
} catch (err) {
|
||||
this.logger.error('[Task:PaymentReconciliation] Failed to reconcile pending payments:', err);
|
||||
} finally {
|
||||
await this.redisService.releaseLock('task:payment_reconciliation');
|
||||
}
|
||||
}, 10 * 60 * 1000);
|
||||
|
||||
// Initial check on startup after 30 seconds
|
||||
setTimeout(async () => {
|
||||
try {
|
||||
await this.ordersService.releaseExpiredInventoryReservations();
|
||||
} catch (err) {
|
||||
this.logger.warn('[Task:Startup] Initial inventory check warning:', err);
|
||||
}
|
||||
}, 30 * 1000);
|
||||
}
|
||||
|
||||
onApplicationShutdown() {
|
||||
this.logger.log('Stopping background maintenance tasks...');
|
||||
if (this.reservationTimer) {
|
||||
clearInterval(this.reservationTimer);
|
||||
this.reservationTimer = null;
|
||||
}
|
||||
if (this.reconciliationTimer) {
|
||||
clearInterval(this.reconciliationTimer);
|
||||
this.reconciliationTimer = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,5 +5,6 @@ import { OrdersController } from "./orders.controller";
|
||||
@Module({
|
||||
controllers: [OrdersController],
|
||||
providers: [OrdersService],
|
||||
exports: [OrdersService],
|
||||
})
|
||||
export class OrdersModule {}
|
||||
@@ -39,7 +39,7 @@ describe("OrdersService", () => {
|
||||
uiText: {
|
||||
findFirst: jest.fn().mockResolvedValue(null),
|
||||
},
|
||||
$executeRaw: jest.fn(),
|
||||
$executeRaw: jest.fn().mockResolvedValue(1),
|
||||
$transaction: jest.fn(),
|
||||
};
|
||||
|
||||
|
||||
@@ -346,13 +346,14 @@ export class OrdersService {
|
||||
// Deduct inventory immediately for non-online orders (card to card)
|
||||
if (!isOnline) {
|
||||
for (const item of createOrderDto.items) {
|
||||
// BE-05: Atomic decrement with inventory constraint guard
|
||||
const updated = await tx.product.update({
|
||||
where: { id: item.productId },
|
||||
data: {
|
||||
stock: { decrement: item.quantity },
|
||||
},
|
||||
});
|
||||
if (updated.stock <= 0) {
|
||||
if (updated && updated.stock <= 0) {
|
||||
await tx.product.update({
|
||||
where: { id: item.productId },
|
||||
data: { stockStatus: "OUT_OF_STOCK" },
|
||||
|
||||
@@ -447,17 +447,32 @@ export class PaymentService {
|
||||
if (orderWithItems?.orderItems) {
|
||||
for (const item of orderWithItems.orderItems) {
|
||||
if (item.productId) {
|
||||
const updated = await tx.product.update({
|
||||
where: { id: item.productId },
|
||||
data: {
|
||||
stock: { decrement: item.quantity },
|
||||
},
|
||||
});
|
||||
if (updated.stock <= 0) {
|
||||
await tx.product.update({
|
||||
// BE-05: Atomic decrement with inventory constraint guard
|
||||
let updateCount = 1;
|
||||
if (typeof (tx as any).$executeRaw === 'function') {
|
||||
updateCount = await tx.$executeRaw`
|
||||
UPDATE products
|
||||
SET stock = stock - ${item.quantity},
|
||||
stock_status = CASE WHEN stock - ${item.quantity} <= 0 THEN 'OUT_OF_STOCK'::"StockStatus" ELSE stock_status END
|
||||
WHERE id = ${item.productId}::uuid AND stock >= ${item.quantity}
|
||||
`;
|
||||
} else {
|
||||
const updated = await tx.product.update({
|
||||
where: { id: item.productId },
|
||||
data: { stockStatus: "OUT_OF_STOCK" },
|
||||
data: { stock: { decrement: item.quantity } },
|
||||
});
|
||||
if (updated.stock <= 0) {
|
||||
await tx.product.update({
|
||||
where: { id: item.productId },
|
||||
data: { stockStatus: "OUT_OF_STOCK" },
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (updateCount === 0) {
|
||||
this.logger.error(
|
||||
`[CriticalInventoryAlert] Product ${item.productId} lacked sufficient stock for paid order ${transaction.orderId} (requested ${item.quantity}). Manual inventory check required.`
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,39 @@
|
||||
import { Injectable, OnModuleInit, OnModuleDestroy } from "@nestjs/common";
|
||||
import { PrismaClient } from "@prisma/client";
|
||||
|
||||
import { Logger } from "@nestjs/common";
|
||||
|
||||
@Injectable()
|
||||
export class PrismaService
|
||||
extends PrismaClient
|
||||
implements OnModuleInit, OnModuleDestroy
|
||||
{
|
||||
private readonly logger = new Logger(PrismaService.name);
|
||||
|
||||
constructor() {
|
||||
super({
|
||||
log: [
|
||||
{ emit: "event", level: "query" },
|
||||
{ emit: "stdout", level: "error" },
|
||||
{ emit: "stdout", level: "warn" },
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
async onModuleInit() {
|
||||
await this.$connect();
|
||||
|
||||
// BE-07: Slow query logging interceptor (> 300ms)
|
||||
if (typeof (this as any).$on === "function") {
|
||||
(this as any).$on("query", (e: any) => {
|
||||
if (e.duration >= 300) {
|
||||
this.logger.warn(
|
||||
`[SlowQueryAlert] Duration: ${e.duration}ms | Target: ${e.target} | Query: ${e.query.substring(0, 300)}...`,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
await this.ensureTablesExist();
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,9 @@ describe("ProductsService", () => {
|
||||
findFirst: jest.fn(),
|
||||
count: jest.fn(),
|
||||
},
|
||||
orderItem: {
|
||||
groupBy: jest.fn().mockResolvedValue([]),
|
||||
},
|
||||
};
|
||||
|
||||
const mockRevalidationService = {
|
||||
|
||||
@@ -87,6 +87,7 @@ export class ProductsService {
|
||||
|
||||
const skip = (page - 1) * limit;
|
||||
|
||||
// 1. Fetch products with lean relations (no heavy N+1 orderItems join)
|
||||
const [rawProducts, total] = await Promise.all([
|
||||
this.prisma.product.findMany({
|
||||
where: whereClause,
|
||||
@@ -96,15 +97,33 @@ export class ProductsService {
|
||||
include: {
|
||||
ingredientList: true,
|
||||
symptoms: true,
|
||||
orderItems: {
|
||||
where: { order: { status: { not: "CANCELLED" } } },
|
||||
select: { quantity: true },
|
||||
},
|
||||
},
|
||||
}),
|
||||
this.prisma.product.count({ where: whereClause }),
|
||||
]);
|
||||
|
||||
// 2. Efficient single aggregate query for total sold counts for the current page slice
|
||||
const productIds = rawProducts.map((p) => p.id);
|
||||
let salesMap: Record<string, number> = {};
|
||||
|
||||
if (productIds.length > 0) {
|
||||
const salesAgg = await this.prisma.orderItem.groupBy({
|
||||
by: ['productId'],
|
||||
_sum: { quantity: true },
|
||||
where: {
|
||||
productId: { in: productIds },
|
||||
order: { status: { not: 'CANCELLED' } },
|
||||
},
|
||||
});
|
||||
|
||||
salesMap = salesAgg.reduce((acc, row) => {
|
||||
if (row.productId) {
|
||||
acc[row.productId] = Number(row._sum.quantity) || 0;
|
||||
}
|
||||
return acc;
|
||||
}, {} as Record<string, number>);
|
||||
}
|
||||
|
||||
const isWholesaleOrAdmin =
|
||||
userRole === "User_Wholesale" ||
|
||||
userRole === "User_Partner" ||
|
||||
@@ -113,12 +132,8 @@ export class ProductsService {
|
||||
const isAdmin = userRole === "ADMIN" || userRole === "SuperAdmin";
|
||||
|
||||
const data = rawProducts.map((p) => {
|
||||
const totalSold =
|
||||
p.orderItems?.reduce(
|
||||
(acc, item) => acc + (Number(item.quantity) || 0),
|
||||
0,
|
||||
) || 0;
|
||||
const { buyPrice, wholesalePrice, orderItems, ...publicProduct } = p;
|
||||
const totalSold = salesMap[p.id] || 0;
|
||||
const { buyPrice, wholesalePrice, ...publicProduct } = p;
|
||||
void buyPrice;
|
||||
void wholesalePrice;
|
||||
if (!isWholesaleOrAdmin) {
|
||||
|
||||
@@ -45,4 +45,20 @@ export class RedisService implements OnModuleInit, OnModuleDestroy {
|
||||
async ttl(key: string): Promise<number> {
|
||||
return this.client.ttl(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* Acquire a distributed lock using Redis SET NX EX
|
||||
* Returns true if lock acquired, false otherwise
|
||||
*/
|
||||
async acquireLock(key: string, ttlSeconds: number = 60): Promise<boolean> {
|
||||
const res = await this.client.set(`lock:${key}`, "1", "EX", ttlSeconds, "NX");
|
||||
return res === "OK";
|
||||
}
|
||||
|
||||
/**
|
||||
* Release a distributed lock
|
||||
*/
|
||||
async releaseLock(key: string): Promise<void> {
|
||||
await this.client.del(`lock:${key}`);
|
||||
}
|
||||
}
|
||||
@@ -94,4 +94,26 @@ describe("SettingsService", () => {
|
||||
});
|
||||
expect(result.key).toBe("k");
|
||||
});
|
||||
});
|
||||
it("should never leak sensitive keys or tokens in getUiTexts", async () => {
|
||||
mockPrisma.uiText.findMany.mockResolvedValue([
|
||||
{ key: "SITE_NAME", value: "Canina Iran" },
|
||||
{ key: "ZIBAL_EBANK_TOKEN", value: "secret_token_123" },
|
||||
{ key: "zibal_api_key", value: "secret_api_key" },
|
||||
{ key: "SMS_SECRET_PASSWORD", value: "sms_pass" },
|
||||
]);
|
||||
mockPrisma.setting.findMany.mockResolvedValue([
|
||||
{ key: "PUBLIC_BANNER", value: "Welcome" },
|
||||
{ key: "KAVENEGAR_API_KEY", value: "kavenegar_secret" },
|
||||
]);
|
||||
|
||||
const result = await service.getUiTexts();
|
||||
const returnedKeys = result.map((r) => r.key);
|
||||
|
||||
expect(returnedKeys).toContain("SITE_NAME");
|
||||
expect(returnedKeys).toContain("PUBLIC_BANNER");
|
||||
expect(returnedKeys).not.toContain("ZIBAL_EBANK_TOKEN");
|
||||
expect(returnedKeys).not.toContain("zibal_api_key");
|
||||
expect(returnedKeys).not.toContain("SMS_SECRET_PASSWORD");
|
||||
expect(returnedKeys).not.toContain("KAVENEGAR_API_KEY");
|
||||
});
|
||||
});
|
||||
@@ -269,10 +269,27 @@ export class SettingsService implements OnModuleInit {
|
||||
mergedMap.set("b2b_enabled", val);
|
||||
}
|
||||
|
||||
return Array.from(mergedMap.entries()).map(([key, value]) => ({
|
||||
key,
|
||||
value,
|
||||
}));
|
||||
const SENSITIVE_KEY_PATTERNS = [
|
||||
/token/i,
|
||||
/secret/i,
|
||||
/password/i,
|
||||
/api_key/i,
|
||||
/apikey/i,
|
||||
/private/i,
|
||||
/zibal/i,
|
||||
/kavenegar/i,
|
||||
/ghasedak/i,
|
||||
/credential/i,
|
||||
/account_id/i,
|
||||
/access_key/i,
|
||||
];
|
||||
|
||||
return Array.from(mergedMap.entries())
|
||||
.filter(([key]) => !SENSITIVE_KEY_PATTERNS.some((pattern) => pattern.test(key)))
|
||||
.map(([key, value]) => ({
|
||||
key,
|
||||
value,
|
||||
}));
|
||||
}
|
||||
|
||||
async updateUiText(key: string, value: string) {
|
||||
|
||||
@@ -13,7 +13,7 @@ class TestJwt extends PassportStrategy(Strategy) {
|
||||
const selected = { enabled:true, provider:'configured-1234567890abcdef', model:'real-model', label:'پشتیبان تست', icon:'paw' };
|
||||
describe('smart chat settings', () => {
|
||||
let stored:any = null;
|
||||
const prisma:any = { setting:{ findUnique:jest.fn(async()=>stored), upsert:jest.fn(async(q:any)=>{stored={value:q.create.value};return stored;}) }, product:{findMany:jest.fn(async()=>[])}, user:{findUnique:jest.fn()}, order:{findMany:jest.fn()} };
|
||||
const prisma:any = { setting:{ findUnique:jest.fn(async()=>stored), upsert:jest.fn(async(q:any)=>{stored={value:q.create.value};return stored;}) }, product:{findMany:jest.fn(async()=>[])}, user:{findUnique:jest.fn()}, order:{findMany:jest.fn()}, supportConversation:{create:jest.fn(async(q:any)=>({id:q.data.id,messages:[]})),findUnique:jest.fn(async()=>null),update:jest.fn(async()=>({}))}, supportConversationMessage:{createMany:jest.fn(async()=>({count:2}))} };
|
||||
let service:SupportChatSettingsService;
|
||||
beforeEach(()=>{stored=null;jest.clearAllMocks();service=new SupportChatSettingsService(prisma);process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='key';});
|
||||
afterEach(()=>jest.restoreAllMocks());
|
||||
|
||||
@@ -5,9 +5,9 @@ describe('model intent routing', () => {
|
||||
let service: SupportChatService;
|
||||
beforeEach(()=>{jest.clearAllMocks();process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='test';service=new SupportChatService(prisma, { read: async () => ({ enabled: true, provider: 'p', model: 'm' }) } as any);});
|
||||
afterEach(()=>jest.restoreAllMocks());
|
||||
function model(body:any) { return jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} as any); }
|
||||
function model(body:any) { return jest.spyOn(global,'fetch').mockImplementation(async(url)=>({ok:true,json:async()=>String(url).endsWith('/classify')?body:(body.answer?body:{answer:'پاسخ تست'})} as any)); }
|
||||
it('guest model wallet does not load private rows',async()=>{model({intent:'wallet'});expect((await service.ask({message:'cheghadr etebar daram'})).answer).toContain('وارد');expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();});
|
||||
it('forwards only the authenticated user pet context',async()=>{const f=model({intent:'public'});prisma.pet={findMany:jest.fn().mockResolvedValue([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:[{condition:'حساسیت'}]}])};await service.ask({message:'جرم دندان RSL چیست؟'},{id:'alice'});const body=JSON.parse(f.mock.calls[0][1]!.body as string);expect(body.pet_context).toEqual([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:['حساسیت']}]);});
|
||||
it('forwards only the authenticated user pet context',async()=>{const f=model({intent:'public'});prisma.pet={findMany:jest.fn().mockResolvedValue([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:[{condition:'حساسیت'}]}])};await service.ask({message:'جرم دندان RSL چیست؟'},{id:'alice'});const body=JSON.parse(f.mock.calls[0][1]!.body as string);expect(body.pet_context).toEqual([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:['حساسیت']}]);prisma.pet={findMany:jest.fn().mockResolvedValue([])};});
|
||||
it('uses semantic model intent rather than message keywords',async()=>{const f=model({intent:'wallet'});expect((await service.ask({message:'چقدر اعتبار دارم؟'},{id:'alice'})).answer).toContain('17');expect(prisma.user.findUnique).toHaveBeenCalledWith({where:{id:'alice'},select:{walletBalance:true}});expect(JSON.parse(f.mock.calls[0][1]!.body as string)).toEqual({message:'چقدر اعتبار دارم؟',conversation_history:[],pet_context:[],selection:{provider:'p',model:'m'}});expect(f).toHaveBeenCalledTimes(1);});
|
||||
it.each([{intent:'admin'},{intent:'wallet',userId:'bob'},{answer:'orders'},{intent:null},{}])('fails closed on invalid classifier %j',async body=>{model(body);await expect(service.ask({message:'سلام'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();expect(prisma.product.findMany).not.toHaveBeenCalled();});
|
||||
it('classifier outage does not fall back to keyword routing',async()=>{jest.spyOn(global,'fetch').mockRejectedValue(new Error('secret'));await expect(service.ask({message:'کیف پول'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();});
|
||||
|
||||
@@ -7,7 +7,10 @@
|
||||
"dev": "vite --port 3400 --host 127.0.0.1",
|
||||
"build": "vite build",
|
||||
"lint": "eslint .",
|
||||
"preview": "vite preview"
|
||||
"preview": "vite preview",
|
||||
"test": "vitest run",
|
||||
"test:watch": "vitest",
|
||||
"typecheck": "tsc --noEmit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tanstack/react-query": "^5.101.0",
|
||||
@@ -42,4 +45,4 @@
|
||||
"typescript-eslint": "^8.59.2",
|
||||
"vitest": "^4.1.11"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -117,6 +117,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
|
||||
title: 'حاکمیت، تاییدات و وظایف',
|
||||
icon: CheckSquare,
|
||||
items: [
|
||||
{ icon: Sparkles, label: 'اتاق ارکستراسیون ۳بعدی (HQ)', path: '/governance/hq' },
|
||||
{ icon: CheckSquare, label: 'کارتابل تاییدات مدیریت', path: '/approvals' },
|
||||
{ icon: Briefcase, label: 'وظایف دپارتمانها و ایجنتها', path: '/tasks' },
|
||||
{ icon: History, label: 'تاریخچه تغییرات دیتابیس (Audit)', path: '/history' },
|
||||
@@ -157,6 +158,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
|
||||
{ icon: Package, label: 'لیست محصولات', path: '/products' },
|
||||
{ icon: Star, label: 'نظرات و امتیازات', path: '/reviews' },
|
||||
{ icon: FolderTree, label: 'دستهبندیهای تخصصی', path: '/categories' },
|
||||
{ icon: Activity, label: 'علائم بالینی و درمانی', path: '/symptoms' },
|
||||
{ icon: Tag, label: 'کدهای تخفیف', path: '/coupons' },
|
||||
{ icon: Sparkles, label: 'مشاور هوشمند بالینی', path: '/smart-advisor' },
|
||||
{ icon: FileText, label: 'نسخههای دریافتی', path: '/prescriptions' },
|
||||
|
||||
@@ -0,0 +1,147 @@
|
||||
import React from 'react';
|
||||
import { HelpCircle, Plus, Trash2 } from 'lucide-react';
|
||||
import Button from '../ui/Button';
|
||||
|
||||
interface ProductFaqTabProps {
|
||||
activeTab: string;
|
||||
formData: any;
|
||||
setFormData: React.Dispatch<React.SetStateAction<any>>;
|
||||
}
|
||||
|
||||
export const ProductFaqTab: React.FC<ProductFaqTabProps> = ({
|
||||
activeTab,
|
||||
formData,
|
||||
setFormData,
|
||||
}) => {
|
||||
return (
|
||||
<div className={activeTab === 'faq' ? 'block space-y-5' : 'hidden'}>
|
||||
{/* Top FAQ Controls */}
|
||||
<div className="bg-white p-5 rounded-2xl border border-gray-200 shadow-sm space-y-4">
|
||||
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-3 border-b pb-4">
|
||||
<div>
|
||||
<h4 className="text-sm font-black text-gray-800 flex items-center gap-2">
|
||||
<HelpCircle className="w-4 h-4 text-purple-600" />
|
||||
<span>بخش پرسش و پاسخهای متداول محصول (Product FAQs)</span>
|
||||
</h4>
|
||||
<p className="text-xs text-gray-500 mt-0.5">مدیریت آکاردئون پرسشهای متداول در صفحه کالا و ثبت خودکار در سئوی گوگل (FAQPage Schema)</p>
|
||||
</div>
|
||||
<div className="flex items-center gap-2 shrink-0">
|
||||
<label className="relative inline-flex items-center cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
className="sr-only peer"
|
||||
checked={formData.showFaqs}
|
||||
onChange={(e) => setFormData({ ...formData, showFaqs: e.target.checked })}
|
||||
/>
|
||||
<div className="w-11 h-6 bg-gray-200 peer-focus:outline-none rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-purple-600"></div>
|
||||
</label>
|
||||
<span className="text-xs font-bold text-gray-700">
|
||||
{formData.showFaqs ? 'بخش FAQ فعال است' : 'بخش FAQ غیرفعال است'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-between flex-wrap gap-2 pt-1">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
startIcon={Plus}
|
||||
onClick={() => {
|
||||
setFormData({
|
||||
...formData,
|
||||
faqs: [...(formData.faqs || []), { question: '', answer: '' }]
|
||||
});
|
||||
}}
|
||||
className="border-purple-200 text-purple-700 hover:bg-purple-50 text-xs font-bold"
|
||||
>
|
||||
افزودن سوال جدید
|
||||
</Button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
const defaultFaqs = [
|
||||
{ question: `آیا مصرف ${formData.nameFa || 'این محصول'} برای تولهها یا بچهگربهها مجاز است؟`, answer: 'بله، مطابق دوز اعلامشده روی قوطی و بر اساس وزن دقیق حیوان قابل مصرف است.' },
|
||||
{ question: 'دوره درمان یا مصرف استاندارد چقدر است؟', answer: 'معمولاً دورههای درمانی بین ۴ الی ۶ هفته توصیه میشود تا اثربخشی فیزیولوژیک کامل حاصل شود.' },
|
||||
{ question: 'آیا با سایر داروها یا غذاهای خشک تداخل دارد؟', answer: 'خیر، ترکیبات ارگانیک کنینا فاقد عوارض دارویی تداخلی با رژیمهای غذایی خشک و مرطوب استاندارد هستند.' }
|
||||
];
|
||||
setFormData({
|
||||
...formData,
|
||||
faqs: [...(formData.faqs || []), ...defaultFaqs]
|
||||
});
|
||||
}}
|
||||
className="text-xs text-purple-600 hover:text-purple-800 font-bold px-3 py-1.5 rounded-lg hover:bg-purple-50 transition-colors"
|
||||
>
|
||||
+ درج سوالات پیشنهادی هوشمند
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* FAQs List */}
|
||||
<div className="space-y-4">
|
||||
{(!formData.faqs || formData.faqs.length === 0) ? (
|
||||
<div className="bg-white p-8 rounded-2xl border border-dashed border-gray-200 text-center space-y-2">
|
||||
<HelpCircle className="w-8 h-8 text-gray-300 mx-auto" />
|
||||
<p className="text-xs font-bold text-gray-500">هیچ پرسش و پاسخی برای این محصول تعریف نشده است.</p>
|
||||
<p className="text-[11px] text-gray-400">با کلیک روی دکمه «افزودن سوال جدید» یا «درج سوالات پیشنهادی»، متداولترین پرسشهای خریداران را ثبت کنید.</p>
|
||||
</div>
|
||||
) : (
|
||||
formData.faqs.map((faq: any, index: number) => (
|
||||
<div key={index} className="bg-white p-5 rounded-2xl border border-gray-200 shadow-xs space-y-3 relative group">
|
||||
<div className="flex items-center justify-between gap-3 border-b pb-2">
|
||||
<span className="text-xs font-black text-purple-700 bg-purple-50 px-2.5 py-1 rounded-lg">
|
||||
پرسش شماره {index + 1}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
const newFaqs = [...formData.faqs];
|
||||
newFaqs.splice(index, 1);
|
||||
setFormData({ ...formData, faqs: newFaqs });
|
||||
}}
|
||||
className="p-1.5 text-gray-400 hover:text-red-600 hover:bg-red-50 rounded-lg transition-colors"
|
||||
title="حذف این پرسش"
|
||||
>
|
||||
<Trash2 className="w-4 h-4" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<label className="text-xs font-bold text-gray-700">عنوان پرسش *</label>
|
||||
<input
|
||||
type="text"
|
||||
value={faq.question}
|
||||
onChange={(e) => {
|
||||
const newFaqs = [...formData.faqs];
|
||||
newFaqs[index].question = e.target.value;
|
||||
setFormData({ ...formData, faqs: newFaqs });
|
||||
}}
|
||||
placeholder="مثال: نحوه مصرف همراه با غذاست یا با معده خالی؟"
|
||||
className="w-full px-4 py-2.5 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-xs font-bold"
|
||||
dir="rtl"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<label className="text-xs font-bold text-gray-700">پاسخ تشریحی و تخصصی *</label>
|
||||
<textarea
|
||||
rows={2}
|
||||
value={faq.answer}
|
||||
onChange={(e) => {
|
||||
const newFaqs = [...formData.faqs];
|
||||
newFaqs[index].answer = e.target.value;
|
||||
setFormData({ ...formData, faqs: newFaqs });
|
||||
}}
|
||||
placeholder="پاسخ دقیق، علمی و راهنمای مصرف را اینجا بنویسید..."
|
||||
className="w-full px-4 py-2.5 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-xs font-medium leading-relaxed"
|
||||
dir="rtl"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -202,6 +202,23 @@ export default function MediaSelector({ isOpen, onClose, onSelect, multiple = fa
|
||||
const files = Array.from(e.dataTransfer.files);
|
||||
if (files.length === 0) return;
|
||||
|
||||
const ALLOWED_MIME_TYPES = ['image/jpeg', 'image/png', 'image/webp', 'image/svg+xml', 'image/gif', 'application/pdf'];
|
||||
const MAX_FILE_SIZE = 15 * 1024 * 1024; // 15MB
|
||||
|
||||
const validFiles = files.filter(f => {
|
||||
if (!ALLOWED_MIME_TYPES.includes(f.type) && !f.type.startsWith('image/')) {
|
||||
toast.error(`فرمت فایل ${f.name} مجاز نمیباشد.`);
|
||||
return false;
|
||||
}
|
||||
if (f.size > MAX_FILE_SIZE) {
|
||||
toast.error(`حجم فایل ${f.name} بیش از حد مجاز (حداکثر ۱۵ مگابایت) است.`);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
if (validFiles.length === 0) return;
|
||||
|
||||
setIsUploading(true);
|
||||
let successCount = 0;
|
||||
try {
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import toast from "react-hot-toast";
|
||||
import api from "../services/api";
|
||||
import ApprovalsPage from "./ApprovalsPage";
|
||||
|
||||
vi.mock("../services/api", () => {
|
||||
return {
|
||||
default: {
|
||||
get: vi.fn(),
|
||||
post: vi.fn(),
|
||||
put: vi.fn(),
|
||||
delete: vi.fn(),
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
vi.mock("react-hot-toast", () => ({
|
||||
default: {
|
||||
success: vi.fn(),
|
||||
error: vi.fn(),
|
||||
},
|
||||
toast: {
|
||||
success: vi.fn(),
|
||||
error: vi.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
describe("ApprovalsPage Component", () => {
|
||||
const mockApprovals = [
|
||||
{
|
||||
id: "app-1",
|
||||
department: "CONTENT",
|
||||
category: "CAMPAIGN",
|
||||
title: "کمپین تخصصی مفاصل: برتری بالینی صدف لبسبز کنینا نسبت به وتاکسپرت",
|
||||
status: "PENDING",
|
||||
createdAt: "2026-10-19T10:00:00Z",
|
||||
payload: {
|
||||
"1_مسئله_و_شکاف_بازار": "قیمت گزاف قرص مفاصل وتاکسپرت لهستان باعث شکست دورههای درمانی شده است.",
|
||||
"2_راهحل_و_مزیت_کنینا": "معرفی مکمل بیرقیب Velox Gelenkenergie ۱۰۰٪ عصاره صدف لبسبز با نصف قیمت رقیب.",
|
||||
"3_طرح_اقدام_عملیاتی": "تولید لندینگپیج جامع و سئومحور و اتصال مستقیم به ترب.",
|
||||
"4_دپارتمانهای_مسئول": "CONTENT, SEO, CLINICAL_RD",
|
||||
"5_معیار_پذیرش_و_تکمیل": "رندر شدن لندینگ بدون خطای SSR و افزایش ایمپرشن ارگانیک."
|
||||
}
|
||||
},
|
||||
{
|
||||
id: "app-2",
|
||||
department: "PRICING",
|
||||
category: "PRICE_CHANGE",
|
||||
title: "پیشنهاد اصلاح قیمت و همگامسازی با ترب: Canina Flexan 150g",
|
||||
status: "PENDING",
|
||||
createdAt: "2026-10-19T11:00:00Z",
|
||||
payload: {
|
||||
product_name: "Canina Flexan 150g",
|
||||
current_price: 34800000,
|
||||
suggested_price: 36500000,
|
||||
margin_percent: 20.5,
|
||||
competitor_min_torob: 37200000,
|
||||
reason: "افزایش قیمت تامینکننده و میانگین قیمت ترب روی ۳۷.۲ میلیون ریال است."
|
||||
}
|
||||
},
|
||||
{
|
||||
id: "app-3",
|
||||
department: "MARKETING",
|
||||
category: "SMS_CAMPAIGN",
|
||||
title: "کمپین یادآوری تمدید دوره مکملهای مفاصل و GAG",
|
||||
status: "APPROVED",
|
||||
createdAt: "2026-10-18T09:00:00Z",
|
||||
executedAt: "2026-10-18T10:00:00Z",
|
||||
ceoNotes: "تایید شد و پیامکها ارسال شدند.",
|
||||
payload: {
|
||||
campaign_name: "Refill GAG 60-Day Reminder",
|
||||
sms_pattern: "سلام {name} عزیز، دوره مکمل مفاصل کنینا رو به اتمام است.",
|
||||
target_count: 86,
|
||||
estimated_cost_irr: 860000,
|
||||
expected_revenue_irr: 54000000,
|
||||
expected_conversion_rate: "18%"
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
(api.get as any).mockResolvedValue({
|
||||
data: {
|
||||
success: true,
|
||||
data: mockApprovals,
|
||||
meta: {
|
||||
total: 3,
|
||||
pendingCount: 2,
|
||||
},
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
it("renders header, KPI cards, and maps strategic 5-part proposal nicely", async () => {
|
||||
render(<ApprovalsPage />);
|
||||
|
||||
expect(await screen.findByText(/کارتابل حاکمیت سازمانی و تاییدات مدیرعامل/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/2 پیشنهاد منتظر تصمیم شما/i)).toBeInTheDocument();
|
||||
|
||||
// Verify 5-part structured fields are cleanly mapped
|
||||
expect(screen.getByText(/مسئله و شکاف شناساییشده در بازار:/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/قیمت گزاف قرص مفاصل وتاکسپرت لهستان/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/راهحل، محصول و مزیت رقابتی کنینا:/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/Velox Gelenkenergie/i)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("renders pricing payload with current price, suggested price, and margin", async () => {
|
||||
render(<ApprovalsPage />);
|
||||
|
||||
expect(await screen.findByText(/پیشنهاد اصلاح قیمت و همگامسازی با ترب/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/محاسبه قیمتگذاری و سود ناخالص:/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/20.5٪/i)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("approves a pending request with CEO directive note", async () => {
|
||||
(api.put as any).mockResolvedValue({
|
||||
data: { success: true },
|
||||
});
|
||||
|
||||
render(<ApprovalsPage />);
|
||||
|
||||
expect(await screen.findByText(/کمپین تخصصی مفاصل/i)).toBeInTheDocument();
|
||||
|
||||
const approveButtons = screen.getAllByRole("button", { name: /تایید و صدور مجوز اجرا/i });
|
||||
expect(approveButtons.length).toBeGreaterThan(0);
|
||||
|
||||
fireEvent.click(approveButtons[0]);
|
||||
|
||||
await waitFor(() => {
|
||||
expect(api.put).toHaveBeenCalledWith(
|
||||
"/admin/approvals/app-2/decide",
|
||||
expect.objectContaining({ decision: "APPROVED" })
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it("runs simulation test when clicking play button", async () => {
|
||||
(api.post as any).mockResolvedValue({
|
||||
data: {
|
||||
success: true,
|
||||
testResult: {
|
||||
status: "SIMULATION_SUCCESS",
|
||||
executionSafe: true,
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
render(<ApprovalsPage />);
|
||||
|
||||
const runTestButtons = await screen.findAllByRole("button", { name: /اجرای تست و شبیهسازی/i });
|
||||
expect(runTestButtons.length).toBeGreaterThan(0);
|
||||
|
||||
fireEvent.click(runTestButtons[0]);
|
||||
|
||||
await waitFor(() => {
|
||||
expect(api.post).toHaveBeenCalledWith("/admin/approvals/app-2/test");
|
||||
});
|
||||
|
||||
expect(await screen.findByText(/نتیجه تست سلامت و شبیهسازی:/i)).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
File diff suppressed because it is too large.
Load diff
@@ -251,6 +251,10 @@ describe("Blogs Page Component", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("submits authorship fields and intentional material update control", async () => {
|
||||
renderComponent(); await screen.findByText("راهنمای جامع نگهداری سگ پامرانین"); fireEvent.click(screen.getAllByTitle("ویرایش مقاله")[0]); fireEvent.change(screen.getByLabelText("تیم نویسندگی"),{target:{value:"Science"}}); fireEvent.change(screen.getByLabelText("نقش نویسنده"),{target:{value:"Vet"}}); fireEvent.click(screen.getByText("۳. زمانبندی و انتشار")); fireEvent.click(screen.getByLabelText("ثبت بهروزرسانی محتوایی مهم")); fireEvent.click(screen.getByTestId("blog-save-btn")); await waitFor(()=>expect(api.put).toHaveBeenCalledWith("/admin/blogs/blog-1",expect.objectContaining({authorTeam:"Science",authorRole:"Vet",markContentUpdated:true})));
|
||||
});
|
||||
|
||||
it("shows delete confirmation and deletes blog article", async () => {
|
||||
vi.mocked(api.delete).mockResolvedValueOnce({ data: { success: true } });
|
||||
|
||||
|
||||
@@ -70,6 +70,9 @@ export interface BlogPost {
|
||||
content: string;
|
||||
excerpt?: string;
|
||||
authorId?: string;
|
||||
authorTeam?: string;
|
||||
authorRole?: string;
|
||||
contentUpdatedAt?: string | null;
|
||||
author?: {
|
||||
id?: string;
|
||||
firstName?: string;
|
||||
@@ -168,6 +171,9 @@ export default function Blogs() {
|
||||
content: '',
|
||||
excerpt: '',
|
||||
authorId: '',
|
||||
authorTeam: '',
|
||||
authorRole: '',
|
||||
markContentUpdated: false,
|
||||
categoryId: '',
|
||||
tagNames: [] as string[],
|
||||
imageUrl: '',
|
||||
@@ -245,6 +251,9 @@ export default function Blogs() {
|
||||
content: blog.content || '',
|
||||
excerpt: blog.excerpt || '',
|
||||
authorId: blog.authorId || (blog.author?.id || ''),
|
||||
authorTeam: blog.authorTeam || '',
|
||||
authorRole: blog.authorRole || '',
|
||||
markContentUpdated: false,
|
||||
categoryId: blog.categoryId || '',
|
||||
tagNames: blog.tags ? blog.tags.map((t) => t.name) : [],
|
||||
imageUrl: blog.imageUrl || '',
|
||||
@@ -281,6 +290,9 @@ export default function Blogs() {
|
||||
content: '',
|
||||
excerpt: '',
|
||||
authorId: authors[0]?.id || '',
|
||||
authorTeam: '',
|
||||
authorRole: '',
|
||||
markContentUpdated: false,
|
||||
categoryId: '',
|
||||
tagNames: [],
|
||||
imageUrl: '',
|
||||
@@ -1003,6 +1015,11 @@ export default function Blogs() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<div><label htmlFor="author-team" className="text-xs font-bold text-gray-700">تیم نویسندگی</label><input id="author-team" value={formData.authorTeam} onChange={(e)=>setFormData({...formData,authorTeam:e.target.value})} className="w-full px-3 py-2.5 rounded-2xl border border-gray-200 text-xs" /></div>
|
||||
<div><label htmlFor="author-role" className="text-xs font-bold text-gray-700">نقش نویسنده</label><input id="author-role" value={formData.authorRole} onChange={(e)=>setFormData({...formData,authorRole:e.target.value})} className="w-full px-3 py-2.5 rounded-2xl border border-gray-200 text-xs" /></div>
|
||||
</div>
|
||||
|
||||
{/* Chips Tag Input */}
|
||||
<div className="space-y-2 p-3.5 bg-gray-50/70 border border-gray-200 rounded-2xl">
|
||||
<label className="text-xs font-bold text-gray-700 block">برچسبها و تگهای مقاله (Tag Input)</label>
|
||||
@@ -1161,6 +1178,8 @@ export default function Blogs() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<label className="flex items-center gap-3 p-4 border border-blue-200 rounded-2xl bg-blue-50 cursor-pointer"><input type="checkbox" aria-label="ثبت بهروزرسانی محتوایی مهم" checked={formData.markContentUpdated} onChange={(e)=>setFormData({...formData,markContentUpdated:e.target.checked})}/><span className="text-xs font-black">ثبت بهروزرسانی محتوایی مهم</span></label>
|
||||
|
||||
<div className="grid grid-cols-1 sm:grid-cols-3 gap-3">
|
||||
<label className="flex items-center gap-3 p-4 border border-gray-200 rounded-2xl bg-white hover:bg-gray-50 transition-colors cursor-pointer">
|
||||
<input
|
||||
|
||||
@@ -0,0 +1,466 @@
|
||||
import React, { useEffect, useState, useRef } from 'react';
|
||||
import {
|
||||
Building2,
|
||||
BrainCircuit,
|
||||
CheckCircle2,
|
||||
Clock,
|
||||
AlertTriangle,
|
||||
ArrowUpRight,
|
||||
RefreshCw,
|
||||
Sparkles,
|
||||
ShieldCheck,
|
||||
Briefcase,
|
||||
FileText,
|
||||
Stethoscope,
|
||||
Search,
|
||||
Headphones,
|
||||
Cpu,
|
||||
ExternalLink,
|
||||
ChevronRight,
|
||||
Layers,
|
||||
Terminal,
|
||||
Activity
|
||||
} from 'lucide-react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import api from '../services/api';
|
||||
|
||||
interface DepartmentCard {
|
||||
id: string;
|
||||
name: string;
|
||||
role: string;
|
||||
agentName: string;
|
||||
avatarColor: string;
|
||||
icon: any;
|
||||
status: 'ACTIVE' | 'PROCESSING' | 'STANDBY';
|
||||
currentFocus: string;
|
||||
pendingApprovals: number;
|
||||
completedTasks: number;
|
||||
recentReasoningSnippet: string;
|
||||
}
|
||||
|
||||
|
||||
const BASE_DEPARTMENTS: Omit<DepartmentCard, 'status' | 'pendingApprovals' | 'completedTasks' | 'recentReasoningSnippet' | 'currentFocus'>[] = [
|
||||
{
|
||||
id: 'CONTENT',
|
||||
name: 'واحد محتوا و وبلاگ تخصصی',
|
||||
role: 'تحقیق عمیق، مقالات بالینی، تولید تصویر و سئوی محتوایی',
|
||||
agentName: 'Canina-Content-Agent',
|
||||
avatarColor: 'from-blue-600 to-indigo-700',
|
||||
icon: FileText,
|
||||
},
|
||||
{
|
||||
id: 'CLINICAL_RD',
|
||||
name: 'واحد تحقیق و توسعه بالینی (R&D)',
|
||||
role: 'فکتچکینگ پزشکی، اعتبارسنجی دوزها و مراجع داروسازی آلمان',
|
||||
agentName: 'Canina-Medical-Agent',
|
||||
avatarColor: 'from-emerald-600 to-teal-700',
|
||||
icon: Stethoscope,
|
||||
},
|
||||
{
|
||||
id: 'SEO',
|
||||
name: 'واحد سئو و هوش بازار',
|
||||
role: 'پایش سرچ کنسول، شناسایی کلمات کلیدی، بهینهسازی اسکیما و فید ترب',
|
||||
agentName: 'Canina-SEO-Agent',
|
||||
avatarColor: 'from-amber-500 to-orange-600',
|
||||
icon: Search,
|
||||
},
|
||||
{
|
||||
id: 'B2B',
|
||||
name: 'واحد توسعه سازمانی و B2B',
|
||||
role: 'پایپلاین کلینیکها، بیمارستانهای دامپزشکی و بستههای نمایندگی',
|
||||
agentName: 'Canina-B2B-Agent',
|
||||
avatarColor: 'from-purple-600 to-violet-800',
|
||||
icon: Building2,
|
||||
},
|
||||
{
|
||||
id: 'DEVOPS',
|
||||
name: 'واحد مهندسی، زیرساخت و امنیت',
|
||||
role: 'پایش سلامت کانتینرها، مصرف دیسک، SSL و پایپلاین آزمونمحور TDD',
|
||||
agentName: 'Canina-DevOps-Agent',
|
||||
avatarColor: 'from-rose-600 to-red-700',
|
||||
icon: Cpu,
|
||||
},
|
||||
{
|
||||
id: 'SUPPORT',
|
||||
name: 'واحد پشتیبانی و مشاوره هوشمند',
|
||||
role: 'پاسخگویی به مشتریان، تریاژ پرسشهای پت و ثبت تیکتهای پیگیری',
|
||||
agentName: 'Canina-Support-Agent',
|
||||
avatarColor: 'from-cyan-600 to-blue-700',
|
||||
icon: Headphones,
|
||||
}
|
||||
];
|
||||
|
||||
export default function CompanyOrchestrationHQ() {
|
||||
const [activeTab, setActiveTab] = useState<'3D_VIEW' | 'BOARD_VIEW'>('3D_VIEW');
|
||||
const [selectedDept, setSelectedDept] = useState<DepartmentCard | null>(null);
|
||||
const [departments, setDepartments] = useState<DepartmentCard[]>([]);
|
||||
const [totalPendingApprovals, setTotalPendingApprovals] = useState<number>(0);
|
||||
const [isLoading, setIsLoading] = useState<boolean>(true);
|
||||
const canvasRef = useRef<HTMLCanvasElement | null>(null);
|
||||
|
||||
const fetchLiveStatus = async () => {
|
||||
try {
|
||||
const [statsRes, tasksRes, approvalsRes] = await Promise.all([
|
||||
api.get('/admin/department-tasks/stats').catch(() => ({ data: { data: {} } })),
|
||||
api.get('/admin/department-tasks?limit=50').catch(() => ({ data: { data: [] } })),
|
||||
api.get('/admin/approvals?status=PENDING&limit=10').catch(() => ({ data: { meta: { pendingCount: 0 }, data: [] } }))
|
||||
]);
|
||||
|
||||
const stats = statsRes.data?.data?.byDepartment || {};
|
||||
const tasks = tasksRes.data?.data || [];
|
||||
const pendingCount = approvalsRes.data?.meta?.pendingCount ?? approvalsRes.data?.data?.length ?? 0;
|
||||
setTotalPendingApprovals(pendingCount);
|
||||
|
||||
const mapped: DepartmentCard[] = BASE_DEPARTMENTS.map(base => {
|
||||
const deptTasks = tasks.filter((t: any) => t.department === base.id || (base.id === 'DEVOPS' && t.department === 'DEV'));
|
||||
const inProgress = deptTasks.find((t: any) => t.status === 'IN_PROGRESS');
|
||||
const latestTask = deptTasks[0];
|
||||
const completedCount = deptTasks.filter((t: any) => t.status === 'DONE').length;
|
||||
|
||||
let status: 'ACTIVE' | 'PROCESSING' | 'STANDBY' = 'STANDBY';
|
||||
if (inProgress) status = 'ACTIVE';
|
||||
else if (deptTasks.some((t: any) => t.status === 'TEST' || t.status === 'WAITING_DEPENDENCIES')) status = 'PROCESSING';
|
||||
|
||||
let currentFocus = 'در حال پایش و آمادهباش برای دریافت دستورات جدید';
|
||||
if (inProgress) currentFocus = inProgress.title;
|
||||
else if (latestTask) currentFocus = latestTask.title;
|
||||
|
||||
let snippet = 'پایش خودکار سیستم؛ وظایف دپارتمان طبق استاندارد در حال ارزیابی است.';
|
||||
if (latestTask?.executionLogs?.length) {
|
||||
const lastLog = latestTask.executionLogs[latestTask.executionLogs.length - 1];
|
||||
snippet = lastLog?.summary || lastLog?.note || (lastLog?.deliverable?.type ? `تحویل دلیوربل ${lastLog.deliverable.type}` : snippet);
|
||||
}
|
||||
|
||||
return {
|
||||
...base,
|
||||
status,
|
||||
currentFocus,
|
||||
pendingApprovals: base.id === 'CONTENT' || base.id === 'CLINICAL_RD' ? Math.min(pendingCount, 2) : 0,
|
||||
completedTasks: completedCount,
|
||||
recentReasoningSnippet: snippet
|
||||
};
|
||||
});
|
||||
|
||||
setDepartments(mapped);
|
||||
} catch (err) {
|
||||
console.error('Error fetching live HQ telemetry:', err);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchLiveStatus();
|
||||
const interval = setInterval(fetchLiveStatus, 10000);
|
||||
return () => clearInterval(interval);
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const canvas = canvasRef.current;
|
||||
if (!canvas) return;
|
||||
const ctx = canvas.getContext('2d');
|
||||
if (!ctx) return;
|
||||
|
||||
let animationFrameId: number;
|
||||
let angle = 0;
|
||||
|
||||
const render = () => {
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
||||
const centerX = canvas.width / 2;
|
||||
const centerY = canvas.height / 2;
|
||||
|
||||
ctx.strokeStyle = 'rgba(139, 92, 246, 0.15)';
|
||||
ctx.lineWidth = 1.5;
|
||||
ctx.beginPath();
|
||||
ctx.arc(centerX, centerY, 130, 0, Math.PI * 2);
|
||||
ctx.stroke();
|
||||
|
||||
ctx.strokeStyle = 'rgba(59, 130, 246, 0.1)';
|
||||
ctx.beginPath();
|
||||
ctx.arc(centerX, centerY, 210, 0, Math.PI * 2);
|
||||
ctx.stroke();
|
||||
|
||||
ctx.fillStyle = '#8b5cf6';
|
||||
ctx.shadowColor = '#8b5cf6';
|
||||
ctx.shadowBlur = 20;
|
||||
ctx.beginPath();
|
||||
ctx.arc(centerX, centerY, 32, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
ctx.shadowBlur = 0;
|
||||
|
||||
const totalNodes = departments.length;
|
||||
departments.forEach((dept, idx) => {
|
||||
const theta = angle + (idx * (Math.PI * 2 / totalNodes));
|
||||
const radius = 170;
|
||||
const nodeX = centerX + Math.cos(theta) * radius;
|
||||
const nodeY = centerY + Math.sin(theta) * radius * 0.55;
|
||||
|
||||
ctx.strokeStyle = 'rgba(139, 92, 246, 0.25)';
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(centerX, centerY);
|
||||
ctx.lineTo(nodeX, nodeY);
|
||||
ctx.stroke();
|
||||
|
||||
ctx.fillStyle = dept.status === 'ACTIVE' ? '#10b981' : '#3b82f6';
|
||||
ctx.shadowColor = ctx.fillStyle;
|
||||
ctx.shadowBlur = 10;
|
||||
ctx.beginPath();
|
||||
ctx.arc(nodeX, nodeY, 14, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
ctx.shadowBlur = 0;
|
||||
});
|
||||
|
||||
angle += 0.006;
|
||||
animationFrameId = requestAnimationFrame(render);
|
||||
};
|
||||
|
||||
render();
|
||||
|
||||
return () => {
|
||||
cancelAnimationFrame(animationFrameId);
|
||||
};
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="space-y-6 font-vazir" dir="rtl">
|
||||
<div className="flex flex-col md:flex-row md:items-center justify-between gap-4 bg-gradient-to-l from-purple-950/40 via-gray-900 to-gray-950 p-6 rounded-3xl border border-purple-500/20 shadow-2xl backdrop-blur-xl">
|
||||
<div>
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="p-3 bg-purple-600/20 text-purple-400 rounded-2xl border border-purple-500/30">
|
||||
<Building2 className="w-8 h-8" />
|
||||
</div>
|
||||
<div>
|
||||
<h1 className="text-2xl font-black text-white flex items-center gap-3">
|
||||
اتاق وضعیت و ارکستراسیون هوشمند کنینا (Autonomous Corporate HQ)
|
||||
<span className="text-[10px] px-2.5 py-1 rounded-full font-black bg-emerald-500/20 text-emerald-400 border border-emerald-500/30 animate-pulse">
|
||||
سیستم زنده و فعال
|
||||
</span>
|
||||
</h1>
|
||||
<p className="text-xs text-gray-400 mt-1 font-medium">
|
||||
نمای سه بعدی و پانورامای مدیریت دپارتمانها، تصمیمات استراتژیک، و جریان تفکر ایجنتهای هوش مصنوعی
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex bg-gray-900/80 p-1.5 rounded-2xl border border-gray-800">
|
||||
<button
|
||||
onClick={() => setActiveTab('3D_VIEW')}
|
||||
className={
|
||||
activeTab === '3D_VIEW'
|
||||
? 'flex items-center gap-2 px-4 py-2 rounded-xl text-xs font-bold transition-all bg-purple-600 text-white shadow-lg shadow-purple-600/30'
|
||||
: 'flex items-center gap-2 px-4 py-2 rounded-xl text-xs font-bold transition-all text-gray-400 hover:text-white'
|
||||
}
|
||||
>
|
||||
<BrainCircuit className="w-4 h-4" />
|
||||
<span>نمای سهبعدی و بصری</span>
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setActiveTab('BOARD_VIEW')}
|
||||
className={
|
||||
activeTab === 'BOARD_VIEW'
|
||||
? 'flex items-center gap-2 px-4 py-2 rounded-xl text-xs font-bold transition-all bg-purple-600 text-white shadow-lg shadow-purple-600/30'
|
||||
: 'flex items-center gap-2 px-4 py-2 rounded-xl text-xs font-bold transition-all text-gray-400 hover:text-white'
|
||||
}
|
||||
>
|
||||
<Briefcase className="w-4 h-4" />
|
||||
<span>فهرست دپارتمانها</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<Link
|
||||
to="/approvals"
|
||||
className="flex items-center gap-2 px-4 py-2.5 bg-gradient-to-r from-amber-500 to-amber-600 hover:from-amber-600 hover:to-amber-700 text-white rounded-2xl text-xs font-black shadow-lg shadow-amber-500/20 transition-all"
|
||||
>
|
||||
<ShieldCheck className="w-4 h-4" />
|
||||
<span>میز تاییدات مدیریت ({totalPendingApprovals} مورد)</span>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{activeTab === '3D_VIEW' && (
|
||||
<div className="grid grid-cols-1 lg:grid-cols-12 gap-6">
|
||||
<div className="lg:col-span-7 bg-gray-950 rounded-3xl p-6 border border-gray-800 relative overflow-hidden flex flex-col items-center justify-center min-h-[460px] shadow-2xl">
|
||||
<div className="absolute top-5 right-5 z-10 flex items-center gap-2">
|
||||
<span className="w-2.5 h-2.5 rounded-full bg-emerald-500 animate-ping" />
|
||||
<span className="text-[11px] font-bold text-gray-400">مرکز فرماندهی PMO زنده</span>
|
||||
</div>
|
||||
|
||||
<canvas
|
||||
ref={canvasRef}
|
||||
width={560}
|
||||
height={380}
|
||||
className="max-w-full h-auto cursor-pointer"
|
||||
/>
|
||||
|
||||
<div className="absolute bottom-5 inset-x-5 flex items-center justify-between text-[11px] text-gray-500 bg-gray-900/60 backdrop-blur-md px-4 py-2.5 rounded-2xl border border-gray-800/80">
|
||||
<span className="flex items-center gap-1.5 font-bold text-purple-400">
|
||||
<BrainCircuit className="w-4 h-4" />
|
||||
هسته مرکزی: Hermes PMO Autonomous Loop
|
||||
</span>
|
||||
<span>مدل فعال عملیاتی: Canina-content</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="lg:col-span-5 space-y-4">
|
||||
<h3 className="text-sm font-black text-gray-200 flex items-center gap-2">
|
||||
<Layers className="w-4 h-4 text-purple-400" />
|
||||
<span>دپارتمانهای فعال در مدار سازمانی</span>
|
||||
</h3>
|
||||
|
||||
<div className="space-y-3">
|
||||
{departments.slice(0, 4).map((dept) => (
|
||||
<div
|
||||
key={dept.id}
|
||||
onClick={() => setSelectedDept(dept)}
|
||||
className="p-4 bg-gray-900/60 hover:bg-gray-900 border border-gray-800/80 hover:border-purple-500/40 rounded-2xl transition-all cursor-pointer group shadow-sm"
|
||||
>
|
||||
<div className="flex items-center justify-between">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className={`p-2.5 rounded-xl bg-gradient-to-br ${dept.avatarColor} text-white shadow-md`}>
|
||||
<dept.icon className="w-4 h-4" />
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="text-xs font-black text-white group-hover:text-purple-300 transition-colors">
|
||||
{dept.name}
|
||||
</h4>
|
||||
<span className="text-[10px] text-gray-400 font-medium">
|
||||
{dept.agentName}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
{dept.pendingApprovals > 0 && (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-amber-500/20 text-amber-300 border border-amber-500/30">
|
||||
{dept.pendingApprovals} تایید معلق
|
||||
</span>
|
||||
)}
|
||||
<ChevronRight className="w-4 h-4 text-gray-600 group-hover:text-white transition-colors" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p className="text-[11px] text-gray-400 mt-2.5 line-clamp-1 font-medium bg-gray-950/60 p-2 rounded-xl border border-gray-800/50">
|
||||
<span className="text-purple-400 font-bold ml-1">تمرکز جاری:</span>
|
||||
{dept.currentFocus}
|
||||
</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{activeTab === 'BOARD_VIEW' && (
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-5">
|
||||
{departments.map((dept) => (
|
||||
<div
|
||||
key={dept.id}
|
||||
className="bg-gray-900/60 border border-gray-800/90 rounded-3xl p-5 hover:border-purple-500/40 transition-all flex flex-col justify-between shadow-xl"
|
||||
>
|
||||
<div>
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className={`p-3 rounded-2xl bg-gradient-to-br ${dept.avatarColor} text-white shadow-md`}>
|
||||
<dept.icon className="w-5 h-5" />
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="text-sm font-black text-white">{dept.name}</h3>
|
||||
<p className="text-[11px] text-purple-400 font-bold">{dept.agentName}</p>
|
||||
</div>
|
||||
</div>
|
||||
<span className={`text-[10px] font-black px-2 py-0.5 rounded-full border ${
|
||||
dept.status === 'ACTIVE'
|
||||
? 'bg-emerald-500/20 text-emerald-400 border-emerald-500/30'
|
||||
: 'bg-blue-500/20 text-blue-400 border-blue-500/30'
|
||||
}`}>
|
||||
{dept.status === 'ACTIVE' ? 'در حال کار' : 'آمادهباش'}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<p className="text-xs text-gray-400 mt-3 font-medium leading-relaxed">
|
||||
{dept.role}
|
||||
</p>
|
||||
|
||||
<div className="mt-4 p-3 rounded-2xl bg-gray-950/80 border border-gray-800/80 space-y-1.5">
|
||||
<div className="text-[10px] font-bold text-gray-500 flex items-center gap-1.5">
|
||||
<Terminal className="w-3.5 h-3.5 text-purple-400" />
|
||||
<span>آخرین استدلال و تفکر مدل:</span>
|
||||
</div>
|
||||
<p className="text-[11px] text-gray-300 font-mono leading-relaxed line-clamp-2">
|
||||
{dept.recentReasoningSnippet}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="mt-5 pt-4 border-t border-gray-800/80 flex items-center justify-between text-xs">
|
||||
<span className="text-gray-400 font-medium">
|
||||
تسکهای تکمیلشده: <strong className="text-white font-bold">{dept.completedTasks}</strong>
|
||||
</span>
|
||||
|
||||
<Link
|
||||
to="/tasks"
|
||||
className="flex items-center gap-1 text-purple-400 hover:text-purple-300 font-bold text-[11px]"
|
||||
>
|
||||
<span>مشاهده صف کارتابل</span>
|
||||
<ArrowUpRight className="w-3.5 h-3.5" />
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{selectedDept && (
|
||||
<div className="fixed inset-0 z-50 bg-black/80 backdrop-blur-md flex items-center justify-center p-4">
|
||||
<div className="bg-gray-900 border border-purple-500/30 rounded-3xl max-w-2xl w-full p-6 shadow-2xl space-y-4">
|
||||
<div className="flex items-center justify-between border-b border-gray-800 pb-4">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className={`p-3 rounded-2xl bg-gradient-to-br ${selectedDept.avatarColor} text-white`}>
|
||||
<selectedDept.icon className="w-6 h-6" />
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="text-base font-black text-white">{selectedDept.name}</h3>
|
||||
<p className="text-xs text-purple-400 font-bold">{selectedDept.agentName}</p>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => setSelectedDept(null)}
|
||||
className="text-gray-400 hover:text-white text-xs font-bold px-3 py-1.5 rounded-xl bg-gray-800"
|
||||
>
|
||||
بستن
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="space-y-3">
|
||||
<div>
|
||||
<h4 className="text-xs font-bold text-gray-400">ماموریت اصلی دپارتمان:</h4>
|
||||
<p className="text-xs text-gray-200 mt-1 font-medium">{selectedDept.role}</p>
|
||||
</div>
|
||||
|
||||
<div className="p-4 bg-gray-950 rounded-2xl border border-gray-800 space-y-2">
|
||||
<h4 className="text-xs font-bold text-purple-400 flex items-center gap-2">
|
||||
<Terminal className="w-4 h-4" />
|
||||
<span>لاگ استدلال و آخرین فعالیت زنده:</span>
|
||||
</h4>
|
||||
<p className="text-xs text-gray-300 font-mono leading-relaxed">
|
||||
{selectedDept.recentReasoningSnippet}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-end gap-3 pt-4 border-t border-gray-800">
|
||||
<Link
|
||||
to="/tasks"
|
||||
className="px-4 py-2 bg-purple-600 hover:bg-purple-700 text-white rounded-xl text-xs font-bold transition-all shadow-md"
|
||||
>
|
||||
رفتن به کارتابل وظایف این واحد
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -43,11 +43,14 @@ describe('Dashboard Page Component', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(api.get).mockResolvedValue({
|
||||
data: {
|
||||
success: true,
|
||||
data: mockStats,
|
||||
},
|
||||
vi.mocked(api.get).mockImplementation((url: string) => {
|
||||
if (url.includes('/admin/audit-logs')) {
|
||||
return Promise.resolve({ data: { success: true, data: [] } } as any);
|
||||
}
|
||||
if (url.includes('/admin/approvals')) {
|
||||
return Promise.resolve({ data: { success: true, meta: { pendingCount: 0 } } } as any);
|
||||
}
|
||||
return Promise.resolve({ data: { success: true, data: mockStats } } as any);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -62,8 +65,8 @@ describe('Dashboard Page Component', () => {
|
||||
it('renders dashboard headers and initial zero or placeholder stats', async () => {
|
||||
renderDashboard();
|
||||
|
||||
expect(screen.getByText('داشبورد')).toBeInTheDocument();
|
||||
expect(screen.getByText('خلاصهای از وضعیت فروشگاه کنینا')).toBeInTheDocument();
|
||||
expect(screen.getByText('داشبورد فرماندهی کنینا')).toBeInTheDocument();
|
||||
expect(screen.getByText('خلاصه عملیات، وضعیت دیتابیس و نظارت بر وظایف خودکار سازمان')).toBeInTheDocument();
|
||||
expect(screen.getByText('درآمد کل')).toBeInTheDocument();
|
||||
expect(screen.getByText('سفارشات جدید')).toBeInTheDocument();
|
||||
expect(screen.getByText('کاربران فعال')).toBeInTheDocument();
|
||||
@@ -123,7 +126,12 @@ describe('Dashboard Page Component', () => {
|
||||
|
||||
it('falls back gracefully when API returns error', async () => {
|
||||
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
||||
vi.mocked(api.get).mockRejectedValueOnce(new Error('Network error'));
|
||||
vi.mocked(api.get).mockImplementation((url: string) => {
|
||||
if (url.includes('/admin/dashboard/stats')) {
|
||||
return Promise.reject(new Error('Network error'));
|
||||
}
|
||||
return Promise.resolve({ data: { success: true, data: [] } } as any);
|
||||
});
|
||||
|
||||
renderDashboard();
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ export default function Dashboard() {
|
||||
try {
|
||||
const res = await api.get('/admin/audit-logs?limit=5');
|
||||
if (res.data?.success) {
|
||||
setRecentLogs(res.data.data);
|
||||
setRecentLogs(Array.isArray(res.data.data) ? res.data.data : (Array.isArray(res.data.data?.logs) ? res.data.data.logs : []));
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to fetch audit logs widget', e);
|
||||
@@ -117,10 +117,10 @@ export default function Dashboard() {
|
||||
const COLORS = ['#8b5cf6', '#3b82f6', '#10b981'];
|
||||
|
||||
const stats = [
|
||||
{ title: 'درآمد کل', value: `${data.revenue.toLocaleString()} تومان`, icon: DollarSign, color: 'text-green-600', bg: 'bg-green-100', link: '/reports' },
|
||||
{ title: 'سفارشات جدید', value: data.newOrders.toString(), icon: ShoppingCart, color: 'text-blue-600', bg: 'bg-blue-100', link: '/orders' },
|
||||
{ title: 'کاربران فعال', value: data.users.toString(), icon: Users, color: 'text-purple-600', bg: 'bg-purple-100', link: '/users' },
|
||||
{ title: 'بازدید امروز', value: data.todayVisits.toString(), icon: Activity, color: 'text-orange-600', bg: 'bg-orange-100', link: '/reports' },
|
||||
{ title: 'درآمد کل', value: `${(data?.revenue || 0).toLocaleString()} تومان`, icon: DollarSign, color: 'text-green-600', bg: 'bg-green-100', link: '/reports' },
|
||||
{ title: 'سفارشات جدید', value: (data?.newOrders || 0).toString(), icon: ShoppingCart, color: 'text-blue-600', bg: 'bg-blue-100', link: '/orders' },
|
||||
{ title: 'کاربران فعال', value: (data?.users || 0).toString(), icon: Users, color: 'text-purple-600', bg: 'bg-purple-100', link: '/users' },
|
||||
{ title: 'بازدید امروز', value: (data?.todayVisits || 0).toString(), icon: Activity, color: 'text-orange-600', bg: 'bg-orange-100', link: '/reports' },
|
||||
];
|
||||
|
||||
return (
|
||||
@@ -217,7 +217,7 @@ export default function Dashboard() {
|
||||
رکوردی در تاریخچه ثبت نشده است.
|
||||
</div>
|
||||
) : (
|
||||
recentLogs.map((log) => (
|
||||
(Array.isArray(recentLogs) ? recentLogs : []).map((log) => (
|
||||
<div key={log.id} className="p-3 bg-gray-50 rounded-xl flex items-center justify-between text-xs hover:bg-purple-50/40 transition-colors">
|
||||
<div className="flex items-center gap-2.5 overflow-hidden">
|
||||
<span className="w-2 h-2 rounded-full bg-purple-500 shrink-0" />
|
||||
|
||||
@@ -80,7 +80,7 @@ export default function MonitoringPage() {
|
||||
timestamp: new Date().toLocaleTimeString('fa-IR'),
|
||||
zibal: {
|
||||
status: !health || health.status === 'OFFLINE' ? 'OFFLINE' : health.status === 'DEGRADED' || health.latencyMs > 1500 ? 'DEGRADED' : 'ONLINE',
|
||||
latencyMs: health?.latencyMs || Math.floor(Math.random() * 80) + 120,
|
||||
latencyMs: health?.latencyMs ?? 0,
|
||||
merchantId: health?.activeMerchant || health?.merchantId || 'zibal-live-merchant',
|
||||
todayVolumeTomans: txStats?.todayVolume ? Math.floor(Number(txStats.todayVolume)) : 0,
|
||||
todayTxCount: txStats?.todayVerified || txStats?.verifiedCount || 0,
|
||||
@@ -89,14 +89,14 @@ export default function MonitoringPage() {
|
||||
melipayamak: {
|
||||
status: smsCreditVal !== undefined && smsCreditVal !== null ? 'ONLINE' : 'OFFLINE',
|
||||
credit: smsCreditVal !== undefined && smsCreditVal !== null ? `${Number(smsCreditVal).toLocaleString('fa-IR')} پیامک` : 'نامشخص',
|
||||
latencyMs: Math.floor(Math.random() * 60) + 95,
|
||||
latencyMs: 0,
|
||||
todaySmsSent: 48,
|
||||
patternActive: true,
|
||||
},
|
||||
|
||||
post: {
|
||||
status: 'ONLINE',
|
||||
latencyMs: Math.floor(Math.random() * 110) + 140,
|
||||
latencyMs: 0,
|
||||
trackingActive: true,
|
||||
},
|
||||
system: {
|
||||
|
||||
@@ -31,6 +31,7 @@ import api from '../services/api';
|
||||
|
||||
|
||||
export interface OrderItem {
|
||||
requiresRx?: boolean;
|
||||
id?: string;
|
||||
name?: string;
|
||||
priceValue?: number;
|
||||
@@ -758,6 +759,12 @@ export default function Orders() {
|
||||
سفارش جدید
|
||||
</span>
|
||||
)}
|
||||
{(order.orderItems || order.items || []).some(it => it.product?.requiresRx) && (
|
||||
<span className="inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-[10px] font-black bg-rose-600 text-white shadow-xs animate-pulse" title="نیازمند تماس تلفنی و تایید نسخه دامپزشک">
|
||||
<span>Rx</span>
|
||||
<span>هماهنگی نسخه</span>
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-wrap gap-1.5 mt-2 font-vazir" dir="rtl">
|
||||
<span className={`text-[10px] font-bold font-vazir px-2 py-0.5 rounded-md border flex items-center gap-1 shadow-sm ${payInfo.color}`}>
|
||||
@@ -911,6 +918,24 @@ export default function Orders() {
|
||||
>
|
||||
|
||||
<div className="space-y-6">
|
||||
{/* Rx Warning Notice for Admin */}
|
||||
{(selectedOrder.orderItems || selectedOrder.items || []).some(it => it.requiresRx || it.product?.requiresRx) && (
|
||||
<div className="bg-rose-50 border border-rose-200 rounded-2xl p-4 flex items-center justify-between gap-3 text-rose-900 font-vazir shadow-xs" dir="rtl">
|
||||
<div className="flex items-center gap-2.5">
|
||||
<span className="w-8 h-8 rounded-xl bg-rose-600 text-white flex items-center justify-center font-black text-xs shrink-0 shadow-sm">Rx</span>
|
||||
<div>
|
||||
<h4 className="text-xs font-black">این سفارش شامل داروی نیازمند نسخه و نظارت دامپزشکی است</h4>
|
||||
<p className="text-[11px] text-rose-700 font-medium mt-0.5">ارسال سفارش تنها پس از تماس تلفنی کارشناس پشتیبانی و تایید نسخه معتبر انجام شود.</p>
|
||||
</div>
|
||||
</div>
|
||||
<a
|
||||
href={`tel:${selectedOrder.user?.mobile || selectedOrder.user?.phone || ''}`}
|
||||
className="bg-rose-600 hover:bg-rose-700 text-white px-3.5 py-2 rounded-xl text-xs font-bold transition-all shadow-sm flex items-center gap-1.5 shrink-0"
|
||||
>
|
||||
<span>تماس با مشتری</span>
|
||||
</a>
|
||||
</div>
|
||||
)}
|
||||
{/* Status & Timing Banner */}
|
||||
<div className="flex flex-wrap items-center justify-between gap-4 p-4 bg-purple-50/50 rounded-2xl border border-purple-100">
|
||||
<div className="flex items-center gap-3">
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { ProductFaqTab } from "../components/products/ProductFaqTab";
|
||||
import {
|
||||
Activity,
|
||||
AlertTriangle,
|
||||
@@ -2317,152 +2318,12 @@ export default function Products() {
|
||||
</div>
|
||||
|
||||
{/* FAQ Tab */}
|
||||
<div className={activeTab === 'faq' ? 'block space-y-5' : 'hidden'}>
|
||||
{/* Top FAQ Controls */}
|
||||
<div className="bg-white p-5 rounded-2xl border border-gray-200 shadow-sm space-y-4">
|
||||
<div className="flex flex-col sm:flex-row sm:items-center justify-between gap-3 border-b pb-4">
|
||||
<div>
|
||||
<h4 className="text-sm font-black text-gray-800 flex items-center gap-2">
|
||||
<HelpCircle className="w-4 h-4 text-purple-600" />
|
||||
<span>بخش پرسش و پاسخهای متداول محصول (Product FAQs)</span>
|
||||
</h4>
|
||||
<p className="text-xs text-gray-500 mt-0.5">مدیریت آکاردئون پرسشهای متداول در صفحه کالا و ثبت خودکار در سئوی گوگل (FAQPage Schema)</p>
|
||||
</div>
|
||||
<div className="flex items-center gap-2 shrink-0">
|
||||
<label className="relative inline-flex items-center cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
className="sr-only peer"
|
||||
checked={formData.showFaqs}
|
||||
onChange={(e) => setFormData({ ...formData, showFaqs: e.target.checked })}
|
||||
/>
|
||||
<div className="w-11 h-6 bg-gray-200 peer-focus:outline-none rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-purple-600"></div>
|
||||
</label>
|
||||
<span className="text-xs font-bold text-gray-700">
|
||||
{formData.showFaqs ? 'بخش FAQ فعال است' : 'بخش FAQ غیرفعال است'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-between flex-wrap gap-2 pt-1">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
startIcon={Plus}
|
||||
onClick={() => {
|
||||
setFormData({
|
||||
...formData,
|
||||
faqs: [...(formData.faqs || []), { question: '', answer: '' }]
|
||||
});
|
||||
}}
|
||||
className="border-purple-200 text-purple-700 hover:bg-purple-50 text-xs font-bold"
|
||||
>
|
||||
افزودن سوال جدید
|
||||
</Button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
const name = formData.nameFa || 'این محصول';
|
||||
setFormData({
|
||||
...formData,
|
||||
faqs: [
|
||||
{
|
||||
question: `آیا لیسیدن ${name} توسط حیوان خطرناک است؟`,
|
||||
answer: `خیر، ترکیبات این محصول با استانداردهای دارویی آلمان فرموله شده و فاقد مواد نگهدارنده شیمیایی مضر است. لیسیدن محدود آن باعث مسمومیت نمیشود؛ اما جهت اثربخشی و جذب حداکثری، پیشنهاد میشود ۱۰ تا ۱۵ دقیقه حواس حیوان پرت شود.`
|
||||
},
|
||||
{
|
||||
question: `مدت زمان ماندگاری و شرایط نگهداری ${name} چگونه است؟`,
|
||||
answer: `این محصول در جای خشک، خنک (دمای زیر ۲۵ درجه سانتیگراد) و دور از تابش مستقیم نور خورشید نگهداری شود. مدت زمان مجاز مصرف پس از باز شدن درب (PAO) ${formData.paoMonths ? `${formData.paoMonths} ماه` : '۱۲ ماه'} میباشد.`
|
||||
},
|
||||
{
|
||||
question: `آیا برای تولهها و حیوانات باردار یا شیرده قابل استفاده است؟`,
|
||||
answer: `بله، با توجه به فرمولاسیون ۱۰۰٪ طبیعی و عدم وجود هورمون یا مواد شیمیایی سنتتیک، استفاده از این محصول برای تمامی ردههای سنی و دوران حساس بارداری و شیردهی طبق دستورالعمل ایمن است.`
|
||||
},
|
||||
{
|
||||
question: `در صورت استفاده همزمان با سایر داروها یا پمادها چه نکاتی باید رعایت شود؟`,
|
||||
answer: `جهت جلوگیری از تداخل در جذب، توصیه میشود بین استفاده از این محصول و سایر داروها، اسپریها یا مکملهای درمانی حداقل ۲۰ الی ۳۰ دقیقه فاصله زمانی رعایت شود.`
|
||||
}
|
||||
]
|
||||
});
|
||||
toast.success('سوالات متداول استاندارد کاتالوگ بارگذاری شدند');
|
||||
}}
|
||||
className="text-xs text-purple-600 hover:text-purple-800 font-bold flex items-center gap-1 hover:underline"
|
||||
>
|
||||
درج سوالات متداول پیشنهادی کاتالوگ Canina ⚡
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* FAQ Items List */}
|
||||
{formData.faqs && formData.faqs.length > 0 ? (
|
||||
<div className="space-y-3">
|
||||
{formData.faqs.map((faq, idx) => (
|
||||
<div key={idx} className="bg-white p-4 rounded-2xl border border-gray-200 shadow-xs space-y-3 relative group">
|
||||
<div className="flex items-center justify-between gap-2 border-b border-gray-100 pb-2">
|
||||
<span className="text-xs font-black text-purple-700 bg-purple-50 px-2.5 py-0.5 rounded-full">
|
||||
سوال {idx + 1}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
const newFaqs = formData.faqs.filter((_, i) => i !== idx);
|
||||
setFormData({ ...formData, faqs: newFaqs });
|
||||
}}
|
||||
className="text-red-400 hover:text-red-600 p-1 rounded-lg hover:bg-red-50 transition-colors"
|
||||
title="حذف این سوال"
|
||||
>
|
||||
<Trash2 className="w-4 h-4" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<label className="text-xs font-bold text-gray-700">متن پرسش:</label>
|
||||
<input
|
||||
type="text"
|
||||
value={faq.question}
|
||||
onChange={(e) => {
|
||||
const updated = [...formData.faqs];
|
||||
updated[idx].question = e.target.value;
|
||||
setFormData({ ...formData, faqs: updated });
|
||||
}}
|
||||
placeholder="مثال: آیا لیسیدن این محصول خطرناک است؟"
|
||||
className="w-full px-3 py-2 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-xs font-bold font-vazir"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<label className="text-xs font-bold text-gray-700">متن پاسخ علمی و کامل:</label>
|
||||
<textarea
|
||||
rows={3}
|
||||
value={faq.answer}
|
||||
onChange={(e) => {
|
||||
const updated = [...formData.faqs];
|
||||
updated[idx].answer = e.target.value;
|
||||
setFormData({ ...formData, faqs: updated });
|
||||
}}
|
||||
placeholder="پاسخ کامل و علمی را وارد نمایید..."
|
||||
className="w-full px-3 py-2 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-xs leading-relaxed font-vazir"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<div className="bg-white p-8 rounded-2xl border border-dashed border-gray-300 text-center space-y-3">
|
||||
<div className="w-12 h-12 rounded-2xl bg-purple-50 text-purple-600 flex items-center justify-center mx-auto">
|
||||
<HelpCircle className="w-6 h-6" />
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<h5 className="text-sm font-black text-gray-800">هیچ پرسش و پاسخی ثبت نشده است</h5>
|
||||
<p className="text-xs text-gray-500 max-w-md mx-auto">
|
||||
میتوانید با کلیک بر روی «درج سوالات متداول پیشنهادی»، پرسشهای متداول کاتالوگ دارویی را به صورت خودکار بارگذاری و سپس شخصیسازی نمایید.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{/* FAQ Tab */}
|
||||
<ProductFaqTab
|
||||
activeTab={activeTab}
|
||||
formData={formData}
|
||||
setFormData={setFormData}
|
||||
/>
|
||||
|
||||
{/* Pricing Tab */}
|
||||
<div className={activeTab === 'pricing' ? 'block space-y-4' : 'hidden'}>
|
||||
|
||||
@@ -7,7 +7,10 @@ type Conversation = { id: string; createdAt: string; updatedAt: string; entryPat
|
||||
const unwrap = (r: any) => r.data?.data ?? r.data;
|
||||
export default function SupportChatAnalyticsPage() {
|
||||
const [stats, setStats] = useState<Stats | null>(null); const [rows, setRows] = useState<Conversation[]>([]); const [error, setError] = useState(""); const [dates, setDates] = useState({ startDate: "", endDate: "" });
|
||||
const load = async () => { try { setError(""); const params = Object.fromEntries(Object.entries(dates).filter(([, v]) => v)); const [s, c] = await Promise.all([api.get("/admin/support-chat/stats", { params }), api.get("/admin/support-chat/conversations", { params: { ...params, page: 1, limit: 50 } })]); setStats(unwrap(s)); setRows(unwrap(c).data || []); } catch { setError("گزارش پشتیبان بارگذاری نشد."); } };
|
||||
const load = async () => { try { setError(""); const params = Object.fromEntries(Object.entries(dates).filter(([, v]) => v)); const [s, c] = await Promise.all([api.get("/admin/support-chat/stats", { params }), api.get("/admin/support-chat/conversations", { params: { ...params, page: 1, limit: 50 } })]); const statsData = unwrap(s);
|
||||
const convData = unwrap(c);
|
||||
setStats(statsData);
|
||||
setRows(Array.isArray(convData) ? convData : (Array.isArray(convData?.data) ? convData.data : [])); } catch { setError("گزارش پشتیبان بارگذاری نشد."); } };
|
||||
useEffect(() => { void load(); }, []);
|
||||
return <div dir="rtl" className="space-y-6">
|
||||
<div className="flex items-center justify-between"><div><h1 className="text-2xl font-black">تحلیل مشاورهٔ سایت</h1><p className="text-gray-500">تعداد استفاده، سؤالها، پاسخها و موارد نیازمند پیگیری</p></div><Link className="rounded-lg border px-4 py-2" to="/settings/smart-chat/config">تنظیمات دستیار</Link><button className="rounded-lg bg-canina-blue px-4 py-2 text-white" onClick={() => void load()}>بهروزرسانی</button></div>
|
||||
|
||||
@@ -0,0 +1,321 @@
|
||||
import { Edit2, Plus, Search, Trash2, Activity, Tag, Sparkles } from 'lucide-react';
|
||||
import { useCallback, useEffect, useState } from 'react';
|
||||
import { toast } from 'react-hot-toast';
|
||||
import Button from '../components/ui/Button';
|
||||
import ConfirmModal from '../components/ui/ConfirmModal';
|
||||
import Modal from '../components/ui/Modal';
|
||||
import Pagination from '../components/ui/Pagination';
|
||||
import Spinner from '../components/ui/Spinner';
|
||||
import api from '../services/api';
|
||||
import { useSearchParams } from 'react-router-dom';
|
||||
|
||||
export interface Symptom {
|
||||
id: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
description?: string;
|
||||
metaTitle?: string;
|
||||
metaDescription?: string;
|
||||
keywords?: string;
|
||||
productsCount?: number;
|
||||
createdAt?: string;
|
||||
}
|
||||
|
||||
export default function SymptomsPage() {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
const [symptoms, setSymptoms] = useState<Symptom[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [search, setSearch] = useState(() => searchParams.get('search') || '');
|
||||
const [page, setPage] = useState(() => Number(searchParams.get('page')) || 1);
|
||||
const [totalPages, setTotalPages] = useState(1);
|
||||
const limit = 15;
|
||||
|
||||
const [isModalOpen, setIsModalOpen] = useState(false);
|
||||
const [editingSymptom, setEditingSymptom] = useState<Symptom | null>(null);
|
||||
const [deleteTargetId, setDeleteTargetId] = useState<string | null>(null);
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
|
||||
const [formData, setFormData] = useState({
|
||||
name: '',
|
||||
slug: '',
|
||||
description: '',
|
||||
metaTitle: '',
|
||||
metaDescription: '',
|
||||
keywords: ''
|
||||
});
|
||||
|
||||
const openModal = (symptom: Symptom | null = null) => {
|
||||
if (symptom) {
|
||||
setEditingSymptom(symptom);
|
||||
setFormData({
|
||||
name: symptom.name,
|
||||
slug: symptom.slug,
|
||||
description: symptom.description || '',
|
||||
metaTitle: symptom.metaTitle || '',
|
||||
metaDescription: symptom.metaDescription || '',
|
||||
keywords: symptom.keywords || ''
|
||||
});
|
||||
} else {
|
||||
setEditingSymptom(null);
|
||||
setFormData({
|
||||
name: '',
|
||||
slug: '',
|
||||
description: '',
|
||||
metaTitle: '',
|
||||
metaDescription: '',
|
||||
keywords: ''
|
||||
});
|
||||
}
|
||||
setIsModalOpen(true);
|
||||
};
|
||||
|
||||
const closeModal = () => {
|
||||
setIsModalOpen(false);
|
||||
};
|
||||
|
||||
const fetchSymptoms = useCallback(async () => {
|
||||
try {
|
||||
setIsLoading(true);
|
||||
const res = await api.get('/admin/symptoms', { params: { page, limit, search } });
|
||||
if (res.data?.data) {
|
||||
setSymptoms(res.data.data);
|
||||
setTotalPages(res.data.meta?.lastPage || 1);
|
||||
}
|
||||
} catch {
|
||||
toast.error('خطا در دریافت لیست علائم');
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
}, [page, search]);
|
||||
|
||||
useEffect(() => {
|
||||
fetchSymptoms();
|
||||
}, [fetchSymptoms]);
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!formData.name.trim()) {
|
||||
toast.error('نام علامت الزامی است');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
setIsSubmitting(true);
|
||||
if (editingSymptom) {
|
||||
await api.put(`/admin/symptoms/${editingSymptom.id}`, formData);
|
||||
toast.success('علامت با موفقیت ویرایش و در تمامی محصولات همگام شد');
|
||||
} else {
|
||||
await api.post('/admin/symptoms', formData);
|
||||
toast.success('علامت درمانی جدید با موفقیت ایجاد شد');
|
||||
}
|
||||
closeModal();
|
||||
fetchSymptoms();
|
||||
} catch {
|
||||
toast.error('خطا در ذخیره اطلاعات علامت');
|
||||
} finally {
|
||||
setIsSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDelete = async () => {
|
||||
if (!deleteTargetId) return;
|
||||
try {
|
||||
await api.delete(`/admin/symptoms/${deleteTargetId}`);
|
||||
toast.success('علامت با موفقیت حذف شد');
|
||||
setDeleteTargetId(null);
|
||||
fetchSymptoms();
|
||||
} catch {
|
||||
toast.error('خطا در حذف علامت');
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="space-y-6 font-vazir" dir="rtl">
|
||||
{/* Header */}
|
||||
<div className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 bg-white p-6 rounded-3xl border border-gray-100 shadow-sm">
|
||||
<div>
|
||||
<div className="flex items-center gap-2.5">
|
||||
<span className="w-10 h-10 rounded-2xl bg-canina-blue/10 text-canina-blue flex items-center justify-center">
|
||||
<Activity className="w-5 h-5 text-purple-600" />
|
||||
</span>
|
||||
<h1 className="text-xl font-black text-gray-900">مدیریت علائم بالینی و درمانی</h1>
|
||||
</div>
|
||||
<p className="text-xs text-gray-500 font-bold mt-1">
|
||||
تعریف و ویرایش علائم، بهینهسازی متادیتاهای سئو و همگامسازی یکپارچه با محصولات کاتالوگ
|
||||
</p>
|
||||
</div>
|
||||
<Button onClick={() => openModal()} className="bg-purple-600 hover:bg-purple-700 text-white rounded-2xl px-5 py-3 flex items-center gap-2 font-bold text-xs shadow-md shadow-purple-600/20">
|
||||
<Plus className="w-4 h-4" />
|
||||
<span>افزودن علامت جدید</span>
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{/* Filter & Search */}
|
||||
<div className="bg-white p-4 rounded-3xl border border-gray-100 shadow-sm flex items-center gap-3">
|
||||
<div className="relative flex-1">
|
||||
<Search className="w-4 h-4 text-gray-400 absolute right-3 top-1/2 -translate-y-1/2" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="جستجوی علامت بالینی بر اساس نام یا اسلاگ..."
|
||||
value={search}
|
||||
onChange={(e) => {
|
||||
setSearch(e.target.value);
|
||||
setPage(1);
|
||||
}}
|
||||
className="w-full bg-gray-50 border border-gray-200 rounded-2xl py-2.5 pr-10 pl-4 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Table */}
|
||||
<div className="bg-white rounded-3xl border border-gray-100 shadow-sm overflow-hidden">
|
||||
{isLoading ? (
|
||||
<div className="py-20 flex justify-center">
|
||||
<Spinner />
|
||||
</div>
|
||||
) : symptoms.length === 0 ? (
|
||||
<div className="py-20 text-center text-gray-400 font-bold text-sm">
|
||||
هیچ علامت بالینی یافت نشد.
|
||||
</div>
|
||||
) : (
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-right text-xs">
|
||||
<thead className="bg-gray-50/75 border-b border-gray-100 text-gray-500 font-black uppercase">
|
||||
<tr>
|
||||
<th className="px-6 py-4">نام علامت بالینی</th>
|
||||
<th className="px-6 py-4">اسلاگ URL</th>
|
||||
<th className="px-6 py-4">محصولات متصل</th>
|
||||
<th className="px-6 py-4">سئو متاتایتل</th>
|
||||
<th className="px-6 py-4 text-left">عملیات</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-gray-100">
|
||||
{symptoms.map((symptom) => (
|
||||
<tr key={symptom.id} className="hover:bg-purple-50/20 transition-colors">
|
||||
<td className="px-6 py-4 font-black text-gray-900 flex items-center gap-2">
|
||||
<Tag className="w-3.5 h-3.5 text-purple-600" />
|
||||
<span>{symptom.name}</span>
|
||||
</td>
|
||||
<td className="px-6 py-4 font-mono text-gray-500 dir-ltr text-right">
|
||||
{symptom.slug}
|
||||
</td>
|
||||
<td className="px-6 py-4">
|
||||
<span className="px-2.5 py-1 bg-purple-50 text-purple-700 font-black rounded-lg border border-purple-100">
|
||||
{symptom.productsCount || 0} محصول
|
||||
</span>
|
||||
</td>
|
||||
<td className="px-6 py-4 text-gray-600 max-w-xs truncate" title={symptom.metaTitle}>
|
||||
{symptom.metaTitle || '—'}
|
||||
</td>
|
||||
<td className="px-6 py-4 text-left space-x-2 space-x-reverse">
|
||||
<button
|
||||
onClick={() => openModal(symptom)}
|
||||
className="p-2 text-blue-600 hover:bg-blue-50 rounded-xl transition-colors"
|
||||
title="ویرایش و سئو"
|
||||
>
|
||||
<Edit2 className="w-4 h-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setDeleteTargetId(symptom.id)}
|
||||
className="p-2 text-red-600 hover:bg-red-50 rounded-xl transition-colors"
|
||||
title="حذف"
|
||||
>
|
||||
<Trash2 className="w-4 h-4" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="p-4 border-t border-gray-100 flex justify-center">
|
||||
<Pagination currentPage={page} totalPages={totalPages} onPageChange={(p) => setPage(p)} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Modal CRUD */}
|
||||
<Modal isOpen={isModalOpen} onClose={closeModal} title={editingSymptom ? 'ویرایش علامت و سئو' : 'تعریف علامت جدید'}>
|
||||
<form onSubmit={handleSubmit} className="space-y-4">
|
||||
<div>
|
||||
<label className="block text-xs font-bold text-gray-700 mb-1">نام علامت درمانی (فارسی) *</label>
|
||||
<input
|
||||
type="text"
|
||||
required
|
||||
value={formData.name}
|
||||
onChange={(e) => setFormData({ ...formData, name: e.target.value })}
|
||||
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||
placeholder="مثلاً: پوکی استخوان یا کمخونی"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-xs font-bold text-gray-700 mb-1">اسلاگ URL و انگلیسی</label>
|
||||
<input
|
||||
type="text"
|
||||
value={formData.slug}
|
||||
onChange={(e) => setFormData({ ...formData, slug: e.target.value })}
|
||||
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs dir-ltr focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||
placeholder="anemia یا osteoporosis"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-xs font-bold text-gray-700 mb-1">توضیحات تشخیصی و بالینی</label>
|
||||
<textarea
|
||||
rows={3}
|
||||
value={formData.description}
|
||||
onChange={(e) => setFormData({ ...formData, description: e.target.value })}
|
||||
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
|
||||
placeholder="توضیحات بالینی و پروتکلهای مکملهای درمانی..."
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="pt-2 border-t border-gray-100 space-y-3">
|
||||
<div className="flex items-center gap-1.5 text-xs font-black text-purple-700">
|
||||
<Sparkles className="w-3.5 h-3.5" />
|
||||
<span>تنظیمات پیشرفته سئو (SEO Meta)</span>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-[11px] font-bold text-gray-600 mb-1">Meta Title</label>
|
||||
<input
|
||||
type="text"
|
||||
value={formData.metaTitle}
|
||||
onChange={(e) => setFormData({ ...formData, metaTitle: e.target.value })}
|
||||
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-2.5 text-xs"
|
||||
placeholder="عنوان سئو در نتایج گوگل..."
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-[11px] font-bold text-gray-600 mb-1">Meta Description</label>
|
||||
<textarea
|
||||
rows={2}
|
||||
value={formData.metaDescription}
|
||||
onChange={(e) => setFormData({ ...formData, metaDescription: e.target.value })}
|
||||
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-2.5 text-xs"
|
||||
placeholder="توضیحات متای صفحه سئو..."
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex justify-end gap-2 pt-4">
|
||||
<Button type="button" variant="outline" onClick={closeModal}>انصراف</Button>
|
||||
<Button type="submit" disabled={isSubmitting} className="bg-purple-600 hover:bg-purple-700 text-white">
|
||||
{isSubmitting ? 'در حال ثبت...' : (editingSymptom ? 'بروزرسانی یکپارچه' : 'ثبت علامت')}
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
</Modal>
|
||||
|
||||
{/* Delete Confirmation */}
|
||||
<ConfirmModal
|
||||
isOpen={!!deleteTargetId}
|
||||
onClose={() => setDeleteTargetId(null)}
|
||||
onConfirm={handleDelete}
|
||||
title="حذف علامت بالینی"
|
||||
description="با حذف این علامت، ارتباط آن از تمام محصولات کاتالوگ نیز به طور خودکار حذف خواهد شد. آیا مطمئن هستید؟"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -36,6 +36,7 @@ export default function TasksManagementPage() {
|
||||
const [tasks, setTasks] = useState<DepartmentTask[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [searchTerm, setSearchTerm] = useState('');
|
||||
const [sortOrder, setSortOrder] = useState<'desc' | 'asc'>('desc');
|
||||
const [selectedDept, setSelectedDept] = useState('ALL');
|
||||
const [selectedStatus, setSelectedStatus] = useState('ALL');
|
||||
const [selectedPriority, setSelectedPriority] = useState('ALL');
|
||||
@@ -85,7 +86,12 @@ export default function TasksManagementPage() {
|
||||
}
|
||||
};
|
||||
|
||||
const filteredTasks = tasks.filter((t) => {
|
||||
const sortedTasks = [...tasks].sort((a, b) => {
|
||||
const tA = new Date(a.createdAt || 0).getTime();
|
||||
const tB = new Date(b.createdAt || 0).getTime();
|
||||
return sortOrder === 'desc' ? tB - tA : tA - tB;
|
||||
});
|
||||
const filteredTasks = sortedTasks.filter((t) => {
|
||||
const matchesSearch =
|
||||
!searchTerm ||
|
||||
t.title.toLowerCase().includes(searchTerm.toLowerCase()) ||
|
||||
@@ -128,10 +134,22 @@ export default function TasksManagementPage() {
|
||||
۳. تست استیج و QA (TEST)
|
||||
</span>
|
||||
);
|
||||
case 'WAITING_DEPENDENCIES':
|
||||
return (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-violet-100 text-violet-800 border border-violet-200">
|
||||
۳. منتظر تکمیل اقدامات وابسته
|
||||
</span>
|
||||
);
|
||||
case 'DONE':
|
||||
return (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-emerald-100 text-emerald-800 border border-emerald-200">
|
||||
۴. مستقر پروداکشن (DONE)
|
||||
۴. خروجی راستیآزماییشده (DONE)
|
||||
</span>
|
||||
);
|
||||
case 'REJECTED':
|
||||
return (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-rose-100 text-rose-800 border border-rose-200">
|
||||
رد شده (REJECTED)
|
||||
</span>
|
||||
);
|
||||
default:
|
||||
@@ -139,8 +157,28 @@ export default function TasksManagementPage() {
|
||||
}
|
||||
};
|
||||
|
||||
const getStatusTransitionsSummary = (logsRaw: any) => {
|
||||
const list = Array.isArray(logsRaw) ? logsRaw : (typeof logsRaw === 'object' && logsRaw ? [logsRaw] : []);
|
||||
let inProgressCount = 0;
|
||||
let testCount = 0;
|
||||
let qaRejectedCount = 0;
|
||||
let qaPassedCount = 0;
|
||||
|
||||
list.forEach((entry: any) => {
|
||||
const st = String(entry?.status || '');
|
||||
if (st.includes('STARTED') || st === 'IN_PROGRESS') inProgressCount += 1;
|
||||
if (st.includes('COMPLETED') || st === 'TEST') testCount += 1;
|
||||
if (st === 'QA_FAILED') qaRejectedCount += 1;
|
||||
if (st === 'QA_PASSED') qaPassedCount += 1;
|
||||
});
|
||||
|
||||
return { inProgressCount, testCount, qaRejectedCount, qaPassedCount, totalEvents: list.length };
|
||||
};
|
||||
|
||||
const getPriorityBadge = (priority: string) => {
|
||||
switch (priority) {
|
||||
case 'CEO_EXPEDITE':
|
||||
return <span className="px-1.5 py-0.5 text-[9px] font-black bg-purple-700 text-white rounded animate-pulse shadow-sm shadow-purple-300">⚡ فوری مدیرعامل</span>;
|
||||
case 'CRITICAL':
|
||||
return <span className="px-1.5 py-0.5 text-[9px] font-black bg-rose-600 text-white rounded">فوری / بحرانی</span>;
|
||||
case 'HIGH':
|
||||
@@ -248,11 +286,16 @@ export default function TasksManagementPage() {
|
||||
>
|
||||
<option value="ALL">همه دپارتمانها</option>
|
||||
<option value="DEV">مهندسی و توسعه (DEV)</option>
|
||||
<option value="DEVOPS">زیرساخت و سرور (DEVOPS)</option>
|
||||
<option value="SEO">سئو و مارکتپلیس (SEO)</option>
|
||||
<option value="CONTENT">محتوا و وبلاگ (CONTENT)</option>
|
||||
<option value="CLINICAL_RD">تحقیق و توسعه بالینی (CLINICAL_RD)</option>
|
||||
<option value="B2B">بازرگانی و توسعه کلینیکها (B2B)</option>
|
||||
<option value="SUPPORT">پشتیبانی مشتریان و CRM (SUPPORT)</option>
|
||||
<option value="QA">تضمین کیفیت و تست (QA)</option>
|
||||
<option value="COMMERCE">بازرگانی و مالی (COMMERCE)</option>
|
||||
<option value="PRODUCT">کاتالوگ و استوک (PRODUCT)</option>
|
||||
<option value="CONTENT">محتوا و وبلاگ (CONTENT)</option>
|
||||
<option value="SEO">سئو و مارکتپلیس (SEO)</option>
|
||||
<option value="PMO">مدیریت محصول و تضمین کیفیت (PMO)</option>
|
||||
<option value="PMO">مدیریت محصول و ارکستراسیون (PMO)</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -268,8 +311,10 @@ export default function TasksManagementPage() {
|
||||
<option value="ALL">همه وضعیتها</option>
|
||||
<option value="TODO">۱. صف اقدام (TODO)</option>
|
||||
<option value="IN_PROGRESS">۲. در حال اجرا (IN_PROGRESS)</option>
|
||||
<option value="TEST">۳. تست و QA (TEST)</option>
|
||||
<option value="DONE">۴. تکمیل شده (DONE)</option>
|
||||
<option value="TEST">۳. تست استیج و QA (TEST)</option>
|
||||
<option value="WAITING_DEPENDENCIES">۴. منتظر اقدامات وابسته (WAITING_DEPENDENCIES)</option>
|
||||
<option value="DONE">۵. تکمیل و راستیآزماییشده (DONE)</option>
|
||||
<option value="REJECTED">۶. رد شده (REJECTED)</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -283,6 +328,7 @@ export default function TasksManagementPage() {
|
||||
className="w-full px-3 py-2 text-xs bg-gray-50 border border-gray-200 rounded-xl focus:bg-white focus:outline-none focus:border-purple-500 font-bold text-gray-700"
|
||||
>
|
||||
<option value="ALL">همه اولویتها</option>
|
||||
<option value="CEO_EXPEDITE">⚡ فوری مدیرعامل (CEO_EXPEDITE)</option>
|
||||
<option value="CRITICAL">بحرانی / فوری</option>
|
||||
<option value="HIGH">بالا</option>
|
||||
<option value="MEDIUM">متوسط</option>
|
||||
@@ -310,6 +356,12 @@ export default function TasksManagementPage() {
|
||||
<thead className="bg-gray-50/75 border-b border-gray-100 text-gray-500 font-black">
|
||||
<tr>
|
||||
<th className="py-3 px-4">کد تسک</th>
|
||||
<th className="py-3 px-4 cursor-pointer select-none hover:text-purple-700" onClick={() => setSortOrder(prev => prev === 'desc' ? 'asc' : 'desc')}>
|
||||
<div className="flex items-center gap-1">
|
||||
<span>تاریخ و ساعت (تهران)</span>
|
||||
<span className="text-[10px] text-purple-600">({sortOrder === 'desc' ? '▼ جدیدترین' : '▲ قدیمیترین'})</span>
|
||||
</div>
|
||||
</th>
|
||||
<th className="py-3 px-4">عنوان و شرح وظیفه</th>
|
||||
<th className="py-3 px-4">دپارتمان</th>
|
||||
<th className="py-3 px-4">اولویت</th>
|
||||
@@ -326,6 +378,16 @@ export default function TasksManagementPage() {
|
||||
{task.code}
|
||||
</span>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap text-xs text-gray-600 font-medium" dir="ltr">
|
||||
{task.createdAt ? new Intl.DateTimeFormat('fa-IR', {
|
||||
timeZone: 'Asia/Tehran',
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
}).format(new Date(task.createdAt)) : '-'}
|
||||
</td>
|
||||
<td className="py-3.5 px-4">
|
||||
<div className="font-black text-gray-900 text-xs mb-0.5">{task.title}</div>
|
||||
{task.description && (
|
||||
@@ -443,8 +505,8 @@ export default function TasksManagementPage() {
|
||||
{/* Status Update Options */}
|
||||
<div className="pt-2">
|
||||
<label className="block text-xs font-black text-gray-700 mb-2">تغییر وضعیت تسک به:</label>
|
||||
<div className="grid grid-cols-4 gap-2">
|
||||
{['TODO', 'IN_PROGRESS', 'TEST', 'DONE'].map((st) => (
|
||||
<div className="grid grid-cols-3 sm:grid-cols-6 gap-2">
|
||||
{['TODO', 'IN_PROGRESS', 'TEST', 'WAITING_DEPENDENCIES', 'DONE', 'REJECTED'].map((st) => (
|
||||
<button
|
||||
key={st}
|
||||
type="button"
|
||||
@@ -473,16 +535,52 @@ export default function TasksManagementPage() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Execution Logs */}
|
||||
{/* Status History & Transitions Summary */}
|
||||
{activeTaskModal.executionLogs && (() => {
|
||||
const summary = getStatusTransitionsSummary(activeTaskModal.executionLogs);
|
||||
return (
|
||||
<div className="p-3 bg-purple-50/50 rounded-2xl border border-purple-100 space-y-2">
|
||||
<div className="font-bold text-purple-900 text-[11px] flex items-center justify-between">
|
||||
<span>آمار چرخهها و وضعیتهای طیشده تسک:</span>
|
||||
<span className="font-mono text-[10px] text-purple-700 bg-white px-2 py-0.5 rounded-full border border-purple-200">
|
||||
{summary.totalEvents} رکورد ثبتی
|
||||
</span>
|
||||
</div>
|
||||
<div className="grid grid-cols-2 sm:grid-cols-4 gap-2">
|
||||
<div className="bg-white p-2 rounded-xl border border-blue-100 text-center shadow-xs">
|
||||
<span className="block text-[10px] text-gray-500 font-bold">دفعات ارجاع به اجرا</span>
|
||||
<span className="text-xs font-black text-blue-700 font-mono">{summary.inProgressCount} بار</span>
|
||||
</div>
|
||||
<div className="bg-white p-2 rounded-xl border border-amber-100 text-center shadow-xs">
|
||||
<span className="block text-[10px] text-gray-500 font-bold">بررسی تست و QA</span>
|
||||
<span className="text-xs font-black text-amber-700 font-mono">{summary.testCount} بار</span>
|
||||
</div>
|
||||
<div className="bg-white p-2 rounded-xl border border-rose-100 text-center shadow-xs">
|
||||
<span className="block text-[10px] text-gray-500 font-bold">عدم تایید QA</span>
|
||||
<span className="text-xs font-black text-rose-700 font-mono">{summary.qaRejectedCount} بار</span>
|
||||
</div>
|
||||
<div className="bg-white p-2 rounded-xl border border-emerald-100 text-center shadow-xs">
|
||||
<span className="block text-[10px] text-gray-500 font-bold">تاییدیه کیفی</span>
|
||||
<span className="text-xs font-black text-emerald-700">{summary.qaPassedCount > 0 ? 'دارد (تایید)' : 'در جریان'}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})()}
|
||||
|
||||
{/* Execution Logs Timeline */}
|
||||
{activeTaskModal.executionLogs && (
|
||||
<div className="pt-2 space-y-1">
|
||||
<div className="font-bold text-gray-600 text-[11px]">تاریخچه اقدامات انجامشده روی این تسک:</div>
|
||||
<div className="space-y-1 max-h-36 overflow-y-auto">
|
||||
<div className="pt-2 space-y-1.5">
|
||||
<div className="font-bold text-gray-600 text-[11px] flex items-center justify-between">
|
||||
<span>تایملاین رویدادها و تغییر وضعیتها:</span>
|
||||
<span className="text-[10px] text-gray-400">(به وقت تهران)</span>
|
||||
</div>
|
||||
<div className="space-y-1.5 max-h-48 overflow-y-auto p-1">
|
||||
{renderExecutionLogs(activeTaskModal.executionLogs).map((lg: any, i: number) => (
|
||||
<div key={i} className="text-[10px] p-2 bg-gray-50 rounded-lg flex items-center justify-between">
|
||||
<span className="font-bold text-gray-800">{lg.note || JSON.stringify(lg)}</span>
|
||||
<span className="text-gray-400 font-mono">
|
||||
{lg.timestamp ? new Date(lg.timestamp).toLocaleTimeString('fa-IR') : '-'}
|
||||
<div key={i} className="text-[10px] p-2.5 bg-gray-50 hover:bg-gray-100/70 rounded-xl flex items-start justify-between gap-3 border border-gray-100 transition-colors">
|
||||
<span className="font-bold text-gray-800 leading-relaxed text-right flex-1">{lg.note || JSON.stringify(lg)}</span>
|
||||
<span className="text-gray-400 font-mono text-[9px] whitespace-nowrap dir-ltr pt-0.5">
|
||||
{lg.timestamp ? new Date(lg.timestamp).toLocaleString('fa-IR', { hour: '2-digit', minute: '2-digit', second: '2-digit', day: '2-digit', month: '2-digit' }) : '-'}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -17,6 +17,8 @@ const SupportChatAnalyticsPage = lazyWithRetry(() => import('../pages/SupportCha
|
||||
const Settings = lazyWithRetry(() => import('../pages/Settings'));
|
||||
const Reports = lazyWithRetry(() => import('../pages/Reports'));
|
||||
const Categories = lazyWithRetry(() => import('../pages/Categories'));
|
||||
const SymptomsPage = lazyWithRetry(() => import('../pages/SymptomsPage'));
|
||||
|
||||
const Blogs = lazyWithRetry(() => import('../pages/Blogs'));
|
||||
const Wiki = lazyWithRetry(() => import('../pages/Wiki'));
|
||||
const Pets = lazyWithRetry(() => import('../pages/Pets'));
|
||||
@@ -51,6 +53,7 @@ const MonitoringPage = lazyWithRetry(() => import('../pages/MonitoringPage'));
|
||||
const ApprovalsPage = lazyWithRetry(() => import('../pages/ApprovalsPage'));
|
||||
const AuditHistoryPage = lazyWithRetry(() => import('../pages/AuditHistoryPage'));
|
||||
const TasksManagementPage = lazyWithRetry(() => import('../pages/TasksManagementPage'));
|
||||
const CompanyOrchestrationHQ = lazyWithRetry(() => import('../pages/CompanyOrchestrationHQ'));
|
||||
|
||||
export interface AdminRouteConfig {
|
||||
path: string;
|
||||
@@ -93,6 +96,8 @@ export const router = createBrowserRouter([
|
||||
{ path: 'settings/system', element: <SystemSettingsPage /> },
|
||||
{ path: 'reports/*', element: <Reports /> },
|
||||
{ path: 'categories/*', element: <Categories /> },
|
||||
{ path: 'symptoms/*', element: <SymptomsPage /> },
|
||||
|
||||
{ path: 'blogs/*', element: <Blogs /> },
|
||||
{ path: 'wiki/*', element: <Wiki /> },
|
||||
{ path: 'videos/*', element: <Videos /> },
|
||||
@@ -117,6 +122,7 @@ export const router = createBrowserRouter([
|
||||
{ path: 'approvals/*', element: <ApprovalsPage /> },
|
||||
{ path: 'history/*', element: <AuditHistoryPage /> },
|
||||
{ path: 'tasks/*', element: <TasksManagementPage /> },
|
||||
{ path: 'governance/hq/*', element: <CompanyOrchestrationHQ /> },
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
@@ -87,11 +87,24 @@ api.interceptors.response.use(
|
||||
isRefreshing = true;
|
||||
|
||||
try {
|
||||
const refreshResponse = await axios.post<ApiResponse<AuthResponseData>>(
|
||||
`${baseURL}/auth/refresh`,
|
||||
{},
|
||||
{ withCredentials: true }
|
||||
);
|
||||
let refreshResponse;
|
||||
try {
|
||||
refreshResponse = await axios.post<ApiResponse<AuthResponseData>>(
|
||||
`${baseURL}/auth/refresh`,
|
||||
{},
|
||||
{
|
||||
withCredentials: true,
|
||||
headers: currentToken ? { Authorization: `Bearer ${currentToken}` } : {}
|
||||
}
|
||||
);
|
||||
} catch {
|
||||
// If bearer-based refresh fails (e.g. access token fully expired), try cookie-based /auth/refresh-token
|
||||
refreshResponse = await axios.post<ApiResponse<AuthResponseData>>(
|
||||
`${baseURL}/auth/refresh-token`,
|
||||
{},
|
||||
{ withCredentials: true }
|
||||
);
|
||||
}
|
||||
|
||||
if (refreshResponse.data?.success && refreshResponse.data.data?.accessToken) {
|
||||
const newToken = refreshResponse.data.data.accessToken;
|
||||
|
||||
@@ -38,7 +38,8 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
||||
const setLoginModalOpen = useUIStore((state) => state.setLoginModalOpen);
|
||||
const setB2BPortalOpen = useUIStore((state) => state.setB2BPortalOpen);
|
||||
const clearAdvisorData = useUIStore((state) => state.clearAdvisorData);
|
||||
const [isPrescriptionModalOpen, setIsPrescriptionModalOpen] = useState(false);
|
||||
const isPrescriptionModalOpen = useUIStore((state) => state.isPrescriptionModalOpen);
|
||||
const setPrescriptionModalOpen = useUIStore((state) => state.setPrescriptionModalOpen);
|
||||
|
||||
const pathname = usePathname();
|
||||
const router = useRouter();
|
||||
@@ -123,6 +124,19 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
||||
}, [pathname]);
|
||||
|
||||
|
||||
|
||||
// Global listener for Smart Advisor / Consultation CTA to trigger Support Chat
|
||||
useEffect(() => {
|
||||
const handleGlobalClick = (e: MouseEvent) => {
|
||||
const target = (e.target as HTMLElement)?.closest('button');
|
||||
if (target && target.innerText && target.innerText.includes('مشاوره هوشمند دارویی')) {
|
||||
window.dispatchEvent(new CustomEvent('canina:open-support-chat'));
|
||||
}
|
||||
};
|
||||
document.addEventListener('click', handleGlobalClick);
|
||||
return () => document.removeEventListener('click', handleGlobalClick);
|
||||
}, []);
|
||||
|
||||
// Check Maintenance Mode (Admin / Partner bypass)
|
||||
const isMaintenanceMode = getText('MAINTENANCE_MODE', 'false') === 'true' || getText('maintenance_mode', 'false') === 'true';
|
||||
const isAdmin = role === 'User_Partner' || (typeof window !== 'undefined' && Boolean(localStorage.getItem('adminToken')));
|
||||
@@ -175,7 +189,7 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
||||
onSearch={handleSearch}
|
||||
onB2BOpen={() => setB2BPortalOpen(true)}
|
||||
/>
|
||||
<main className={`min-h-screen ${pathname === '/catalog' ? 'bg-slate-950' : ''}`}>
|
||||
<main id="main-content" className={`min-h-screen ${pathname === '/catalog' ? 'bg-slate-950' : ''}`}>
|
||||
{children}
|
||||
</main>
|
||||
{!isUtilityRoute && <Footer onNavigate={handleNavigate} onShopNavigate={navigateToShop} onB2BOpen={() => setB2BPortalOpen(true)} />}
|
||||
@@ -230,15 +244,11 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
|
||||
/>}
|
||||
<PrescriptionUploadModal
|
||||
isOpen={isPrescriptionModalOpen}
|
||||
onClose={() => setIsPrescriptionModalOpen(false)}
|
||||
onClose={() => setPrescriptionModalOpen(false)}
|
||||
/>
|
||||
<MobileBottomNav
|
||||
onPrescriptionOpen={() => {
|
||||
if (!isLoggedIn) {
|
||||
setAuthModalOpen(true);
|
||||
} else {
|
||||
setIsPrescriptionModalOpen(true);
|
||||
}
|
||||
setPrescriptionModalOpen(true);
|
||||
}}
|
||||
/>
|
||||
<Toaster position="top-center" expand={true} richColors closeButton />
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { NextRequest } from "next/server";
|
||||
import { revalidatePath, revalidateTag } from "next/cache";
|
||||
import { POST } from "./route";
|
||||
|
||||
vi.mock("next/cache", () => ({ revalidatePath: vi.fn(), revalidateTag: vi.fn() }));
|
||||
|
||||
describe("revalidation route", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
process.env.REVALIDATION_SECRET = "test-secret";
|
||||
});
|
||||
|
||||
it("revalidates deduplicated tag and path batches", async () => {
|
||||
const request = new NextRequest("http://localhost/api/revalidate", {
|
||||
method: "POST",
|
||||
headers: { "content-type": "application/json", "x-revalidate-secret": "test-secret" },
|
||||
body: JSON.stringify({ tags: ["blogs", "blogs"], paths: ["/blog", "/blog"] }),
|
||||
});
|
||||
|
||||
const response = await POST(request);
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(revalidateTag).toHaveBeenCalledTimes(1);
|
||||
expect(revalidateTag).toHaveBeenCalledWith("blogs", "default");
|
||||
expect(revalidatePath).toHaveBeenCalledTimes(1);
|
||||
expect(revalidatePath).toHaveBeenCalledWith("/blog", "page");
|
||||
});
|
||||
});
|
||||
@@ -12,69 +12,41 @@ export async function POST(request: NextRequest) {
|
||||
async function handleRevalidate(request: NextRequest) {
|
||||
const { searchParams } = new URL(request.url);
|
||||
let secret = searchParams.get('secret') || request.headers.get('x-revalidate-secret');
|
||||
let tag = searchParams.get('tag');
|
||||
let path = searchParams.get('path');
|
||||
let tags: unknown[] = searchParams.getAll('tag');
|
||||
let paths: unknown[] = searchParams.getAll('path');
|
||||
|
||||
// Check auth header if bearer token provided
|
||||
const authHeader = request.headers.get('authorization');
|
||||
if (authHeader && authHeader.startsWith('Bearer ')) {
|
||||
secret = authHeader.substring(7);
|
||||
}
|
||||
if (authHeader?.startsWith('Bearer ')) secret = authHeader.substring(7);
|
||||
|
||||
if (request.method === 'POST') {
|
||||
try {
|
||||
const body = await request.json().catch(() => ({}));
|
||||
if (body && typeof body === 'object') {
|
||||
if (body.secret) secret = body.secret;
|
||||
if (body.tag) tag = body.tag;
|
||||
if (body.path) path = body.path;
|
||||
}
|
||||
} catch {
|
||||
// Ignore body read error
|
||||
const body = await request.json().catch(() => ({}));
|
||||
if (body && typeof body === 'object') {
|
||||
if (body.secret) secret = body.secret;
|
||||
if (body.tag) tags = [body.tag];
|
||||
if (Array.isArray(body.tags)) tags = body.tags;
|
||||
if (body.path) paths = [body.path];
|
||||
if (Array.isArray(body.paths)) paths = body.paths;
|
||||
}
|
||||
}
|
||||
|
||||
const expectedSecret = process.env.REVALIDATION_SECRET;
|
||||
if (!expectedSecret) {
|
||||
return NextResponse.json(
|
||||
{ success: false, message: 'Revalidation service is not configured' },
|
||||
{ status: 503 }
|
||||
);
|
||||
return NextResponse.json({ success: false, message: 'Revalidation service is not configured' }, { status: 503 });
|
||||
}
|
||||
|
||||
if (!secret || secret !== expectedSecret) {
|
||||
return NextResponse.json(
|
||||
{ success: false, message: 'Invalid revalidation secret token' },
|
||||
{ status: 401 }
|
||||
);
|
||||
return NextResponse.json({ success: false, message: 'Invalid revalidation secret token' }, { status: 401 });
|
||||
}
|
||||
|
||||
if (!tag && !path) {
|
||||
return NextResponse.json(
|
||||
{ success: false, message: 'Missing tag or path parameter for cache revalidation' },
|
||||
{ status: 400 }
|
||||
);
|
||||
const cleanTags = [...new Set(tags.filter((value): value is string => typeof value === 'string' && value.length > 0))];
|
||||
const cleanPaths = [...new Set(paths.filter((value): value is string => typeof value === 'string' && value.startsWith('/')))];
|
||||
if (!cleanTags.length && !cleanPaths.length) {
|
||||
return NextResponse.json({ success: false, message: 'Missing tag or path parameter for cache revalidation' }, { status: 400 });
|
||||
}
|
||||
|
||||
const revalidated: { tag?: string; path?: string } = {};
|
||||
|
||||
if (tag) {
|
||||
revalidateTag(tag, 'default');
|
||||
revalidated.tag = tag;
|
||||
for (const tag of cleanTags) revalidateTag(tag, 'default');
|
||||
for (const path of cleanPaths) {
|
||||
try { revalidatePath(path, 'page'); } catch { revalidatePath(path); }
|
||||
}
|
||||
|
||||
if (path) {
|
||||
try {
|
||||
revalidatePath(path, 'page');
|
||||
} catch {
|
||||
revalidatePath(path);
|
||||
}
|
||||
revalidated.path = path;
|
||||
}
|
||||
|
||||
return NextResponse.json({
|
||||
revalidated: true,
|
||||
...revalidated,
|
||||
now: Date.now(),
|
||||
});
|
||||
return NextResponse.json({ revalidated: true, tags: cleanTags, paths: cleanPaths, now: Date.now() });
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
||||
import React from 'react';
|
||||
import BlogPostPage from './page';
|
||||
import { renderToStaticMarkup } from 'react-dom/server';
|
||||
import BlogPostPage, { generateMetadata } from './page';
|
||||
|
||||
vi.mock('../../../lib/seo', () => ({
|
||||
getSeoConfig: vi.fn().mockResolvedValue({
|
||||
@@ -15,7 +16,9 @@ vi.mock('../../../lib/seo', () => ({
|
||||
}));
|
||||
|
||||
vi.mock('../../../components/BlogPostClient', () => ({
|
||||
default: () => <div data-testid="blog-post-client" />,
|
||||
default: ({ authorName, authorTeam }: { authorName: string; authorTeam: string }) => (
|
||||
<div data-testid="blog-post-client">نویسنده: {authorName} تیم: {authorTeam}</div>
|
||||
),
|
||||
}));
|
||||
|
||||
describe('BlogPostPage FAQPage Schema injection (SEO-P1-07)', () => {
|
||||
@@ -74,6 +77,59 @@ describe('BlogPostPage FAQPage Schema injection (SEO-P1-07)', () => {
|
||||
expect(faqJson.mainEntity[0].name).toBe('آیا این مکمل برای سگ مسن مناسب است؟');
|
||||
});
|
||||
|
||||
it('uses explicit same-day material freshness for dateModified and ignores technical updatedAt', async () => {
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ok:true,json:async()=>({slug:'fresh',title:'Fresh',content:'<p>x</p>',publishedAt:'2026-01-01T01:00:00Z',updatedAt:'2026-01-01T10:00:00Z',contentUpdatedAt:'2026-01-01T12:00:00Z'})}));
|
||||
const jsx=await BlogPostPage({params:Promise.resolve({slug:'fresh'})}); const script:any=React.Children.toArray(jsx.props.children)[0]; const json=JSON.parse(script.props.dangerouslySetInnerHTML.__html); expect(json.dateModified).toBe('2026-01-01T12:00:00.000Z'); expect(json.author['@type']).toBe('Organization'); expect(json.author.name).toBe('کنینا');
|
||||
});
|
||||
|
||||
it('omits dateModified when only technical updatedAt exists', async () => {
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ok:true,json:async()=>({slug:'technical',title:'Technical',content:'<p>x</p>',publishedAt:'2026-01-01T01:00:00Z',updatedAt:'2026-01-01T12:00:00Z',contentUpdatedAt:null})}));
|
||||
const jsx=await BlogPostPage({params:Promise.resolve({slug:'technical'})}); const script:any=React.Children.toArray(jsx.props.children)[0]; const json=JSON.parse(script.props.dangerouslySetInnerHTML.__html); expect(json.dateModified).toBeUndefined();
|
||||
});
|
||||
|
||||
it('uses the stable Organization fallback visibly and in metadata', async () => {
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => ({
|
||||
slug: 'authorless', title: 'Authorless', content: '<p>x</p>', publishedAt: '2026-01-01T00:00:00Z', author: { firstName: '', lastName: '' },
|
||||
}) }));
|
||||
|
||||
const metadata = await generateMetadata({ params: Promise.resolve({ slug: 'authorless' }) });
|
||||
expect((metadata.openGraph as any)?.authors).toEqual(['کنینا']);
|
||||
|
||||
const jsx = await BlogPostPage({ params: Promise.resolve({ slug: 'authorless' }) });
|
||||
const children = React.Children.toArray(jsx.props.children) as any[];
|
||||
const client = children.find((child) => child?.props?.authorName);
|
||||
expect(client.props.authorName).toBe('کنینا');
|
||||
const article = JSON.parse(children[0].props.dangerouslySetInnerHTML.__html);
|
||||
expect(article.author).toMatchObject({
|
||||
'@type': 'Organization',
|
||||
name: 'کنینا',
|
||||
});
|
||||
});
|
||||
|
||||
it('uses a custom authorTeam as the authorless Organization identity in metadata and rendering', async () => {
|
||||
const organizationName = 'تیم دامپزشکی کنینا';
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => ({
|
||||
slug: 'custom-team',
|
||||
title: 'Custom team article',
|
||||
content: '<p>x</p>',
|
||||
publishedAt: '2026-01-01T00:00:00Z',
|
||||
author: null,
|
||||
authorTeam: organizationName,
|
||||
}) }));
|
||||
|
||||
const metadata = await generateMetadata({ params: Promise.resolve({ slug: 'custom-team' }) });
|
||||
expect((metadata.openGraph as any)?.authors).toEqual(['کنینا']);
|
||||
|
||||
const jsx = await BlogPostPage({ params: Promise.resolve({ slug: 'custom-team' }) });
|
||||
const children = React.Children.toArray(jsx.props.children) as any[];
|
||||
const article = JSON.parse(children[0].props.dangerouslySetInnerHTML.__html);
|
||||
expect(article.author).toMatchObject({ '@type': 'Organization', name: 'کنینا' });
|
||||
|
||||
const html = renderToStaticMarkup(jsx);
|
||||
expect(html).toContain('نویسنده: کنینا');
|
||||
expect(html).toContain(`تیم: ${organizationName}`);
|
||||
});
|
||||
|
||||
it('does not inject FAQPage schema when article does not have FAQs', async () => {
|
||||
const blogData = {
|
||||
slug: 'nutrition',
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { validContentUpdatedAt } from "../../../lib/blogDates";
|
||||
import { resolveBlogAuthorIdentity } from "../../../lib/blogAuthor";
|
||||
import React from "react";
|
||||
import { notFound } from 'next/navigation';
|
||||
import type { Metadata } from 'next';
|
||||
@@ -90,12 +92,10 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
|
||||
siteUrl.includes('test') ||
|
||||
siteUrl.includes('dev');
|
||||
|
||||
const authorName = blog.author
|
||||
? `${blog.author.firstName || ''} ${blog.author.lastName || ''}`.trim() || 'نویسنده کنینا'
|
||||
: 'نویسنده و پژوهشگر کنینا';
|
||||
const resolvedAuthor = resolveBlogAuthorIdentity(blog);
|
||||
|
||||
const publishedTime = safeIso(blog.publishedAt) || safeIso(blog.createdAt);
|
||||
const modifiedTime = safeIso(blog.updatedAt) || publishedTime;
|
||||
const modifiedTime = safeIso(validContentUpdatedAt(blog));
|
||||
|
||||
const keywordsList = blog.focusKeywords
|
||||
? blog.focusKeywords.split(',').map((k: string) => k.trim())
|
||||
@@ -147,8 +147,8 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
|
||||
siteName: config.brandNameFa,
|
||||
type: "article",
|
||||
publishedTime,
|
||||
modifiedTime,
|
||||
authors: [authorName],
|
||||
...(modifiedTime ? { modifiedTime } : {}),
|
||||
authors: [resolvedAuthor.name],
|
||||
tags: blog.tags?.map((t: any) => typeof t === 'string' ? t : t?.name).filter(Boolean) || [],
|
||||
},
|
||||
twitter: {
|
||||
@@ -172,9 +172,7 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
||||
const rawSiteUrl = process.env.NEXT_PUBLIC_SITE_URL || config.canonicalBaseUrl || 'https://canina.ir';
|
||||
const siteUrl = rawSiteUrl.replace(/\/+$/, '');
|
||||
|
||||
const authorName = blog.author
|
||||
? `${blog.author.firstName || ''} ${blog.author.lastName || ''}`.trim() || 'نویسنده کنینا'
|
||||
: 'نویسنده و پژوهشگر کنینا';
|
||||
const resolvedAuthor = resolveBlogAuthorIdentity(blog);
|
||||
const publishedDate = safeLocalDate(blog.publishedAt) || safeLocalDate(blog.createdAt);
|
||||
|
||||
const canonicalUrl = blog.canonicalUrl
|
||||
@@ -182,20 +180,19 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
||||
: `${siteUrl}/blog/${slug}`;
|
||||
|
||||
const publishedIso = safeIso(blog.publishedAt) || safeIso(blog.createdAt) || new Date().toISOString();
|
||||
const modifiedIso = safeIso(blog.updatedAt) || publishedIso;
|
||||
const modifiedIso = safeIso(validContentUpdatedAt(blog));
|
||||
|
||||
const sanitizedContent = sanitizeBlogHtml(blog.content);
|
||||
const schemaType = blog.schemaType || 'BlogPosting';
|
||||
|
||||
const authorSchema = blog.author && (blog.author.firstName || blog.author.lastName)
|
||||
const authorSchema = resolvedAuthor.type === 'Person'
|
||||
? {
|
||||
'@type': 'Person',
|
||||
name: authorName,
|
||||
url: `${siteUrl}/about`,
|
||||
name: resolvedAuthor.name,
|
||||
}
|
||||
: {
|
||||
'@type': 'Organization',
|
||||
name: config.brandNameFa || 'کنینا ایران',
|
||||
name: resolvedAuthor.name,
|
||||
url: siteUrl,
|
||||
};
|
||||
|
||||
@@ -212,7 +209,7 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
||||
? [blog.imageUrl.startsWith('http') ? blog.imageUrl : `${siteUrl}${blog.imageUrl.startsWith('/') ? '' : '/'}${blog.imageUrl}`]
|
||||
: [config.ogImageUrl.startsWith('http') ? config.ogImageUrl : `${siteUrl}${config.ogImageUrl.startsWith('/') ? '' : '/'}${config.ogImageUrl}`],
|
||||
datePublished: publishedIso,
|
||||
dateModified: modifiedIso,
|
||||
...(modifiedIso ? { dateModified: modifiedIso } : {}),
|
||||
author: authorSchema,
|
||||
publisher: {
|
||||
'@type': 'Organization',
|
||||
@@ -292,7 +289,8 @@ export default async function BlogPostPage({ params }: { params: Promise<{ slug:
|
||||
<BlogPostClient
|
||||
blog={blog}
|
||||
publishedDate={publishedDate}
|
||||
authorName={authorName}
|
||||
authorName={resolvedAuthor.name}
|
||||
authorTeam={resolvedAuthor.teamName}
|
||||
sanitizedContent={sanitizedContent}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import Blog from "./page";
|
||||
|
||||
const blogPageSpy = vi.fn();
|
||||
|
||||
vi.mock("../../components/BlogPage", () => ({
|
||||
default: (props: unknown) => {
|
||||
blogPageSpy(props);
|
||||
return null;
|
||||
},
|
||||
}));
|
||||
vi.mock("../../lib/seo", () => ({ getPageMetadata: vi.fn() }));
|
||||
vi.mock("../../lib/media", () => ({ getMediaUrl: (value: string) => value }));
|
||||
|
||||
describe("blog page author identity", () => {
|
||||
beforeEach(() => {
|
||||
blogPageSpy.mockClear();
|
||||
vi.stubGlobal("fetch", vi.fn()
|
||||
.mockResolvedValueOnce({
|
||||
ok: true,
|
||||
json: async () => ({ data: [{ id: "b1", slug: "post", title: "Post", content: "Body" }] }),
|
||||
})
|
||||
.mockResolvedValueOnce({ ok: true, json: async () => ({ data: [] }) }));
|
||||
});
|
||||
|
||||
it("uses the scientific content team for an authorless blog card", async () => {
|
||||
const element = await Blog({ searchParams: Promise.resolve({}) });
|
||||
element.type(element.props);
|
||||
|
||||
const props = blogPageSpy.mock.calls[0][0] as { blogs: Array<{ author: string }> };
|
||||
expect(props.blogs[0].author).toBe("کنینا");
|
||||
});
|
||||
});
|
||||
@@ -2,6 +2,7 @@ import BlogPage from "../../components/BlogPage";
|
||||
import type { Metadata } from 'next';
|
||||
import { getPageMetadata } from "../../lib/seo";
|
||||
import { getMediaUrl } from "../../lib/media";
|
||||
import { resolveBlogAuthor } from "../../lib/blogAuthor";
|
||||
|
||||
export async function generateMetadata(): Promise<Metadata> {
|
||||
return getPageMetadata('blog', {
|
||||
@@ -43,8 +44,7 @@ async function getBlogs() {
|
||||
const data = await res.json();
|
||||
const list = Array.isArray(data.data) ? data.data : Array.isArray(data) ? data : [];
|
||||
return list.map((b: any) => {
|
||||
const authorObj = b.author as Record<string, string> | undefined;
|
||||
const authorName = authorObj ? `${authorObj.firstName || ''} ${authorObj.lastName || ''}`.trim() : 'نویسنده کنینا';
|
||||
const authorName = resolveBlogAuthor(b.author);
|
||||
return {
|
||||
id: String(b.id || ''),
|
||||
slug: String(b.slug || ''),
|
||||
@@ -53,6 +53,11 @@ async function getBlogs() {
|
||||
category: b.category?.name || 'دانشنامه و سلامت',
|
||||
categoryId: b.categoryId || undefined,
|
||||
tags: b.tags || [],
|
||||
publishedAt: b.publishedAt,
|
||||
createdAt: b.createdAt,
|
||||
contentUpdatedAt: b.contentUpdatedAt,
|
||||
authorTeam: b.authorTeam,
|
||||
authorRole: b.authorRole,
|
||||
date: b.publishedAt
|
||||
? new Date(String(b.publishedAt)).toLocaleDateString('fa-IR')
|
||||
: b.createdAt
|
||||
@@ -61,7 +66,7 @@ async function getBlogs() {
|
||||
readingTime: b.readingTime || 3,
|
||||
image: getMediaUrl(String(b.imageUrl || b.coverImage || '/assets/images/blog-placeholder.png')),
|
||||
imageAlt: b.imageAlt || b.title,
|
||||
author: authorName || 'نویسنده کنینا',
|
||||
author: authorName,
|
||||
content: String(b.content || ''),
|
||||
featured: Boolean(b.featured),
|
||||
viewCount: Number(b.viewCount) || 0,
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
import { afterEach,describe,expect,it,vi } from "vitest";
|
||||
import { GET } from "./route";
|
||||
afterEach(()=>{vi.unstubAllGlobals();vi.unstubAllEnvs()});
|
||||
describe("blog RSS dates",()=>{it("keeps pubDate immutable and derives lastBuildDate from real valid dates",async()=>{vi.stubEnv("NEXT_PUBLIC_SITE_URL","https://canina.ir");vi.stubGlobal("fetch",vi.fn().mockResolvedValue({ok:true,json:async()=>({data:[{slug:"a",title:"A",status:"PUBLISHED",publishedAt:"2026-01-01T00:00:00Z",contentUpdatedAt:"2026-01-03T00:00:00Z",updatedAt:"2026-01-04T00:00:00Z"}]})}));const xml=await (await GET()).text();expect(xml).toContain(`<pubDate>${new Date("2026-01-01T00:00:00Z").toUTCString()}</pubDate>`);expect(xml).toContain(`<lastBuildDate>${new Date("2026-01-03T00:00:00Z").toUTCString()}</lastBuildDate>`);});it("uses the stable fallback author for authorless posts",async()=>{vi.stubGlobal("fetch",vi.fn().mockResolvedValue({ok:true,json:async()=>({data:[{slug:"a",title:"A",status:"PUBLISHED",publishedAt:"2026-01-01T00:00:00Z",author:{firstName:"",lastName:""}}]})}));const xml=await (await GET()).text();expect(xml).toContain("<author>کنینا</author>");});});
|
||||
@@ -1,3 +1,5 @@
|
||||
import { validContentUpdatedAt, publicationDate } from '../../../lib/blogDates';
|
||||
import { BLOG_AUTHOR_FALLBACK } from '../../../lib/blogAuthor';
|
||||
import { NextResponse } from 'next/server';
|
||||
|
||||
export const dynamic = 'force-dynamic';
|
||||
@@ -23,8 +25,9 @@ export async function GET() {
|
||||
const title = escapeXml(b.title || '');
|
||||
const link = `${baseUrl}/blog/${b.slug}`;
|
||||
const description = escapeXml(b.excerpt || b.metaDescription || '');
|
||||
const pubDate = b.publishedAt ? new Date(b.publishedAt).toUTCString() : b.createdAt ? new Date(b.createdAt).toUTCString() : new Date().toUTCString();
|
||||
const author = escapeXml(b.author ? `${b.author.firstName || ''} ${b.author.lastName || ''}`.trim() : 'کنینا فارما');
|
||||
const pubDate = new Date(publicationDate(b)!).toUTCString();
|
||||
const personName = b.author ? `${b.author.firstName || ''} ${b.author.lastName || ''}`.trim() : '';
|
||||
const author = escapeXml(personName || BLOG_AUTHOR_FALLBACK);
|
||||
const category = escapeXml(b.category?.name || 'دانشنامه سلامت حیوانات');
|
||||
|
||||
return `
|
||||
@@ -41,6 +44,8 @@ export async function GET() {
|
||||
})
|
||||
.join('');
|
||||
|
||||
const realDates = blogs.map((b) => validContentUpdatedAt(b) || publicationDate(b)).filter((d): d is string => Boolean(d)).map((d) => new Date(d).getTime());
|
||||
const lastBuildDate = realDates.length ? new Date(Math.max(...realDates)).toUTCString() : undefined;
|
||||
const rssFeed = `<?xml version="1.0" encoding="UTF-8"?>
|
||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
||||
<channel>
|
||||
@@ -48,7 +53,7 @@ export async function GET() {
|
||||
<link>${baseUrl}/blog</link>
|
||||
<description>جدیدترین مقالات علمی در زمینه مکملهای تخصصی، تغذیه و سلامت سگ و گربه از داروسازی کنینا آلمان</description>
|
||||
<language>fa-ir</language>
|
||||
<lastBuildDate>${new Date().toUTCString()}</lastBuildDate>
|
||||
${lastBuildDate ? `<lastBuildDate>${lastBuildDate}</lastBuildDate>` : ""}
|
||||
<atom:link href="${baseUrl}/blog/rss.xml" rel="self" type="application/rss+xml"/>
|
||||
${itemsXml}
|
||||
</channel>
|
||||
|
||||
@@ -10,7 +10,9 @@ export default function ErrorBoundary({
|
||||
reset: () => void;
|
||||
}) {
|
||||
useEffect(() => {
|
||||
console.error("Global Application Error:", error);
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.error("Global Application Error:", error?.message || "Unknown error");
|
||||
}
|
||||
}, [error]);
|
||||
|
||||
return <ServerErrorPage onRetry={reset} />;
|
||||
|
||||
@@ -186,3 +186,21 @@
|
||||
.animate-marquee:hover {
|
||||
animation-play-state: paused;
|
||||
}
|
||||
|
||||
/* Article Links & Provenance Styling */
|
||||
.article-html-content a,
|
||||
.prose a {
|
||||
color: var(--color-canina-blue) !important;
|
||||
font-weight: 700 !important;
|
||||
text-decoration: underline !important;
|
||||
text-decoration-color: rgba(30, 64, 83, 0.4) !important;
|
||||
text-underline-offset: 4px !important;
|
||||
transition: all 0.2s ease-in-out !important;
|
||||
}
|
||||
|
||||
.article-html-content a:hover,
|
||||
.prose a:hover {
|
||||
color: #0052cc !important;
|
||||
text-decoration-color: #0052cc !important;
|
||||
opacity: 1 !important;
|
||||
}
|
||||
@@ -178,6 +178,12 @@ export default async function RootLayout({
|
||||
<link rel="dns-prefetch" href="https://scripts.clarity.ms" />
|
||||
</head>
|
||||
<body className="min-h-screen bg-medical-gray-50 font-sans" suppressHydrationWarning>
|
||||
<a
|
||||
href="#main-content"
|
||||
className="sr-only focus:not-sr-only focus:fixed focus:top-4 focus:right-4 focus:z-[999999] focus:px-4 focus:py-2.5 focus:bg-canina-blue focus:text-white focus:font-black focus:rounded-xl focus:shadow-2xl focus:outline-none focus:ring-2 focus:ring-white font-vazir text-sm transition-all"
|
||||
>
|
||||
پرش به محتوای اصلی
|
||||
</a>
|
||||
{/* Google Tag Manager (noscript fallback) */}
|
||||
{isGtmEnabled && (
|
||||
<noscript>
|
||||
|
||||
@@ -0,0 +1,284 @@
|
||||
"use client";
|
||||
|
||||
import React, { useState } from "react";
|
||||
import {
|
||||
Stethoscope,
|
||||
Upload,
|
||||
CheckCircle2,
|
||||
ShieldCheck,
|
||||
FileText,
|
||||
Clock,
|
||||
Send,
|
||||
Phone,
|
||||
Sparkles,
|
||||
AlertCircle
|
||||
} from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import api from "../../lib/services/api";
|
||||
|
||||
export default function PrescriptionPageClient() {
|
||||
const [file, setFile] = useState<File | null>(null);
|
||||
const [phone, setPhone] = useState("");
|
||||
const [petName, setPetName] = useState("");
|
||||
const [petType, setPetType] = useState<"سگ" | "گربه">("سگ");
|
||||
const [notes, setNotes] = useState("");
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const [isSuccess, setIsSuccess] = useState(false);
|
||||
|
||||
const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
if (e.target.files && e.target.files[0]) {
|
||||
setFile(e.target.files[0]);
|
||||
}
|
||||
};
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!file) {
|
||||
toast.error("لطفاً تصویر یا فایل PDF نسخه پزشکی را بارگذاری کنید.");
|
||||
return;
|
||||
}
|
||||
const cleanPhone = phone.trim();
|
||||
if (!/^09\d{9}$/.test(cleanPhone)) {
|
||||
toast.error("لطفاً یک شماره همراه معتبر ۱۱ رقمی وارد نمایید (مثال: ۰۹۱۲۳۴۵۶۷۸۹).");
|
||||
return;
|
||||
}
|
||||
|
||||
setIsSubmitting(true);
|
||||
try {
|
||||
// 1. Submit to public B2B inquiry endpoint with prescription classification
|
||||
await api.post("/b2b/inquire", {
|
||||
companyName: `نسخه پزشکی دامپزشک (${petType} به نام ${petName || 'بدون نام'})`,
|
||||
contactName: petName ? `سرپرست: ${petName}` : "مراجعهکننده آنلاین",
|
||||
email: `rx-${Date.now()}@canina.ir`,
|
||||
phone: cleanPhone,
|
||||
businessType: `ثبت نسخه دارویی (${petType})`,
|
||||
estimatedVolume: "نسخه تکموردی بیمار",
|
||||
message: `نام پت: ${petName || 'قید نشده'} | گونه: ${petType} | فایل: ${file.name} | توضیحات نسخه: ${notes || 'توضیحی ثبت نشده'}`,
|
||||
});
|
||||
|
||||
setIsSubmitting(false);
|
||||
setIsSuccess(true);
|
||||
toast.success("نسخه پزشکی شما با موفقیت ثبت شد. دامپزشک کشیک کنینا به زودی با شما تماس خواهد گرفت.");
|
||||
} catch {
|
||||
setIsSubmitting(false);
|
||||
toast.error("خطایی در ثبت اطلاعات نسخه رخ داد. لطفاً مجدداً تلاش کنید.");
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="bg-medical-gray-50 min-h-screen font-vazir py-12 px-4 sm:px-6 lg:px-8" dir="rtl">
|
||||
<div className="max-w-4xl mx-auto space-y-8">
|
||||
|
||||
{/* Header */}
|
||||
<div className="text-center space-y-4">
|
||||
<div className="inline-flex items-center gap-2 px-4 py-2 bg-emerald-50 text-emerald-800 border border-emerald-200 rounded-full text-xs font-bold shadow-xs">
|
||||
<Stethoscope className="w-4 h-4 text-emerald-600" />
|
||||
سامانه رسمی ارزیابی و تطبیق نسخه دارویی پت
|
||||
</div>
|
||||
<h1 className="text-3xl sm:text-4xl font-black text-medical-gray-900 tracking-tight">
|
||||
ثبت آنلاین نسخه دامپزشک و تطبیق مکملهای <span className="text-canina-blue">کنینا آلمان</span>
|
||||
</h1>
|
||||
<p className="text-sm sm:text-base text-medical-gray-600 max-w-2xl mx-auto leading-relaxed">
|
||||
نسخه تجویزی پزشک معالج همدم خود را بارگذاری نمایید تا کادر دامپزشکان متخصص کنینا ایران مکملهای دارویی اصل و سازگار با دوز تجویزی را ارزیابی و به شما معرفی کنند.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Benefits bar */}
|
||||
<div className="grid sm:grid-cols-3 gap-4">
|
||||
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
|
||||
<div className="w-10 h-10 rounded-xl bg-emerald-50 text-emerald-600 flex items-center justify-center shrink-0">
|
||||
<ShieldCheck className="w-5 h-5" />
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="text-xs font-black text-medical-gray-900">تطبیق دقیق دارویی</h4>
|
||||
<p className="text-[11px] text-medical-gray-500">معادلسازی برندهای آلمانی و دوز</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
|
||||
<div className="w-10 h-10 rounded-xl bg-blue-50 text-canina-blue flex items-center justify-center shrink-0">
|
||||
<Clock className="w-5 h-5" />
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="text-xs font-black text-medical-gray-900">پاسخگویی سریع</h4>
|
||||
<p className="text-[11px] text-medical-gray-500">بررسی توسط دامپزشک زیر ۲ ساعت</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
|
||||
<div className="w-10 h-10 rounded-xl bg-amber-50 text-amber-600 flex items-center justify-center shrink-0">
|
||||
<Sparkles className="w-5 h-5" />
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="text-xs font-black text-medical-gray-900">مشاوره تغذیه رایگان</h4>
|
||||
<p className="text-[11px] text-medical-gray-500">همراه با راهنمای رژیم و دوز مصرف</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Form Card */}
|
||||
<div className="bg-white rounded-3xl border border-medical-gray-200 shadow-xl overflow-hidden p-6 sm:p-10">
|
||||
{isSuccess ? (
|
||||
<div className="text-center py-12 space-y-4">
|
||||
<div className="w-20 h-20 bg-emerald-100 text-emerald-600 rounded-full flex items-center justify-center mx-auto shadow-lg shadow-emerald-500/20">
|
||||
<CheckCircle2 className="w-10 h-10" />
|
||||
</div>
|
||||
<h3 className="text-2xl font-black text-medical-gray-900">نسخه پزشکی با موفقیت ثبت شد</h3>
|
||||
<p className="text-sm text-medical-gray-600 max-w-md mx-auto leading-relaxed">
|
||||
اطلاعات نسخه برای کادر دامپزشکی کنینا ارسال شد. همکاران ما پس از بررسی دقیق فرمولاسیون و انطباق دوز دارویی، از طریق شماره تماس واردشده با شما ارتباط خواهند گرفت.
|
||||
</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setFile(null);
|
||||
setNotes("");
|
||||
setPetName("");
|
||||
setIsSuccess(false);
|
||||
}}
|
||||
className="inline-flex items-center gap-2 bg-canina-blue text-white px-6 py-3 rounded-xl font-bold text-xs shadow-md hover:bg-canina-blue/90 transition-all cursor-pointer"
|
||||
>
|
||||
ثبت نسخه جدید دیگر
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<form onSubmit={handleSubmit} className="space-y-6">
|
||||
|
||||
{/* Pet Info */}
|
||||
<div className="grid sm:grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||
گونه حیوان خانگی <span className="text-red-500">*</span>
|
||||
</label>
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setPetType("سگ")}
|
||||
className={`p-3 rounded-2xl border text-xs font-black flex items-center justify-center gap-2 transition-all cursor-pointer ${
|
||||
petType === "سگ"
|
||||
? "border-canina-blue bg-blue-50/50 text-canina-blue ring-2 ring-canina-blue/20"
|
||||
: "border-medical-gray-200 text-medical-gray-600 hover:bg-medical-gray-50"
|
||||
}`}
|
||||
>
|
||||
🐶 سگ
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setPetType("گربه")}
|
||||
className={`p-3 rounded-2xl border text-xs font-black flex items-center justify-center gap-2 transition-all cursor-pointer ${
|
||||
petType === "گربه"
|
||||
? "border-canina-blue bg-blue-50/50 text-canina-blue ring-2 ring-canina-blue/20"
|
||||
: "border-medical-gray-200 text-medical-gray-600 hover:bg-medical-gray-50"
|
||||
}`}
|
||||
>
|
||||
🐱 گربه
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label htmlFor="rx-petName" className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||
نام همدم (پت)
|
||||
</label>
|
||||
<input
|
||||
id="rx-petName"
|
||||
type="text"
|
||||
placeholder="مثال: لئو، ببری، جسی..."
|
||||
value={petName}
|
||||
onChange={(e) => setPetName(e.target.value)}
|
||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Phone */}
|
||||
<div>
|
||||
<label htmlFor="rx-phone" className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||
شماره تماس همراه (جهت دریافت نتیجه ارزیابی) <span className="text-red-500">*</span>
|
||||
</label>
|
||||
<div className="relative">
|
||||
<input
|
||||
id="rx-phone"
|
||||
type="tel"
|
||||
required
|
||||
placeholder="۰۹۱۲۳۴۵۶۷۸۹"
|
||||
value={phone}
|
||||
onChange={(e) => setPhone(e.target.value)}
|
||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 pl-10 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all dir-ltr text-right"
|
||||
/>
|
||||
<Phone className="w-4 h-4 text-medical-gray-400 absolute left-3 top-1/2 -translate-y-1/2" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* File Upload Zone */}
|
||||
<div>
|
||||
<label className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||
بارگذاری تصویر یا فایل PDF نسخه <span className="text-red-500">*</span>
|
||||
</label>
|
||||
<div className="relative border-2 border-dashed border-medical-gray-300 hover:border-canina-blue rounded-3xl p-6 sm:p-8 text-center transition-all bg-medical-gray-50/50 hover:bg-blue-50/20">
|
||||
<input
|
||||
id="rx-file-input"
|
||||
type="file"
|
||||
accept="image/jpeg,image/png,image/webp,application/pdf"
|
||||
required
|
||||
onChange={handleFileChange}
|
||||
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
|
||||
/>
|
||||
<div className="space-y-3 pointer-events-none">
|
||||
<div className="w-14 h-14 rounded-2xl bg-canina-blue/10 text-canina-blue flex items-center justify-center mx-auto">
|
||||
<Upload className="w-7 h-7" />
|
||||
</div>
|
||||
{file ? (
|
||||
<div className="space-y-1">
|
||||
<p className="text-sm font-black text-medical-gray-900">{file.name}</p>
|
||||
<p className="text-xs text-emerald-600 font-bold">فایل با موفقیت انتخاب شد (برای تغییر کلیک کنید)</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-1">
|
||||
<p className="text-sm font-black text-medical-gray-900">
|
||||
برای انتخاب فایل یا عکس نسخه، اینجا کلیک کنید یا فایل را بکشید
|
||||
</p>
|
||||
<p className="text-xs text-medical-gray-400">
|
||||
فرمتهای مجاز: JPG, PNG, WEBP یا PDF (حداکثر ۱۰ مگابایت)
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Notes */}
|
||||
<div>
|
||||
<label htmlFor="rx-notes" className="block text-xs font-bold text-medical-gray-700 mb-2">
|
||||
توضیحات تکمیلی یا علائم حیوان (اختیاری)
|
||||
</label>
|
||||
<textarea
|
||||
id="rx-notes"
|
||||
rows={3}
|
||||
placeholder="اگر حیوان به ماده غذایی خاصی حساسیت دارد یا داروی همزمانی مصرف میکند در اینجا ذکر فرمایید..."
|
||||
value={notes}
|
||||
onChange={(e) => setNotes(e.target.value)}
|
||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Submit Button */}
|
||||
<button
|
||||
type="submit"
|
||||
disabled={isSubmitting}
|
||||
className="w-full bg-canina-blue hover:bg-canina-blue/90 text-white font-black text-base py-4 rounded-2xl shadow-xl shadow-canina-blue/20 transition-all flex items-center justify-center gap-2 cursor-pointer disabled:opacity-50"
|
||||
>
|
||||
{isSubmitting ? (
|
||||
<span>در حال ارسال نسخه و ثبت درخواست...</span>
|
||||
) : (
|
||||
<>
|
||||
<Send className="w-5 h-5" />
|
||||
<span>ارسال و ثبت نسخه جهت ارزیابی دامپزشک</span>
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
</form>
|
||||
)}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
import React from "react";
|
||||
import type { Metadata } from "next";
|
||||
import PrescriptionPageClient from "./PrescriptionPageClient";
|
||||
import { getPageMetadata } from "../../lib/seo";
|
||||
|
||||
export async function generateMetadata(): Promise<Metadata> {
|
||||
return getPageMetadata('prescriptions', {
|
||||
canonicalPath: '/prescriptions',
|
||||
fallbackTitle: 'ثبت و ارزیابی نسخه دامپزشک | مشاوره تخصصی دارویی کنینا ایران',
|
||||
fallbackDesc: 'سامانه آنلاین آپلود و تحلیل نسخه دامپزشک جهت تطبیق با مکملهای دارویی اصل Canina Pharma آلمان با نظارت کادر مجرب دامپزشکان.',
|
||||
});
|
||||
}
|
||||
|
||||
export default function PrescriptionPage() {
|
||||
return <PrescriptionPageClient />;
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
import React from "react";
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import { render, fireEvent, waitFor } from "@testing-library/react";
|
||||
|
||||
const mockPost = vi.fn().mockResolvedValue({ data: { success: true } });
|
||||
vi.mock("axios", () => {
|
||||
const mAxios = {
|
||||
post: vi.fn(() => Promise.resolve({ data: { success: true } })),
|
||||
get: vi.fn(() => Promise.resolve({ data: { success: true } })),
|
||||
interceptors: {
|
||||
request: { use: vi.fn(), eject: vi.fn() },
|
||||
response: { use: vi.fn(), eject: vi.fn() },
|
||||
},
|
||||
create: () => mAxios,
|
||||
};
|
||||
return { default: mAxios };
|
||||
});
|
||||
|
||||
vi.mock("sonner", () => ({
|
||||
toast: {
|
||||
success: vi.fn(),
|
||||
error: vi.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
import api from "../../lib/services/api";
|
||||
import PrescriptionPageClient from "./PrescriptionPageClient";
|
||||
|
||||
describe("PrescriptionPageClient Suite (B2B-03)", () => {
|
||||
it("renders online prescription portal and submits without requiring login", async () => {
|
||||
const { container } = render(<PrescriptionPageClient />);
|
||||
|
||||
const phoneInput = container.querySelector("#rx-phone") as HTMLInputElement;
|
||||
const petNameInput = container.querySelector("#rx-petName") as HTMLInputElement;
|
||||
const fileInput = container.querySelector("#rx-file-input") as HTMLInputElement;
|
||||
const form = container.querySelector("form") as HTMLFormElement;
|
||||
|
||||
expect(phoneInput).not.toBeNull();
|
||||
expect(fileInput).not.toBeNull();
|
||||
expect(form).not.toBeNull();
|
||||
|
||||
// Create fake file
|
||||
const fakeFile = new File(["dummy content"], "prescription.jpg", { type: "image/jpeg" });
|
||||
|
||||
fireEvent.change(phoneInput, { target: { value: "09121114455" } });
|
||||
fireEvent.change(petNameInput, { target: { value: "لئو" } });
|
||||
fireEvent.change(fileInput, { target: { files: [fakeFile] } });
|
||||
|
||||
fireEvent.submit(form);
|
||||
|
||||
await waitFor(() => {
|
||||
expect(api.post).toHaveBeenCalledWith(
|
||||
"/b2b/inquire",
|
||||
expect.objectContaining({
|
||||
phone: "09121114455",
|
||||
companyName: expect.stringContaining("لئو"),
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -7,6 +7,7 @@ export async function generateMetadata(): Promise<Metadata> {
|
||||
canonicalPath: '/search',
|
||||
fallbackTitle: 'جستجوی هوشمند مکملها و دانشنامه سلامت',
|
||||
fallbackDesc: 'جستجوی سریع در کاتالوگ محصولات، بیماریها، علائم بالینی و مقالات سلامت کنینا ایران.',
|
||||
noIndex: true,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { validContentUpdatedAt, publicationDate } from '../../lib/blogDates';
|
||||
import { NextResponse } from 'next/server';
|
||||
|
||||
export const dynamic = 'force-dynamic';
|
||||
@@ -7,7 +8,8 @@ type SitemapBlog = {
|
||||
slug: string;
|
||||
noIndex?: boolean;
|
||||
status: string;
|
||||
updatedAt?: string;
|
||||
publishedAt?: string;
|
||||
contentUpdatedAt?: string;
|
||||
createdAt?: string;
|
||||
featured?: boolean;
|
||||
title?: string;
|
||||
@@ -47,11 +49,7 @@ export async function GET() {
|
||||
const urlsXml = blogRoutes
|
||||
.map((blog) => {
|
||||
const loc = `${baseUrl}/blog/${encodeURIComponent(blog.slug)}`;
|
||||
const lastmod = blog.updatedAt
|
||||
? new Date(blog.updatedAt).toISOString()
|
||||
: blog.createdAt
|
||||
? new Date(blog.createdAt).toISOString()
|
||||
: new Date().toISOString();
|
||||
const lastmod = new Date(validContentUpdatedAt(blog) || publicationDate(blog)!).toISOString();
|
||||
const priority = blog.featured ? '0.9' : '0.7';
|
||||
const primaryImg = blog.ogImage || blog.imageUrl;
|
||||
const title = blog.title || 'مقاله وبلاگ تخصصی کنینا';
|
||||
|
||||
@@ -16,7 +16,7 @@ describe('sitemap blog retrieval', () => {
|
||||
vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://stage.canina.ir');
|
||||
const fetchMock = vi.fn()
|
||||
.mockResolvedValueOnce({ ok: true, json: async () => ({ data: [
|
||||
{ slug: 'first', status: 'PUBLISHED', updatedAt: '2026-10-01', featured: true },
|
||||
{ slug: 'first', status: 'PUBLISHED', publishedAt: '2026-10-01', contentUpdatedAt: '2026-10-02', updatedAt: '2026-10-03', featured: true },
|
||||
{ slug: 'hidden', status: 'PUBLISHED', noIndex: true },
|
||||
{ slug: 'draft', status: 'DRAFT' },
|
||||
], meta: { lastPage: 2 } }) })
|
||||
@@ -32,7 +32,7 @@ describe('sitemap blog retrieval', () => {
|
||||
const blogs = routes.filter(r => r.url.includes('/blog/'));
|
||||
expect(blogs.map(r => r.url)).toEqual(['https://stage.canina.ir/blog/first', 'https://stage.canina.ir/blog/last']);
|
||||
expect(blogs[0].priority).toBe(0.9);
|
||||
expect(blogs[0].lastModified).toEqual(new Date('2026-10-01'));
|
||||
expect(blogs[0].lastModified).toEqual(new Date('2026-10-02'));
|
||||
});
|
||||
|
||||
it('terminates on an empty page even when pagination metadata is stale', async () => {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { MetadataRoute } from 'next';
|
||||
import { validContentUpdatedAt, publicationDate } from '../lib/blogDates';
|
||||
import { productService } from '../lib/services/productService';
|
||||
|
||||
export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
|
||||
@@ -30,12 +31,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
|
||||
changeFrequency: 'weekly',
|
||||
priority: 0.8,
|
||||
},
|
||||
{
|
||||
url: `${baseUrl}/search`,
|
||||
lastModified: new Date(),
|
||||
changeFrequency: 'weekly',
|
||||
priority: 0.5,
|
||||
},
|
||||
|
||||
{
|
||||
url: `${baseUrl}/about`,
|
||||
lastModified: new Date(),
|
||||
@@ -91,7 +87,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
|
||||
const apiUrl = process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4001/api';
|
||||
const normalizedApiUrl = apiUrl.replace(/\/$/, '');
|
||||
const apiBase = normalizedApiUrl.endsWith('/api') ? normalizedApiUrl : `${normalizedApiUrl}/api`;
|
||||
type SitemapBlog = { slug: string; noIndex?: boolean; status: string; updatedAt?: string; featured?: boolean };
|
||||
type SitemapBlog = { slug:string; noIndex?:boolean; status:string; publishedAt?:string; createdAt?:string; contentUpdatedAt?:string; featured?:boolean };
|
||||
// The public list includes article bodies. Keep requests small and bypass
|
||||
// Next's 2MB per-entry data cache, even for an unusually large article.
|
||||
let page = 1;
|
||||
@@ -106,7 +102,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
|
||||
.filter((b) => !b.noIndex && b.status === 'PUBLISHED')
|
||||
.map((b): MetadataRoute.Sitemap[number] => ({
|
||||
url: `${baseUrl}/blog/${b.slug}`,
|
||||
lastModified: b.updatedAt ? new Date(b.updatedAt) : new Date(),
|
||||
lastModified: new Date(validContentUpdatedAt(b) || publicationDate(b)!),
|
||||
changeFrequency: 'weekly',
|
||||
priority: b.featured ? 0.9 : 0.7,
|
||||
})));
|
||||
|
||||
@@ -36,7 +36,9 @@ describe('Sub-sitemaps and robots.ts integration (SEO-P1-10)', () => {
|
||||
slug: 'puppy-nutrition',
|
||||
title: 'تغذیه توله سگ',
|
||||
status: 'PUBLISHED',
|
||||
updatedAt: '2026-10-10T12:00:00.000Z',
|
||||
updatedAt: '2026-10-12T12:00:00.000Z',
|
||||
publishedAt: '2026-10-10T12:00:00.000Z',
|
||||
contentUpdatedAt: '2026-10-11T12:00:00.000Z',
|
||||
featured: true,
|
||||
imageUrl: '/uploads/puppy.jpg',
|
||||
},
|
||||
@@ -57,6 +59,7 @@ describe('Sub-sitemaps and robots.ts integration (SEO-P1-10)', () => {
|
||||
|
||||
expect(xml).toContain('<loc>https://canina.ir/blog/puppy-nutrition</loc>');
|
||||
expect(xml).toContain('<priority>0.9</priority>');
|
||||
expect(xml).toContain('<lastmod>2026-10-11T12:00:00.000Z</lastmod>');
|
||||
expect(xml).toContain('<image:loc>https://canina.ir/uploads/puppy.jpg</image:loc>');
|
||||
expect(xml).toContain('تغذیه توله سگ');
|
||||
expect(xml).not.toContain('hidden-blog');
|
||||
|
||||
@@ -12,15 +12,38 @@ const apiBase = API_URL.endsWith('/api') ? API_URL : `${API_URL.replace(/\/$/, '
|
||||
|
||||
async function getWikiTerm(key: string) {
|
||||
try {
|
||||
// 1. Try scientific terms endpoint
|
||||
const res = await fetch(`${apiBase}/wiki/${encodeURIComponent(key)}`, {
|
||||
next: { revalidate: 3600, tags: ['wiki', `wiki-${key}`] }
|
||||
});
|
||||
if (!res.ok) return null;
|
||||
return await res.json();
|
||||
if (res.ok) {
|
||||
return await res.json();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[Wiki] Error fetching term:', error);
|
||||
return null;
|
||||
console.warn('[Wiki] /wiki/:key failed, trying /ingredients fallback:', error);
|
||||
}
|
||||
|
||||
try {
|
||||
// 2. Fallback to ingredients endpoint if slug is an ingredient slug
|
||||
const ingRes = await fetch(`${apiBase}/ingredients/${encodeURIComponent(key)}`, {
|
||||
next: { revalidate: 3600, tags: ['ingredients', `ing-${key}`] }
|
||||
});
|
||||
if (ingRes.ok) {
|
||||
const ing = await ingRes.json();
|
||||
return {
|
||||
key: ing.slug,
|
||||
term: ing.nameFa || ing.nameEn || ing.slug,
|
||||
definition: ing.description || `بررسی تخصصی ترکیب دارویی و خواص ${ing.nameFa || ing.nameEn} در کاتالوگ مکملهای کنینا آلمان.`,
|
||||
metaTitle: `خواص دارویی ${ing.nameFa || ing.nameEn} | دانشنامه کنینا ایران`,
|
||||
metaDescription: (ing.description || '').slice(0, 155),
|
||||
wikiId: ing.slug,
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[Wiki] Error fetching ingredient fallback:', error);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
async function getRelatedProducts(termName: string) {
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect } from 'react';
|
||||
import { useEffect, useRef } from 'react';
|
||||
import { usePathname } from 'next/navigation';
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
dataLayer?: any[];
|
||||
clarity?: any;
|
||||
gtag?: (...args: any[]) => void;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,12 +18,46 @@ interface AnalyticsDeferredProps {
|
||||
}
|
||||
|
||||
export default function AnalyticsDeferred({ gtmId, gaId, clarityId }: AnalyticsDeferredProps) {
|
||||
const pathname = usePathname();
|
||||
const loadedRef = useRef(false);
|
||||
const initialPathRef = useRef<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!initialPathRef.current && pathname) {
|
||||
initialPathRef.current = pathname;
|
||||
}
|
||||
}, [pathname]);
|
||||
|
||||
// Track client-side page views on Next.js route transitions
|
||||
useEffect(() => {
|
||||
if (!pathname || !loadedRef.current) return;
|
||||
if (pathname === initialPathRef.current) return;
|
||||
|
||||
// 1. Google Analytics 4 page_view event on client navigation
|
||||
if (gaId && typeof window !== 'undefined' && typeof window.gtag === 'function') {
|
||||
window.gtag('event', 'page_view', {
|
||||
page_path: pathname,
|
||||
page_location: window.location.href,
|
||||
page_title: typeof document !== 'undefined' ? document.title : '',
|
||||
});
|
||||
}
|
||||
|
||||
// 2. Google Tag Manager page_view event on client navigation
|
||||
if (gtmId && typeof window !== 'undefined' && Array.isArray(window.dataLayer)) {
|
||||
window.dataLayer.push({
|
||||
event: 'page_view',
|
||||
page_path: pathname,
|
||||
});
|
||||
}
|
||||
}, [pathname, gaId, gtmId]);
|
||||
|
||||
useEffect(() => {
|
||||
let loaded = false;
|
||||
|
||||
const loadAnalytics = () => {
|
||||
if (loaded) return;
|
||||
loaded = true;
|
||||
loadedRef.current = true;
|
||||
|
||||
// Clean up event listeners
|
||||
window.removeEventListener('scroll', loadAnalytics);
|
||||
@@ -42,10 +78,12 @@ export default function AnalyticsDeferred({ gtmId, gaId, clarityId }: AnalyticsD
|
||||
// 2. Google Analytics 4 (ensures GA4 hits fire directly even if GTM container lacks GA4 config tag)
|
||||
if (gaId) {
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(...args: any[]) {
|
||||
window.dataLayer?.push(args);
|
||||
function gtag(..._args: any[]) {
|
||||
// Note: Google's gtag.js specifically expects the native `arguments` object.
|
||||
// Pushing an ES6 Array causes gtag.js to silently ignore tracking commands.
|
||||
window.dataLayer?.push(arguments);
|
||||
}
|
||||
(window as any).gtag = gtag;
|
||||
window.gtag = gtag;
|
||||
gtag('js', new Date());
|
||||
gtag('config', gaId, { page_path: window.location.pathname });
|
||||
|
||||
@@ -94,6 +132,7 @@ export default function AnalyticsDeferred({ gtmId, gaId, clarityId }: AnalyticsD
|
||||
|
||||
return () => {
|
||||
loaded = true;
|
||||
loadedRef.current = false;
|
||||
clearTimeout(timer);
|
||||
if (idleId !== undefined) window.cancelIdleCallback(idleId);
|
||||
window.removeEventListener('scroll', loadAnalytics);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
"use client";
|
||||
import { useUserStore } from "../lib/store/userStore";
|
||||
import React, { useState, useMemo, useEffect, useCallback } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
import { toPersian, isProductOutOfStock } from "../lib/utils";
|
||||
@@ -87,7 +88,8 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
|
||||
const { addItem } = useCartStore();
|
||||
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
|
||||
const [isAdding, setIsAdding] = useState(false);
|
||||
const activePet = usePetStore(state => state.pets.find(p => p.id === state.activePetId) || null);
|
||||
const isLoggedIn = useUserStore(s => s.isLoggedIn);
|
||||
const activePet = usePetStore(state => (isLoggedIn ? (state.pets.find(p => p.id === state.activePetId) || null) : null));
|
||||
const { showPrices, allowCart, showPreorderBtn } = useCatalogMode();
|
||||
const productUrl = `/shop/${product.slug || product.id}`;
|
||||
|
||||
@@ -129,15 +131,11 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
|
||||
href={productUrl}
|
||||
className="group bg-white rounded-[2.5rem] border border-medical-gray-200 overflow-hidden hover:shadow-2xl transition-all flex flex-col h-full relative"
|
||||
>
|
||||
{product.specialBadge && (
|
||||
<div className="absolute top-4 right-4 z-10 bg-canina-blue text-white text-2xs font-black uppercase tracking-widest px-3 py-1 rounded-full shadow-lg">
|
||||
{product.specialBadge}
|
||||
</div>
|
||||
)}
|
||||
{/* SpecialBadge moved below image to avoid covering product photo */}
|
||||
|
||||
{compatibility && (
|
||||
<div className={`absolute top-14 right-4 z-10 text-3xs font-black uppercase tracking-widest px-3 py-1 rounded-full shadow-md flex items-center gap-1 ${compatibility.type === 'alert' ? 'bg-amber-100 text-amber-700' :
|
||||
compatibility.type === 'success' ? 'bg-green-100 text-green-700' : 'bg-medical-gray-100 text-medical-gray-600'
|
||||
<div className={`absolute top-4 right-4 z-10 text-3xs font-black uppercase tracking-widest px-2.5 py-1 rounded-full shadow-md flex items-center gap-1 backdrop-blur-xs ${compatibility.type === 'alert' ? 'bg-amber-500/90 text-white' :
|
||||
compatibility.type === 'success' ? 'bg-emerald-600/90 text-white' : 'bg-canina-blue/90 text-white'
|
||||
}`}>
|
||||
{compatibility.type === 'alert' ? (
|
||||
forBoth ? (
|
||||
@@ -184,6 +182,13 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
|
||||
</div>
|
||||
|
||||
<div className="p-6 flex flex-col flex-1">
|
||||
{product.specialBadge && (
|
||||
<div className="mb-2">
|
||||
<span className="inline-block bg-canina-blue/10 text-canina-blue border border-canina-blue/20 text-[10px] font-black px-2.5 py-1 rounded-lg line-clamp-1 font-vazir" title={product.specialBadge}>
|
||||
{product.specialBadge}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
<div className="text-2xs font-bold text-canina-blue uppercase tracking-widest mb-2">{product.category}</div>
|
||||
<div className="flex flex-col gap-1 mb-3">
|
||||
<h3 dir="rtl" className="text-base font-black text-medical-gray-900 group-hover:text-canina-blue transition-colors leading-tight text-right font-vazir">
|
||||
@@ -273,7 +278,8 @@ const ArchiveProductListItem: React.FC<{ product: Product }> = ({ product }) =>
|
||||
const { addItem } = useCartStore();
|
||||
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
|
||||
const [isAdding, setIsAdding] = useState(false);
|
||||
const activePet = usePetStore(state => state.pets.find(p => p.id === state.activePetId) || null);
|
||||
const isLoggedIn = useUserStore(s => s.isLoggedIn);
|
||||
const activePet = usePetStore(state => (isLoggedIn ? (state.pets.find(p => p.id === state.activePetId) || null) : null));
|
||||
const productUrl = `/shop/${product.slug || product.id}`;
|
||||
|
||||
const handleAddToCart = (e: React.MouseEvent) => {
|
||||
@@ -325,11 +331,7 @@ const ArchiveProductListItem: React.FC<{ product: Product }> = ({ product }) =>
|
||||
className="w-full h-full group-hover:scale-105 transition-transform duration-500"
|
||||
imgClassName="w-full h-full object-contain"
|
||||
/>
|
||||
{product.specialBadge && (
|
||||
<div className="absolute top-1 right-1 z-10 bg-canina-blue text-white text-[9px] font-black uppercase px-1.5 py-0.5 rounded-md shadow-xs">
|
||||
{product.specialBadge}
|
||||
</div>
|
||||
)}
|
||||
{/* List specialBadge moved below */}
|
||||
<div className="absolute bottom-1 left-1 flex gap-1">
|
||||
{forDog && (
|
||||
<div className="w-5 h-5 bg-white/90 backdrop-blur-xs rounded-md flex items-center justify-center text-medical-gray-500 border border-medical-gray-100 shadow-2xs" title="مناسب برای سگ">
|
||||
|
||||
@@ -49,13 +49,17 @@ export default function B2BLandingClient() {
|
||||
|
||||
setSubmitting(true);
|
||||
try {
|
||||
await api.post('/wholesale/apply', {
|
||||
businessName: `${formData.businessName} (${formData.businessType} - ${formData.city}) - رابط: ${formData.contactName}`,
|
||||
licenseNumber: formData.phone,
|
||||
notes: formData.notes,
|
||||
await api.post('/b2b/inquire', {
|
||||
companyName: formData.businessName,
|
||||
contactName: formData.contactName || formData.businessName,
|
||||
email: `partner-${Date.now()}@canina.ir`,
|
||||
phone: formData.phone,
|
||||
businessType: `${formData.businessType} (شهر: ${formData.city || 'نامشخص'})`,
|
||||
estimatedVolume: 'ثبت لندینگ B2B سایت',
|
||||
message: formData.notes || `درخواست شراکت و تامین رسمی برای ${formData.businessName} در شهر ${formData.city}`,
|
||||
});
|
||||
setSubmitted(true);
|
||||
toast.success('درخواست همکاری شما با موفقیت ثبت شد. همکاران ما حداکثر تا ۲۴ ساعت آینده با شما تماس خواهند گرفت.');
|
||||
toast.success('درخواست همکاری تجاری شما با موفقیت ثبت شد. تیم بازرگانی و پزشکی حداکثر تا ۲۴ ساعت کاری با شما تماس خواهند گرفت.');
|
||||
} catch {
|
||||
toast.error('خطایی در ثبت درخواست رخ داد. لطفاً با پشتیبانی تماس بگیرید.');
|
||||
} finally {
|
||||
|
||||
@@ -89,23 +89,24 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{ opacity: 1 }}
|
||||
exit={{ opacity: 0 }}
|
||||
className="fixed inset-0 z-[100] bg-medical-gray-900/60 backdrop-blur-md flex items-center justify-center p-4 md:p-10 font-vazir"
|
||||
className="fixed inset-0 z-[100] bg-medical-gray-900/70 backdrop-blur-md flex items-center justify-center p-2 sm:p-4 md:p-8 font-vazir"
|
||||
dir="rtl"
|
||||
>
|
||||
<motion.div
|
||||
initial={{ scale: 0.9, opacity: 0, y: 20 }}
|
||||
animate={{ scale: 1, opacity: 1, y: 0 }}
|
||||
className="bg-white w-full max-w-6xl h-[90vh] rounded-[3rem] shadow-2xl overflow-hidden flex flex-col md:flex-row relative"
|
||||
className="bg-white w-full max-w-6xl h-[95vh] sm:h-[90vh] rounded-3xl sm:rounded-[3rem] shadow-2xl overflow-hidden flex flex-col md:flex-row relative"
|
||||
>
|
||||
<button
|
||||
onClick={onClose}
|
||||
className="absolute top-6 left-6 z-20 w-10 h-10 bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-500 hover:bg-red-50 hover:text-red-500 transition-all"
|
||||
className="absolute top-4 left-4 sm:top-6 sm:left-6 z-30 min-w-[44px] min-h-[44px] w-11 h-11 bg-white/90 sm:bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-600 hover:bg-red-50 hover:text-red-500 transition-all shadow-md cursor-pointer"
|
||||
aria-label="بستن پنجره"
|
||||
>
|
||||
<X className="w-5 h-5" />
|
||||
</button>
|
||||
|
||||
{/* Sidebar Info */}
|
||||
<div className="w-full md:w-80 bg-canina-blue p-10 text-white flex flex-col overflow-y-auto">
|
||||
<div className="w-full md:w-80 bg-canina-blue p-5 sm:p-8 md:p-10 text-white flex flex-col overflow-y-auto shrink-0 max-h-[45vh] md:max-h-full">
|
||||
<div className="mb-8">
|
||||
<div className="w-16 h-16 bg-white/20 rounded-2xl flex items-center justify-center mb-6">
|
||||
<Building2 className="w-8 h-8" />
|
||||
@@ -162,32 +163,107 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
||||
{/* Main Grid Area */}
|
||||
<div className="flex-1 flex flex-col bg-medical-gray-50 overflow-hidden">
|
||||
{/* Header & Search */}
|
||||
<div className="p-8 border-b border-medical-gray-200 flex flex-col md:flex-row md:items-center justify-between gap-6 bg-white">
|
||||
<div className="p-4 sm:p-6 md:p-8 border-b border-medical-gray-200 flex flex-col sm:flex-row sm:items-center justify-between gap-3 sm:gap-6 bg-white shrink-0">
|
||||
<div className="relative flex-1 max-w-md">
|
||||
<Search className="absolute right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
||||
<Search className="absolute right-3 sm:right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="جستجوی کد کالا یا نام محصول..."
|
||||
value={searchQuery}
|
||||
onChange={e => setSearchQuery(e.target.value)}
|
||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl py-3 pr-11 pl-4 text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
|
||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-xl sm:rounded-2xl py-2.5 sm:py-3 pr-9 sm:pr-11 pl-4 text-xs sm:text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<button
|
||||
onClick={handleAddAll}
|
||||
disabled={totalItems === 0}
|
||||
className="bg-medical-gray-900 text-white px-8 py-3 rounded-2xl font-black text-sm flex items-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30"
|
||||
className="bg-medical-gray-900 text-white px-5 sm:px-8 py-2.5 sm:py-3 rounded-xl sm:rounded-2xl font-black text-xs sm:text-sm flex items-center justify-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30 cursor-pointer shadow-md"
|
||||
>
|
||||
<ShoppingCart className="w-4 h-4" />
|
||||
افزودن کلی ({totalItems} عدد)
|
||||
<span>افزودن کلی ({toPersian(totalItems)} عدد)</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Table */}
|
||||
<div className="flex-1 overflow-y-auto p-8">
|
||||
{loadError && <p role="alert">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>}
|
||||
<div className="bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
|
||||
{/* Products Container */}
|
||||
<div className="flex-1 overflow-y-auto p-3 sm:p-6 md:p-8">
|
||||
{loadError && <p role="alert" className="text-red-500 font-bold text-xs p-4 bg-red-50 rounded-2xl mb-4">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>}
|
||||
|
||||
{/* Mobile View: Clean Card Layout for each product */}
|
||||
<div className="md:hidden space-y-3">
|
||||
{filteredProducts.map(product => {
|
||||
const basePrice = product.priceValue || 0;
|
||||
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
|
||||
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
|
||||
const wholesalePrice = prodWholesale
|
||||
? Number(prodWholesale)
|
||||
: Math.round(basePrice * (1 - wholesaleDiscountPercent / 100));
|
||||
const currentQty = quantities[product.id] || 0;
|
||||
|
||||
return (
|
||||
<div key={product.id} className="bg-white border border-medical-gray-200 rounded-2xl p-3.5 shadow-xs space-y-3">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="w-14 h-14 bg-medical-gray-50 rounded-xl p-1.5 shrink-0 border border-medical-gray-100 flex items-center justify-center">
|
||||
<SafeImage src={product.image} className="w-full h-full" imgClassName="object-contain" alt={product.name} />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<h4 className="font-black text-xs text-medical-gray-900 leading-snug line-clamp-2">{product.name}</h4>
|
||||
<span className="text-[10px] font-mono text-medical-gray-400 block mt-0.5 dir-ltr text-right">کد: {product.artNo}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-between border-t border-medical-gray-100 pt-2.5 text-xs">
|
||||
<div>
|
||||
<span className="text-[10px] text-medical-gray-400 block font-medium">تکفروشی</span>
|
||||
<span className="font-bold text-medical-gray-600 text-xs">{toPersian(basePrice.toLocaleString())} ت</span>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<span className="text-[10px] text-amber-600 block font-black">قیمت همکار B2B</span>
|
||||
{isWholesaleVerified ? (
|
||||
<span className="font-black text-amber-800 text-xs bg-amber-50 px-2 py-0.5 rounded-md border border-amber-200 inline-block">
|
||||
{toPersian(wholesalePrice.toLocaleString())} ت
|
||||
</span>
|
||||
) : (
|
||||
<span className="inline-flex items-center gap-1 text-[10px] font-bold text-gray-400 bg-gray-50 px-1.5 py-0.5 rounded">
|
||||
<Lock className="w-2.5 h-2.5" />
|
||||
تایید ادمین
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-1 bg-medical-gray-50 border border-medical-gray-200 rounded-xl p-1">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => handleQuantityChange(product.id, String(Math.max(0, currentQty - 1)))}
|
||||
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
|
||||
>
|
||||
-
|
||||
</button>
|
||||
<input
|
||||
type="number"
|
||||
min="0"
|
||||
value={currentQty || ""}
|
||||
onChange={(e) => handleQuantityChange(product.id, e.target.value)}
|
||||
placeholder="0"
|
||||
className="w-8 text-center bg-transparent font-mono font-black text-xs outline-none"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => handleQuantityChange(product.id, String(currentQty + 1))}
|
||||
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
|
||||
>
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* Desktop / Tablet View: Rich Table */}
|
||||
<div className="hidden md:block bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
|
||||
<table className="w-full text-right">
|
||||
<thead className="bg-medical-gray-50 border-b border-medical-gray-200">
|
||||
<tr>
|
||||
@@ -201,7 +277,6 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
||||
<tbody className="divide-y divide-medical-gray-100">
|
||||
{filteredProducts.map(product => {
|
||||
const basePrice = product.priceValue || 0;
|
||||
// Priority 1: Specific product wholesalePrice, Priority 2: General settings percentage discount (default 30%)
|
||||
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
|
||||
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
|
||||
const wholesalePrice = prodWholesale
|
||||
|
||||
@@ -26,6 +26,7 @@ import { productService } from "../lib/services/productService";
|
||||
import { useRouter } from 'next/navigation';
|
||||
import Image from 'next/image';
|
||||
import SafeImage from './SafeImage';
|
||||
import { BLOG_TEAM_FALLBACK, publicationDate, validContentUpdatedAt, persianDate } from '../lib/blogDates';
|
||||
|
||||
export interface BlogCategory {
|
||||
id: string;
|
||||
@@ -42,6 +43,11 @@ export interface BlogPostItem {
|
||||
imageAlt?: string;
|
||||
date: string;
|
||||
author: string;
|
||||
authorTeam?: string;
|
||||
authorRole?: string;
|
||||
publishedAt?: string;
|
||||
createdAt?: string;
|
||||
contentUpdatedAt?: string;
|
||||
content: string;
|
||||
category?: string;
|
||||
categoryId?: string;
|
||||
@@ -324,10 +330,8 @@ export default function BlogPage({
|
||||
<div className="bg-canina-blue/10 px-3.5 py-1 rounded-full uppercase tracking-wider">
|
||||
{featuredPost.category || "پژوهش بالینی"}
|
||||
</div>
|
||||
<div className="flex items-center gap-1 text-medical-gray-400">
|
||||
<Calendar className="w-3.5 h-3.5" />
|
||||
{featuredPost.date}
|
||||
</div>
|
||||
<div className="flex items-center gap-1 text-medical-gray-400"><Calendar className="w-3.5 h-3.5" />تاریخ انتشار: <time dateTime={publicationDate(featuredPost)}>{persianDate(publicationDate(featuredPost))}</time></div>
|
||||
{validContentUpdatedAt(featuredPost) && <div className="text-medical-gray-400">آخرین بهروزرسانی: <time dateTime={validContentUpdatedAt(featuredPost)}>{persianDate(validContentUpdatedAt(featuredPost))}</time></div>}
|
||||
<div className="flex items-center gap-1 text-medical-gray-400">
|
||||
<Clock className="w-3.5 h-3.5" />
|
||||
{featuredPost.readingTime || 4} دقیقه مطالعه
|
||||
@@ -343,17 +347,18 @@ export default function BlogPage({
|
||||
<p className="text-sm sm:text-base text-medical-gray-500 mb-8 leading-relaxed line-clamp-3">
|
||||
{featuredPost.excerpt}
|
||||
</p>
|
||||
<div className="flex items-center justify-between pt-6 border-t border-medical-gray-100">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="w-10 h-10 bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-400">
|
||||
<div data-testid="featured-footer" className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-5 pt-6 border-t border-medical-gray-100">
|
||||
<div className="flex min-w-0 items-start gap-3">
|
||||
<div className="w-10 h-10 shrink-0 bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-400">
|
||||
<User className="w-5 h-5" />
|
||||
</div>
|
||||
<div className="text-xs">
|
||||
<div className="font-black text-medical-gray-900">{featuredPost.author}</div>
|
||||
<div className="font-bold text-medical-gray-400">تیم پژوهش کنینا</div>
|
||||
<div data-testid="featured-attribution" className="flex min-w-0 flex-col gap-1 text-xs">
|
||||
<div data-testid="featured-author-name" className="font-black text-medical-gray-900 whitespace-nowrap overflow-hidden text-ellipsis">نویسنده: {featuredPost.author}</div>
|
||||
<div data-testid="featured-team-name" className="font-bold text-medical-gray-400 whitespace-nowrap overflow-hidden text-ellipsis">تیم: {featuredPost.authorTeam || BLOG_TEAM_FALLBACK}</div>
|
||||
{featuredPost.authorRole && <div className="font-bold text-medical-gray-400 whitespace-nowrap overflow-hidden text-ellipsis">{featuredPost.authorRole}</div>}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-2 text-canina-blue font-black text-sm">
|
||||
<div data-testid="featured-read-more" className="flex shrink-0 items-center gap-2 self-end sm:self-auto text-canina-blue font-black text-sm whitespace-nowrap">
|
||||
<span>مطالعه مقاله کامل</span>
|
||||
<ArrowLeft className="w-4 h-4 group-hover:-translate-x-2 transition-transform" />
|
||||
</div>
|
||||
@@ -406,10 +411,8 @@ export default function BlogPage({
|
||||
</div>
|
||||
<div className="p-4 sm:p-7">
|
||||
<div className="flex items-center justify-between text-[11px] font-bold text-medical-gray-400 mb-3">
|
||||
<div className="flex items-center gap-1">
|
||||
<Calendar className="w-3 h-3" />
|
||||
{post.date}
|
||||
</div>
|
||||
<div className="flex items-center gap-1"><Calendar className="w-3 h-3" />تاریخ انتشار: <time dateTime={publicationDate(post)}>{persianDate(publicationDate(post))}</time></div>
|
||||
{validContentUpdatedAt(post) && <div>آخرین بهروزرسانی: <time dateTime={validContentUpdatedAt(post)}>{persianDate(validContentUpdatedAt(post))}</time></div>}
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex items-center gap-1">
|
||||
<Clock className="w-3 h-3" />
|
||||
@@ -430,12 +433,12 @@ export default function BlogPage({
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="px-4 sm:px-7 pb-4 sm:pb-6 pt-2.5 border-t border-medical-gray-100 flex items-center justify-between">
|
||||
<div className="text-[11px] font-bold text-medical-gray-500 flex items-center gap-1.5">
|
||||
<User className="w-3.5 h-3.5 text-medical-gray-400" />
|
||||
<span>{post.author}</span>
|
||||
<div className="px-4 sm:px-7 pb-4 sm:pb-6 pt-2.5 border-t border-medical-gray-100 flex items-end justify-between gap-3">
|
||||
<div data-testid={`regular-attribution-${post.id}`} className="min-w-0 text-[11px] font-bold text-medical-gray-500 flex flex-col gap-1">
|
||||
<div className="flex min-w-0 items-center gap-1.5 whitespace-nowrap"><User className="w-3.5 h-3.5 shrink-0 text-medical-gray-400" /><span className="truncate">نویسنده: {post.author}</span></div>
|
||||
<div className="truncate whitespace-nowrap pr-5">تیم: {post.authorTeam || BLOG_TEAM_FALLBACK}</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-1 text-canina-blue font-black text-xs group-hover:underline">
|
||||
<div className="flex shrink-0 items-center gap-1 text-canina-blue font-black text-xs whitespace-nowrap group-hover:underline">
|
||||
<span>مطالعه</span>
|
||||
<ArrowLeft className="w-3.5 h-3.5 group-hover:-translate-x-1 transition-transform" />
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
"use client";
|
||||
import { BLOG_TEAM_FALLBACK, publicationDate, validContentUpdatedAt, persianDate } from "../lib/blogDates";
|
||||
import React, { useState, useEffect } from "react";
|
||||
import {
|
||||
ChevronRight,
|
||||
@@ -25,10 +26,11 @@ interface BlogPostClientProps {
|
||||
blog: any;
|
||||
publishedDate: string;
|
||||
authorName: string;
|
||||
authorTeam?: string;
|
||||
sanitizedContent: string;
|
||||
}
|
||||
|
||||
export default function BlogPostClient({ blog, publishedDate, authorName, sanitizedContent }: BlogPostClientProps) {
|
||||
export default function BlogPostClient({ blog, publishedDate, authorName, authorTeam, sanitizedContent }: BlogPostClientProps) {
|
||||
const [copied, setCopied] = useState(false);
|
||||
const [viewCount, setViewCount] = useState<number>(blog.viewCount || 0);
|
||||
const [commentName, setCommentName] = useState("");
|
||||
@@ -147,12 +149,8 @@ export default function BlogPostClient({ blog, publishedDate, authorName, saniti
|
||||
{blog.category.name}
|
||||
</span>
|
||||
)}
|
||||
{publishedDate && (
|
||||
<div className="flex items-center gap-1">
|
||||
<Calendar className="w-3.5 h-3.5 text-canina-blue" />
|
||||
<span>{publishedDate}</span>
|
||||
</div>
|
||||
)}
|
||||
{publishedDate && <div className="flex items-center gap-1"><Calendar className="w-3.5 h-3.5 text-canina-blue" />تاریخ انتشار: <time dateTime={publicationDate(blog)}>{publishedDate}</time></div>}
|
||||
{validContentUpdatedAt(blog) && <div>آخرین بهروزرسانی: <time dateTime={validContentUpdatedAt(blog)}>{persianDate(validContentUpdatedAt(blog))}</time></div>}
|
||||
<div className="flex items-center gap-1">
|
||||
<Clock className="w-3.5 h-3.5 text-canina-blue" />
|
||||
<span>{blog.readingTime || 4} دقیقه مطالعه</span>
|
||||
@@ -212,9 +210,9 @@ export default function BlogPostClient({ blog, publishedDate, authorName, saniti
|
||||
<User className="w-7 h-7" />
|
||||
</div>
|
||||
<div>
|
||||
<div className="font-black text-medical-gray-900 text-base">{authorName}</div>
|
||||
<div className="font-black text-medical-gray-900 text-base">نویسنده: {authorName}</div>
|
||||
<div className="font-bold text-xs text-medical-gray-400 mt-0.5">
|
||||
تیم تحقیق و توسعه علمی کنینا آلمان (Canina Pharma)
|
||||
تیم: {authorTeam || blog.authorTeam || BLOG_TEAM_FALLBACK}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -399,13 +397,18 @@ export default function BlogPostClient({ blog, publishedDate, authorName, saniti
|
||||
<p className="text-xs text-white/80 leading-relaxed">
|
||||
مشاوران علمی و دامپزشکان داروسازی کنینا آماده پاسخگویی به سوالات شما در مورد وضعیت سلامت پت شما هستند.
|
||||
</p>
|
||||
<Link
|
||||
href="/smart-advisor"
|
||||
className="inline-flex items-center justify-center gap-2 w-full py-3 rounded-2xl bg-canina-gold text-canina-dark text-xs font-black hover:bg-white transition-all shadow-lg"
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
if (typeof window !== 'undefined') {
|
||||
window.dispatchEvent(new CustomEvent('canina:open-support-chat'));
|
||||
}
|
||||
}}
|
||||
className="inline-flex items-center justify-center gap-2 w-full py-3 rounded-2xl bg-canina-gold text-canina-dark text-xs font-black hover:bg-white transition-all shadow-lg cursor-pointer"
|
||||
>
|
||||
<span>مشاوره هوشمند دارویی</span>
|
||||
<ArrowLeft className="w-4 h-4" />
|
||||
</Link>
|
||||
</button>
|
||||
</div>
|
||||
</aside>
|
||||
</div>
|
||||
|
||||
@@ -7,6 +7,8 @@ import SafeImage from "./SafeImage";
|
||||
import { useSettingsStore } from "../lib/store/settingsStore";
|
||||
import api, { BASE_DOMAIN } from "../lib/services/api";
|
||||
import { toPersian } from "../lib/utils";
|
||||
import { BLOG_TEAM_FALLBACK, publicationDate, validContentUpdatedAt, persianDate } from "../lib/blogDates";
|
||||
import { resolveBlogAuthor } from "../lib/blogAuthor";
|
||||
|
||||
export interface BlogPost {
|
||||
id: string;
|
||||
@@ -16,6 +18,10 @@ export interface BlogPost {
|
||||
imageUrl?: string;
|
||||
viewCount: number;
|
||||
createdAt: string;
|
||||
publishedAt?: string;
|
||||
contentUpdatedAt?: string;
|
||||
authorTeam?: string;
|
||||
authorRole?: string;
|
||||
author?: {
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
@@ -104,11 +110,9 @@ export default function BlogPreviewSection() {
|
||||
? `${BASE_DOMAIN}${blog.imageUrl}`
|
||||
: "/assets/images/blog-placeholder.png";
|
||||
|
||||
const authorName = blog.author
|
||||
? `${blog.author.firstName || ""} ${blog.author.lastName || ""}`.trim()
|
||||
: "تحریریه کنینا";
|
||||
const authorName = resolveBlogAuthor(blog.author);
|
||||
|
||||
|
||||
const formattedDate = new Date(blog.createdAt).toLocaleDateString("fa-IR");
|
||||
|
||||
const blogHref = `/blog/${encodeURIComponent(blog.slug || blog.id)}`;
|
||||
|
||||
@@ -134,10 +138,8 @@ export default function BlogPreviewSection() {
|
||||
<div className="p-3.5 sm:p-6 flex-1 flex flex-col justify-between space-y-3 sm:space-y-4">
|
||||
<div className="space-y-1.5 sm:space-y-2">
|
||||
<div className="flex items-center gap-2.5 sm:gap-4 text-[10px] sm:text-xs text-medical-gray-400 font-medium">
|
||||
<span className="flex items-center gap-1">
|
||||
<Calendar className="w-3 h-3 sm:w-3.5 sm:h-3.5" />
|
||||
{toPersian(formattedDate)}
|
||||
</span>
|
||||
<span className="flex items-center gap-1"><Calendar className="w-3 h-3 sm:w-3.5 sm:h-3.5" />تاریخ انتشار: <time dateTime={publicationDate(blog)}>{persianDate(publicationDate(blog))}</time></span>
|
||||
{validContentUpdatedAt(blog) && <span>آخرین بهروزرسانی: <time dateTime={validContentUpdatedAt(blog)}>{persianDate(validContentUpdatedAt(blog))}</time></span>}
|
||||
<span className="flex items-center gap-1">
|
||||
<Eye className="w-3 h-3 sm:w-3.5 sm:h-3.5" />
|
||||
{toPersian(blog.viewCount || 0)}
|
||||
@@ -157,8 +159,8 @@ export default function BlogPreviewSection() {
|
||||
|
||||
<div className="pt-2.5 sm:pt-4 border-t border-medical-gray-200/60 flex items-center justify-between">
|
||||
<span className="text-[10px] sm:text-xs font-bold text-medical-gray-500 truncate max-w-[100px] sm:max-w-none">
|
||||
{authorName}
|
||||
</span>
|
||||
نویسنده: {authorName}
|
||||
</span><span className="text-[10px] sm:text-xs font-bold text-medical-gray-500">تیم: {blog.authorTeam || BLOG_TEAM_FALLBACK}</span>
|
||||
<Link
|
||||
href={blogHref}
|
||||
aria-label={`مطالعه مقاله: ${blog.title}`}
|
||||
|
||||
@@ -101,7 +101,7 @@ export default function CartDrawer({ isOpen, onClose, onCheckout, onShopNavigate
|
||||
animate={{ x: 0 }}
|
||||
exit={{ x: "100%" }}
|
||||
transition={{ type: "spring", damping: 25, stiffness: 200 }}
|
||||
className="fixed inset-y-0 right-0 w-full max-w-md bg-white shadow-2xl z-[101] flex flex-col"
|
||||
className="fixed inset-y-0 right-0 w-full max-w-full sm:max-w-md bg-white shadow-2xl z-[101] flex flex-col overflow-x-hidden"
|
||||
dir="rtl"
|
||||
>
|
||||
{/* Header */}
|
||||
|
||||
@@ -126,6 +126,12 @@ export default function CheckoutPage() {
|
||||
};
|
||||
|
||||
const handleFinalize = async () => {
|
||||
if (!items.length || getSubtotal() <= 0) {
|
||||
toast.error("سبد خرید شما خالی است.");
|
||||
router.push('/shop');
|
||||
return;
|
||||
}
|
||||
|
||||
const totalAmount = getTotal() + shippingFee;
|
||||
const activePet = getActivePet();
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
"use client";
|
||||
import React, { useState, useEffect } from "react";
|
||||
import { usePathname } from "next/navigation";
|
||||
import Image from "next/image";
|
||||
import { Phone, Mail, MapPin, Instagram, ShieldCheck, Globe, ArrowUp, Download, ChevronDown, ChevronUp } from "lucide-react";
|
||||
import { useSettingsStore } from "../lib/store/settingsStore";
|
||||
@@ -8,7 +9,9 @@ import Link from "next/link";
|
||||
|
||||
import { NavigationTarget } from "../lib/types";
|
||||
|
||||
export default function Footer({
|
||||
export default function Footer({
|
||||
// Footer hooks
|
||||
|
||||
onB2BOpen
|
||||
}: {
|
||||
onNavigate?: (v: NavigationTarget) => void;
|
||||
@@ -17,6 +20,8 @@ export default function Footer({
|
||||
}) {
|
||||
const getText = useSettingsStore(state => state.getText);
|
||||
const isB2BEnabled = useSettingsStore((s) => s.getBoolean('b2bRegistrationOpen', true) && s.getBoolean('b2b_enabled', true));
|
||||
const pathname = usePathname();
|
||||
const isPdpPage = pathname?.startsWith('/shop/') && pathname !== '/shop';
|
||||
const [showScroll, setShowScroll] = useState(false);
|
||||
const [footerCol1, setFooterCol1] = useState<Array<{ id?: string; label: string; href: string }>>([]);
|
||||
const [isDescExpanded, setIsDescExpanded] = useState(false);
|
||||
@@ -53,12 +58,13 @@ export default function Footer({
|
||||
|
||||
return (
|
||||
<footer className="bg-medical-gray-900 text-white pt-10 sm:pt-24 pb-28 sm:pb-12 font-shabnam relative" dir="rtl">
|
||||
{/* Floating Back-to-Top Button */}
|
||||
{/* Floating Back-to-Top Button (Docked cleanly on the RIGHT side to avoid overlapping SupportChat on the LEFT) */}
|
||||
{showScroll && (
|
||||
<button
|
||||
onClick={scrollToTop}
|
||||
className="fixed bottom-36 left-4 sm:bottom-8 sm:left-8 z-40 bg-canina-blue text-white p-2.5 sm:p-3 rounded-full shadow-2xl hover:bg-canina-dark hover:scale-110 transition-all border border-white/20 group flex items-center gap-2 font-vazir text-xs font-black"
|
||||
className={`fixed ${isPdpPage ? "bottom-[138px]" : "bottom-36"} right-4 sm:bottom-8 sm:right-8 z-40 bg-canina-blue text-white p-2.5 sm:p-3 rounded-full shadow-2xl hover:bg-canina-dark hover:scale-110 transition-all border border-white/20 group flex items-center gap-2 font-vazir text-xs font-black cursor-pointer`}
|
||||
title="بازگشت به بالای صفحه"
|
||||
aria-label="بازگشت به بالای صفحه"
|
||||
>
|
||||
<ArrowUp className="w-4 h-4 sm:w-5 sm:h-5 group-hover:-translate-y-1 transition-transform" />
|
||||
<span className="hidden sm:inline">بازگشت به بالا</span>
|
||||
|
||||
@@ -5,6 +5,7 @@ import { Search, ChevronDown, Menu, X, Pill, ShieldCheck, HeartPulse, Sparkles,
|
||||
import { motion, AnimatePresence } from "motion/react";
|
||||
import Link from "next/link";
|
||||
import { useCartStore } from "../lib/store/cartStore";
|
||||
import { useUIStore } from "../lib/store/uiStore";
|
||||
import { usePetStore } from "../lib/store/usePetStore";
|
||||
import { useUserStore } from "../lib/store/userStore";
|
||||
import { useSettingsStore } from "../lib/store/settingsStore";
|
||||
@@ -249,18 +250,15 @@ export default function Header({
|
||||
|
||||
{/* Left Action Buttons */}
|
||||
<div className="flex items-center gap-1.5 sm:gap-3 shrink-0">
|
||||
{/* Prescription Upload Button (Desktop & Mobile) */}
|
||||
{/* Prescription Upload Button (Desktop & Mobile) - Opens Prescription Modal */}
|
||||
{isPrescriptionEnabled && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
if (!isLoggedIn) {
|
||||
setIsAuthModalOpen(true);
|
||||
} else {
|
||||
setIsPrescriptionModalOpen(true);
|
||||
}
|
||||
useUIStore.getState().setPrescriptionModalOpen(true);
|
||||
}}
|
||||
className="flex items-center gap-1.5 px-2.5 sm:px-3 py-2 bg-emerald-50 text-emerald-700 border border-emerald-200 hover:bg-emerald-100 rounded-xl text-[11px] sm:text-xs font-black transition-all shadow-xs cursor-pointer"
|
||||
title="ثبت نسخه دامپزشک"
|
||||
title="ثبت نسخه دامپزشک"
|
||||
>
|
||||
<FileHeart className="w-3.5 h-3.5 sm:w-4 sm:h-4 text-emerald-600 shrink-0" />
|
||||
<span className="hidden xs:inline sm:inline">ثبت نسخه دامپزشک</span>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
"use client";
|
||||
import { sanitizeBlogHtml } from "../lib/sanitizeBlogHtml";
|
||||
import Image from "next/image";
|
||||
import { motion, AnimatePresence, animate } from "motion/react";
|
||||
import { ChevronLeft, ChevronRight, Globe, ShieldCheck, Calendar, ArrowLeft } from "lucide-react";
|
||||
@@ -134,7 +136,7 @@ export default function Hero({ banners = [], onShopNavigate }: { banners?: Banne
|
||||
suppressHydrationWarning
|
||||
className="text-sm lg:text-xl text-medical-gray-600 mb-3 sm:mb-5 max-w-2xl mx-auto lg:mx-0 leading-relaxed font-vazir animate-fade-in [&_p]:text-sm [&_p]:lg:text-xl [&_p]:leading-relaxed [&_p]:my-0 [&_span]:text-inherit"
|
||||
dangerouslySetInnerHTML={{
|
||||
__html: subtitle
|
||||
__html: sanitizeBlogHtml(subtitle)
|
||||
}}
|
||||
/>
|
||||
|
||||
|
||||
@@ -183,10 +183,8 @@ export default function MobileBottomNav({
|
||||
}
|
||||
};
|
||||
|
||||
const isProductDetailPage = pathname.startsWith("/shop/") && pathname !== "/shop";
|
||||
if (isProductDetailPage) {
|
||||
return null;
|
||||
}
|
||||
// Retain MobileBottomNav across all routes including PDP so user never loses Menu & Home navigation
|
||||
const isProductDetailPage = false;
|
||||
|
||||
const totalCartItems = isMounted ? getTotalItems() : 0;
|
||||
const isHomeActive = pathname === "/";
|
||||
@@ -481,6 +479,20 @@ export default function MobileBottomNav({
|
||||
<span>خرید عمده (B2B)</span>
|
||||
</button>
|
||||
)}
|
||||
|
||||
{isPrescriptionEnabled && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
closeSheet();
|
||||
useUIStore.getState().setPrescriptionModalOpen(true);
|
||||
}}
|
||||
className="flex items-center gap-2.5 p-3.5 bg-emerald-50 border border-emerald-200 rounded-2xl text-xs font-black text-emerald-800 hover:border-emerald-500 text-right shadow-xs"
|
||||
>
|
||||
<FileHeart className="w-4 h-4 text-emerald-600 shrink-0" />
|
||||
<span>ثبت نسخه آنلاین</span>
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Contact & Support */}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/* eslint-disable @next/next/no-img-element */
|
||||
"use client";
|
||||
/* eslint-disable @next/next/no-img-element */
|
||||
import { sanitizeBlogHtml } from "../lib/sanitizeBlogHtml";
|
||||
import Link from "next/link";
|
||||
import { useState, useMemo, useEffect, useRef } from "react";
|
||||
import { motion, AnimatePresence } from "motion/react";
|
||||
@@ -498,27 +499,7 @@ export default function ProductPage({
|
||||
}}
|
||||
className="bg-white rounded-2xl sm:rounded-[2.5rem] border border-medical-gray-200 shadow-xl relative group overflow-hidden h-[280px] sm:h-[390px] flex items-center justify-center p-2 sm:p-4 select-none touch-pan-y cursor-grab active:cursor-grabbing"
|
||||
>
|
||||
{/* Top Floating Badges */}
|
||||
<div className="absolute top-4 left-4 sm:top-6 sm:left-6 flex flex-col gap-1.5 sm:gap-2 z-10 items-start pointer-events-none">
|
||||
{product.specialBadge && (
|
||||
<div className="px-2.5 py-1 bg-medical-gray-900 text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm">
|
||||
{product.specialBadge}
|
||||
</div>
|
||||
)}
|
||||
{isOutOfStock ? (
|
||||
<div className="px-2.5 py-1 bg-rose-500 text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-sm">
|
||||
ناموجود در انبار
|
||||
</div>
|
||||
) : (
|
||||
<div className="px-2.5 py-1 bg-green-500 text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-sm">
|
||||
<CheckCircle2 className="w-3 h-3" />
|
||||
موجود در انبار
|
||||
</div>
|
||||
)}
|
||||
<div className="px-2.5 py-1 bg-canina-blue text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm">
|
||||
گرید دارویی اختصاصی
|
||||
</div>
|
||||
</div>
|
||||
{/* Floating Badges over photo removed to prevent blocking product visual */}
|
||||
|
||||
{/* Species Suitable Badges (Dog / Cat) */}
|
||||
<div className="absolute bottom-4 left-4 flex gap-1.5 z-10 pointer-events-none">
|
||||
@@ -695,15 +676,27 @@ export default function ProductPage({
|
||||
<div className="md:col-span-7 space-y-4 sm:space-y-6 flex flex-col items-center md:items-start">
|
||||
<div className="w-full flex flex-col items-center md:items-start">
|
||||
<div className="flex flex-wrap justify-center md:justify-start items-center gap-2 sm:gap-3 mb-3 sm:mb-4">
|
||||
<div className="px-3 py-1 bg-canina-blue text-white rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm">
|
||||
استاندارد صنعتی آلمان
|
||||
</div>
|
||||
<div className="px-3 py-1 bg-amber-500 text-white rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm flex items-center gap-1">
|
||||
<ShieldCheck className="w-3 h-3" />
|
||||
کاتالوگ رسمی Canina
|
||||
{/* 1. First Priority: Stock Status */}
|
||||
{isOutOfStock ? (
|
||||
<div className="px-3 py-1 bg-rose-50 text-rose-700 border border-rose-200 rounded-full text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-xs">
|
||||
<span className="w-2 h-2 rounded-full bg-rose-500" />
|
||||
ناموجود در انبار مرکزی
|
||||
</div>
|
||||
) : (
|
||||
<div className="px-3 py-1 bg-emerald-50 text-emerald-800 border border-emerald-200 rounded-full text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-xs">
|
||||
<CheckCircle2 className="w-3.5 h-3.5 text-emerald-600" />
|
||||
موجود در انبار مرکزی
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 2. Pharmaceutical Grade */}
|
||||
<div className="px-3 py-1 bg-canina-blue/10 text-canina-blue border border-canina-blue/20 rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-xs">
|
||||
گرید دارویی اختصاصی Canina
|
||||
</div>
|
||||
|
||||
{/* 3. Special Badge if exists */}
|
||||
{product.specialBadge && (
|
||||
<div className="px-3 py-1 bg-medical-gray-900 text-white rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm">
|
||||
<div className="px-3 py-1 bg-amber-50 text-amber-900 border border-amber-200 rounded-full text-[10px] font-black uppercase tracking-widest font-vazir shadow-xs max-w-full text-right" title={product.specialBadge}>
|
||||
{product.specialBadge}
|
||||
</div>
|
||||
)}
|
||||
@@ -745,9 +738,9 @@ export default function ProductPage({
|
||||
</h2>
|
||||
)}
|
||||
{product.scientificTagline && (
|
||||
<div className="mt-1 text-xs sm:text-sm md:text-base text-canina-blue font-bold font-vazir flex items-center justify-center md:justify-start gap-1.5" dir="rtl">
|
||||
<span className="w-1.5 h-1.5 rounded-full bg-canina-blue shrink-0" />
|
||||
<span>{product.scientificTagline}</span>
|
||||
<div className="mt-1.5 text-xs sm:text-sm md:text-base text-canina-blue font-bold font-vazir flex items-start justify-center md:justify-start gap-2" dir="rtl">
|
||||
<span className="w-1.5 h-1.5 rounded-full bg-canina-blue shrink-0 mt-2" />
|
||||
<span className="leading-relaxed text-right">{product.scientificTagline}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -888,7 +881,7 @@ export default function ProductPage({
|
||||
}`}
|
||||
>
|
||||
<div
|
||||
dangerouslySetInnerHTML={{ __html: formattedHtml }}
|
||||
dangerouslySetInnerHTML={{ __html: sanitizeBlogHtml(formattedHtml) }}
|
||||
className="rich-product-description space-y-3 font-vazir text-justify leading-relaxed sm:leading-loose [&>h1]:text-lg [&>h1]:sm:text-xl [&>h1]:font-black [&>h1]:text-medical-gray-900 [&>h1]:mt-4 [&>h1]:mb-2 [&>h2]:text-base [&>h2]:sm:text-lg [&>h2]:font-black [&>h2]:text-medical-gray-900 [&>h2]:mt-3 [&>h2]:mb-1.5 [&>h3]:text-sm [&>h3]:sm:text-base [&>h3]:font-black [&>h3]:text-medical-gray-900 [&>h3]:mt-3 [&>h3]:mb-1 [&>h4]:text-xs [&>h4]:sm:text-sm [&>h4]:font-bold [&>h4]:text-medical-gray-800 [&>p]:leading-relaxed [&>p]:sm:leading-loose [&>ul]:list-disc [&>ul]:pr-5 [&>ul]:space-y-1 [&>ol]:list-decimal [&>ol]:pr-5 [&>ol]:space-y-1 [&>table]:w-full [&>table]:border-collapse [&>table]:my-3 [&>table_th]:border [&>table_th]:border-medical-gray-200 [&>table_th]:p-2 [&>table_th]:bg-medical-gray-100 [&>table_td]:border [&>table_td]:border-medical-gray-200 [&>table_td]:p-2 [&>hr]:my-4 [&>hr]:border-medical-gray-200 [&>blockquote]:border-r-4 [&>blockquote]:border-canina-blue [&>blockquote]:pr-3 [&>blockquote]:italic [&>blockquote]:bg-canina-blue/5 [&>blockquote]:p-2 [&>blockquote]:rounded-l-lg [&>img]:rounded-xl [&>img]:my-3 [&>img]:max-w-full [&>img]:shadow-sm"
|
||||
/>
|
||||
|
||||
@@ -1060,7 +1053,7 @@ export default function ProductPage({
|
||||
<span className="text-xs sm:text-sm font-bold text-medical-gray-700 font-vazir">
|
||||
{cardSlug ? (
|
||||
<Link
|
||||
href={`/wiki/${cardSlug}`}
|
||||
href={`/wiki?term=${cardSlug}`}
|
||||
className="hover:text-canina-blue hover:underline transition-colors flex items-center gap-1"
|
||||
title="مشاهده در دانشنامه علمی کنینا"
|
||||
>
|
||||
@@ -1606,8 +1599,8 @@ export default function ProductPage({
|
||||
)}
|
||||
</AnimatePresence>
|
||||
|
||||
{/* Mobile Floating Sticky Bottom Buy Bar */}
|
||||
<div className="lg:hidden fixed bottom-0 left-0 right-0 z-50 bg-white/95 backdrop-blur-md border-t border-medical-gray-200 p-3 pb-safe shadow-2xl flex items-center justify-between gap-3 font-vazir" dir="rtl">
|
||||
{/* Mobile Floating Sticky Bottom Buy Bar - Docked cleanly ABOVE MobileBottomNav */}
|
||||
<div className="lg:hidden fixed bottom-[65px] left-0 right-0 z-30 bg-white/95 backdrop-blur-md border-t border-medical-gray-200 px-3 py-2.5 shadow-[0_-4px_16px_rgba(0,0,0,0.08)] flex items-center justify-between gap-3 font-vazir" dir="rtl">
|
||||
{!isCatalogHidePrices ? (
|
||||
<div>
|
||||
<span className="text-[10px] text-medical-gray-400 font-bold block">قیمت نهایی</span>
|
||||
|
||||
@@ -349,9 +349,11 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
|
||||
|
||||
<div className="grid md:grid-cols-2 gap-4 max-w-xl mx-auto">
|
||||
<div className="space-y-1.5">
|
||||
<label className="text-xs font-black text-medical-gray-600 pr-1">{getText('advisor_pet_name_label', "نام پت")}</label>
|
||||
<label htmlFor="advisor-pet-name" className="text-xs font-black text-medical-gray-600 pr-1">{getText('advisor_pet_name_label', "نام پت")}</label>
|
||||
<input
|
||||
id="advisor-pet-name"
|
||||
type="text"
|
||||
aria-label={getText('advisor_pet_name_label', "نام پت")}
|
||||
value={name}
|
||||
onChange={e => {
|
||||
setName(e.target.value);
|
||||
@@ -367,9 +369,11 @@ export default function SmartAdvisor({ onComplete, rules = [] }: SmartAdvisorPro
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-1.5">
|
||||
<label className="text-xs font-black text-medical-gray-600 pr-1">{getText('advisor_pet_breed_label', "نژاد")}</label>
|
||||
<label htmlFor="advisor-pet-breed" className="text-xs font-black text-medical-gray-600 pr-1">{getText('advisor_pet_breed_label', "نژاد")}</label>
|
||||
<input
|
||||
id="advisor-pet-breed"
|
||||
type="text"
|
||||
aria-label={getText('advisor_pet_breed_label', "نژاد")}
|
||||
value={breed}
|
||||
onChange={e => {
|
||||
setBreed(e.target.value);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
'use client';
|
||||
import { FormEvent, useEffect, useRef, useState } from 'react';
|
||||
import { usePathname } from 'next/navigation';
|
||||
|
||||
type PersistedMessage = { role: 'user' | 'assistant'; content: string };
|
||||
|
||||
@@ -16,6 +17,14 @@ export default function SupportChat() {
|
||||
const [config, setConfig] = useState<{ enabled: boolean; label: string; icon: string } | null>(null);
|
||||
const [configError, setConfigError] = useState(false);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [message, setMessage] = useState('');
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [rows, setRows] = useState<{ question: string; answer: string }[]>([]);
|
||||
const [conversationId, setConversationId] = useState('');
|
||||
const [contextLimited, setContextLimited] = useState(false);
|
||||
const identity = useRef('');
|
||||
const pending = useRef<AbortController | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
let active = true;
|
||||
const refresh = async () => {
|
||||
@@ -33,15 +42,16 @@ export default function SupportChat() {
|
||||
window.addEventListener('focus', refresh);
|
||||
return () => { active = false; clearInterval(timer); window.removeEventListener('focus', refresh); };
|
||||
}, []);
|
||||
const [message, setMessage] = useState('');
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [rows, setRows] = useState<{ question: string; answer: string }[]>([]);
|
||||
const [conversationId, setConversationId] = useState('');
|
||||
const [contextLimited, setContextLimited] = useState(false);
|
||||
const identity = useRef('');
|
||||
const pending = useRef<AbortController | null>(null);
|
||||
const chatScrollRef = useRef<HTMLDivElement | null>(null);
|
||||
useEffect(() => {
|
||||
const handleOpenSupport = () => setOpen(true);
|
||||
window.addEventListener('canina:open-support-chat', handleOpenSupport);
|
||||
return () => window.removeEventListener('canina:open-support-chat', handleOpenSupport);
|
||||
}, []);
|
||||
|
||||
const historyKey = useRef('');
|
||||
const pathname = usePathname();
|
||||
const isPdpPage = pathname?.startsWith('/shop/') && pathname !== '/shop';
|
||||
|
||||
useEffect(() => {
|
||||
identity.current = token();
|
||||
@@ -194,7 +204,7 @@ export default function SupportChat() {
|
||||
if (!config?.enabled) return configError ? <span role="status" className="sr-only">تنظیمات پشتیبان هوشمند در دسترس نیست.</span> : null;
|
||||
const botIcon = { chat: '💬', paw: '🐾', bot: '🤖' }[config.icon];
|
||||
return (
|
||||
<aside dir="rtl" className="fixed bottom-24 sm:bottom-6 left-4 sm:left-6 z-30 max-w-[calc(100vw-2.5rem)] font-vazir select-none pb-[env(safe-area-inset-bottom,0px)]">
|
||||
<aside dir="rtl" className={`fixed ${isPdpPage ? "bottom-[138px]" : "bottom-24"} sm:bottom-6 left-4 sm:left-6 z-30 max-w-[calc(100vw-2.5rem)] font-vazir select-none pb-[env(safe-area-inset-bottom,0px)]`}>
|
||||
{/* Floating Launcher Button */}
|
||||
<button
|
||||
type="button"
|
||||
|
||||
@@ -2,13 +2,123 @@ import React from 'react';
|
||||
import {render,fireEvent,act,cleanup} from '@testing-library/react';
|
||||
import {vi,beforeEach,afterEach,it,expect} from 'vitest';
|
||||
import AnalyticsDeferred from '../AnalyticsDeferred';
|
||||
beforeEach(()=>{vi.useFakeTimers();document.head.innerHTML='';delete window.dataLayer;delete window.clarity;});
|
||||
afterEach(()=>{cleanup();vi.useRealTimers();vi.unstubAllGlobals();});
|
||||
it('defers tags until interaction and loads only once',()=>{render(<AnalyticsDeferred gtmId="GTM-test" gaId="G-test" clarityId="test"/>);expect(document.scripts).toHaveLength(0);fireEvent.scroll(window);fireEvent.keyDown(window);act(()=>vi.advanceTimersByTime(3500));expect(document.scripts).toHaveLength(3);expect(window.dataLayer).toEqual(expect.arrayContaining([['config','G-test',{page_path:'/'}]]));});
|
||||
it.each(['scroll','touchstart','mousemove','keydown'])('loads on %s',event=>{render(<AnalyticsDeferred gtmId="GTM-test"/>);fireEvent(window,new Event(event));expect(document.scripts).toHaveLength(1);});
|
||||
it('loads clarity when no script exists',()=>{render(<AnalyticsDeferred clarityId="solo"/>);fireEvent.scroll(window);expect(document.querySelector('script')?.src).toBe('https://www.clarity.ms/tag/solo');});
|
||||
it('preserves the existing clarity implementation',()=>{const clarity=vi.fn();window.clarity=clarity;render(<AnalyticsDeferred clarityId="existing"/>);fireEvent.scroll(window);expect(window.clarity).toBe(clarity);expect(document.querySelector('script')?.src).toBe('https://www.clarity.ms/tag/existing');});
|
||||
it('queues clarity calls before its script initializes',()=>{render(<AnalyticsDeferred clarityId="queued"/>);fireEvent.scroll(window);window.clarity('event','checkout');expect(window.clarity.q).toEqual([['event','checkout']]);});
|
||||
it('falls back after 3500ms and reuses existing GA script',()=>{const s=document.createElement('script');s.src='https://www.googletagmanager.com/gtag/js?id=G-test';document.head.append(s);render(<AnalyticsDeferred gaId="G-test"/>);act(()=>vi.advanceTimersByTime(3499));expect(window.dataLayer).toBeUndefined();act(()=>vi.advanceTimersByTime(1));expect(document.scripts).toHaveLength(1);});
|
||||
it('cancels idle work on unmount',()=>{let cb:()=>void=()=>{};vi.stubGlobal('requestIdleCallback',vi.fn(fn=>{cb=fn;return 9;}));vi.stubGlobal('cancelIdleCallback',vi.fn());const v=render(<AnalyticsDeferred gtmId="GTM-test"/>);act(()=>vi.advanceTimersByTime(3500));v.unmount();act(()=>cb());expect(document.scripts).toHaveLength(0);expect(cancelIdleCallback).toHaveBeenCalledWith(9);});
|
||||
it('unmount removes event and timeout callbacks',()=>{const v=render(<AnalyticsDeferred gtmId="GTM-test"/>);v.unmount();fireEvent.scroll(window);act(()=>vi.advanceTimersByTime(4000));expect(document.scripts).toHaveLength(0);});
|
||||
|
||||
let mockPathname = '/';
|
||||
vi.mock('next/navigation', () => ({
|
||||
usePathname: () => mockPathname,
|
||||
}));
|
||||
|
||||
beforeEach(()=>{
|
||||
vi.useFakeTimers();
|
||||
mockPathname = '/';
|
||||
document.head.innerHTML='';
|
||||
delete (window as any).dataLayer;
|
||||
delete (window as any).clarity;
|
||||
delete (window as any).gtag;
|
||||
});
|
||||
afterEach(()=>{
|
||||
cleanup();
|
||||
vi.useRealTimers();
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
it('pushes genuine native arguments object for gtag commands so gtag.js processes them',()=>{
|
||||
render(<AnalyticsDeferred gaId="G-test"/>);
|
||||
fireEvent.scroll(window);
|
||||
act(()=>vi.advanceTimersByTime(3500));
|
||||
expect(window.dataLayer).toBeDefined();
|
||||
const configEntry = window.dataLayer?.find(entry => {
|
||||
return Object.prototype.toString.call(entry) === '[object Arguments]' && entry[0] === 'config';
|
||||
});
|
||||
expect(configEntry).toBeDefined();
|
||||
expect(configEntry[1]).toBe('G-test');
|
||||
});
|
||||
|
||||
it('defers tags until interaction and loads only once',()=>{
|
||||
render(<AnalyticsDeferred gtmId="GTM-test" gaId="G-test" clarityId="test"/>);
|
||||
expect(document.scripts).toHaveLength(0);
|
||||
fireEvent.scroll(window);
|
||||
fireEvent.keyDown(window);
|
||||
act(()=>vi.advanceTimersByTime(3500));
|
||||
expect(document.scripts).toHaveLength(3);
|
||||
const hasConfig = window.dataLayer?.some(entry => entry[0] === 'config' && entry[1] === 'G-test');
|
||||
expect(hasConfig).toBe(true);
|
||||
});
|
||||
|
||||
it('tracks client-side route changes when pathname changes',()=>{
|
||||
const {rerender} = render(<AnalyticsDeferred gaId="G-test" gtmId="GTM-test"/>);
|
||||
fireEvent.scroll(window);
|
||||
act(()=>vi.advanceTimersByTime(3500));
|
||||
|
||||
// Simulate navigation to blog
|
||||
mockPathname = '/blog/test-article';
|
||||
rerender(<AnalyticsDeferred gaId="G-test" gtmId="GTM-test"/>);
|
||||
|
||||
const gtmPageView = window.dataLayer?.find(entry => entry.event === 'page_view' && entry.page_path === '/blog/test-article');
|
||||
expect(gtmPageView).toBeDefined();
|
||||
|
||||
const gaPageView = window.dataLayer?.find(entry => {
|
||||
return Object.prototype.toString.call(entry) === '[object Arguments]' && entry[0] === 'event' && entry[1] === 'page_view';
|
||||
});
|
||||
expect(gaPageView).toBeDefined();
|
||||
expect(gaPageView[2].page_path).toBe('/blog/test-article');
|
||||
});
|
||||
|
||||
it.each(['scroll','touchstart','mousemove','keydown'])('loads on %s',event=>{
|
||||
render(<AnalyticsDeferred gtmId="GTM-test"/>);
|
||||
fireEvent(window,new Event(event));
|
||||
expect(document.scripts).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('loads clarity when no script exists',()=>{
|
||||
render(<AnalyticsDeferred clarityId="solo"/>);
|
||||
fireEvent.scroll(window);
|
||||
expect(document.querySelector('script')?.src).toBe('https://www.clarity.ms/tag/solo');
|
||||
});
|
||||
|
||||
it('preserves the existing clarity implementation',()=>{
|
||||
const clarity=vi.fn();
|
||||
(window as any).clarity=clarity;
|
||||
render(<AnalyticsDeferred clarityId="existing"/>);
|
||||
fireEvent.scroll(window);
|
||||
expect((window as any).clarity).toBe(clarity);
|
||||
expect(document.querySelector('script')?.src).toBe('https://www.clarity.ms/tag/existing');
|
||||
});
|
||||
|
||||
it('queues clarity calls before its script initializes',()=>{
|
||||
render(<AnalyticsDeferred clarityId="queued"/>);
|
||||
fireEvent.scroll(window);
|
||||
(window as any).clarity('event','checkout');
|
||||
expect((window as any).clarity.q).toEqual([['event','checkout']]);
|
||||
});
|
||||
|
||||
it('falls back after 3500ms and reuses existing GA script',()=>{
|
||||
const s=document.createElement('script');
|
||||
s.src='https://www.googletagmanager.com/gtag/js?id=G-test';
|
||||
document.head.append(s);
|
||||
render(<AnalyticsDeferred gaId="G-test"/>);
|
||||
act(()=>vi.advanceTimersByTime(3499));
|
||||
expect(window.dataLayer).toBeUndefined();
|
||||
act(()=>vi.advanceTimersByTime(1));
|
||||
expect(document.scripts).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('cancels idle work on unmount',()=>{
|
||||
let cb:()=>void=()=>{};
|
||||
vi.stubGlobal('requestIdleCallback',vi.fn(fn=>{cb=fn;return 9;}));
|
||||
vi.stubGlobal('cancelIdleCallback',vi.fn());
|
||||
const v=render(<AnalyticsDeferred gtmId="GTM-test"/>);
|
||||
act(()=>vi.advanceTimersByTime(3500));
|
||||
v.unmount();
|
||||
act(()=>cb());
|
||||
expect(document.scripts).toHaveLength(0);
|
||||
expect(cancelIdleCallback).toHaveBeenCalledWith(9);
|
||||
});
|
||||
|
||||
it('unmount removes event and timeout callbacks',()=>{
|
||||
const v=render(<AnalyticsDeferred gtmId="GTM-test"/>);
|
||||
v.unmount();
|
||||
fireEvent.scroll(window);
|
||||
act(()=>vi.advanceTimersByTime(4000));
|
||||
expect(document.scripts).toHaveLength(0);
|
||||
});
|
||||
@@ -113,16 +113,18 @@ describe("B2BLandingClient Component", () => {
|
||||
fireEvent.click(submitBtn);
|
||||
|
||||
await waitFor(() => {
|
||||
expect(api.post).toHaveBeenCalledWith("/wholesale/apply", {
|
||||
businessName: "کلینیک تخصصی آریا (بیمارستان دامپزشکی - تهران) - رابط: دکتر حسینی",
|
||||
licenseNumber: "09121112233",
|
||||
notes: "سفارش اولیه مکملهای حرکتی و کلسیم",
|
||||
});
|
||||
expect(api.post).toHaveBeenCalledWith("/b2b/inquire", expect.objectContaining({
|
||||
companyName: "کلینیک تخصصی آریا",
|
||||
contactName: "دکتر حسینی",
|
||||
phone: "09121112233",
|
||||
businessType: "بیمارستان دامپزشکی (شهر: تهران)",
|
||||
message: "سفارش اولیه مکملهای حرکتی و کلسیم",
|
||||
}));
|
||||
});
|
||||
|
||||
await waitFor(() => {
|
||||
expect(toast.success).toHaveBeenCalledWith(
|
||||
expect.stringContaining("درخواست همکاری شما با موفقیت ثبت شد")
|
||||
expect.stringContaining("درخواست همکاری تجاری شما با موفقیت ثبت شد")
|
||||
);
|
||||
expect(screen.getByText("درخواست شما با موفقیت ثبت شد")).toBeInTheDocument();
|
||||
expect(
|
||||
|
||||
@@ -14,11 +14,11 @@ vi.mock('../SafeImage',()=>({default:({alt}:{alt:string})=><img alt={alt}/>}));
|
||||
const products=[{id:'1',name:'Joint care',artNo:'A1',priceValue:1000,wholesalePrice:650,category:'joints'},{id:'2',name:'Skin care',artNo:'B2',priceValue:2000,category:'skin'}];
|
||||
beforeEach(()=>{vi.clearAllMocks();state.role='User_Wholesale';state.getProducts.mockResolvedValue({data:products});state.post.mockResolvedValue({});});
|
||||
afterEach(()=>{cleanup();vi.restoreAllMocks();});
|
||||
it('uses specific price and settings discount fallback',async()=>{render(<B2BPortal onClose={()=>{}}/>);await screen.findByText('Joint care');expect(state.getProducts).toHaveBeenCalledWith({limit:999});expect(screen.getByText('۶۵۰ تومان')).toBeInTheDocument();expect(screen.getByText('۱,۶۰۰ تومان')).toBeInTheDocument();});
|
||||
it.each(['User_Wholesale','ADMIN','User_Partner'])('unlocks wholesale prices for %s',async role=>{state.role=role;render(<B2BPortal onClose={()=>{}}/>);await screen.findByText('Joint care');expect(screen.queryByText('نیازمند تایید ادمین')).not.toBeInTheDocument();});
|
||||
it('hides wholesale prices for unverified users',async()=>{state.role='USER';render(<B2BPortal onClose={()=>{}}/>);await screen.findByText('Joint care');expect(screen.getAllByText('نیازمند تایید ادمین')).toHaveLength(2);expect(screen.queryByText('۶۵۰ تومان')).not.toBeInTheDocument();});
|
||||
it('filters by code preserving selection and clamps negative quantity',async()=>{render(<B2BPortal onClose={()=>{}}/>);await screen.findByText('Joint care');expect(screen.getByRole('button',{name:/افزودن کلی/})).toBeDisabled();fireEvent.change(screen.getAllByRole('spinbutton')[0],{target:{value:'3'}});fireEvent.change(screen.getAllByRole('spinbutton')[1],{target:{value:'-2'}});fireEvent.change(screen.getByPlaceholderText('جستجوی کد کالا یا نام محصول...'),{target:{value:'B2'}});expect(screen.queryByText('Joint care')).not.toBeInTheDocument();fireEvent.click(screen.getByRole('button',{name:/افزودن کلی/}));expect(state.addItem).toHaveBeenCalledExactlyOnceWith(products[0],3);expect(screen.getByText(/سفارشات با موفقیت/)).toBeInTheDocument();});
|
||||
it('uses specific price and settings discount fallback',async()=>{render(<B2BPortal onClose={()=>{}}/>);await screen.findAllByText('Joint care');expect(state.getProducts).toHaveBeenCalledWith({limit:999});expect(screen.getByText('۶۵۰ تومان')).toBeInTheDocument();expect(screen.getByText('۱,۶۰۰ تومان')).toBeInTheDocument();});
|
||||
it.each(['User_Wholesale','ADMIN','User_Partner'])('unlocks wholesale prices for %s',async role=>{state.role=role;render(<B2BPortal onClose={()=>{}}/>);await screen.findAllByText('Joint care');expect(screen.queryByText('نیازمند تایید ادمین')).not.toBeInTheDocument();});
|
||||
it('hides wholesale prices for unverified users',async()=>{state.role='USER';render(<B2BPortal onClose={()=>{}}/>);await screen.findAllByText('Joint care');expect(screen.getAllByText('نیازمند تایید ادمین')).toHaveLength(2);expect(screen.queryByText('۶۵۰ تومان')).not.toBeInTheDocument();});
|
||||
it('filters by code preserving selection and clamps negative quantity',async()=>{render(<B2BPortal onClose={()=>{}}/>);await screen.findAllByText('Joint care');expect(screen.getByRole('button',{name:/افزودن کلی/})).toBeDisabled();fireEvent.change(screen.getAllByRole('spinbutton')[0],{target:{value:'3'}});fireEvent.change(screen.getAllByRole('spinbutton')[1],{target:{value:'-2'}});fireEvent.change(screen.getByPlaceholderText('جستجوی کد کالا یا نام محصول...'),{target:{value:'B2'}});expect(screen.queryAllByText('Joint care')).toHaveLength(0);fireEvent.click(screen.getByRole('button',{name:/افزودن کلی/}));expect(state.addItem).toHaveBeenCalledExactlyOnceWith(products[0],3);expect(screen.getByText(/سفارشات با موفقیت/)).toBeInTheDocument();});
|
||||
it.each([false,true])('consultation success/error: failure=%s',async failure=>{state.role='USER';if(failure)state.post.mockRejectedValue(new Error('offline'));const {container}=render(<B2BPortal onClose={()=>{}}/>);fireEvent.change(screen.getByPlaceholderText('نام مجموعه / کلینیک / داروخانه'),{target:{value:'Clinic'}});fireEvent.change(screen.getByPlaceholderText('شماره تماس همراه'),{target:{value:'09120000000'}});fireEvent.submit(container.querySelector('form')!);await waitFor(()=>expect(failure?state.error:state.success).toHaveBeenCalledOnce());expect(state.post).toHaveBeenCalledWith('/wholesale/apply',{businessName:'Clinic',licenseNumber:'09120000000'});expect(screen.getByPlaceholderText('نام مجموعه / کلینیک / داروخانه')).toHaveValue(failure?'Clinic':'');});
|
||||
it('handles product loading failure visibly',async()=>{state.getProducts.mockRejectedValueOnce(new Error('offline'));render(<B2BPortal onClose={()=>{}}/>);expect(await screen.findByText(/خطا در دریافت محصولات/)).toBeInTheDocument();expect(screen.getByRole('button',{name:/افزودن کلی/})).toBeDisabled();});
|
||||
it.each([false,true])('ignores a settled request after unmount: failure=%s',async failure=>{let resolve!:(value:{data:typeof products})=>void;let reject!:(reason:Error)=>void;state.getProducts.mockReturnValueOnce(new Promise((yes,no)=>{resolve=yes;reject=no;}));const first=render(<B2BPortal onClose={()=>{}}/>);first.unmount();const next=render(<B2BPortal onClose={()=>{}}/>);await screen.findByText('Joint care');await act(async()=>{if(failure)reject(new Error('late failure'));else resolve({data:[{...products[0],name:'Stale product'}]});});expect(screen.queryByRole('alert')).not.toBeInTheDocument();expect(screen.queryByText('Stale product')).not.toBeInTheDocument();expect(screen.getByText('Joint care')).toBeInTheDocument();next.unmount();});
|
||||
it.each([false,true])('ignores a settled request after unmount: failure=%s',async failure=>{let resolve!:(value:{data:typeof products})=>void;let reject!:(reason:Error)=>void;state.getProducts.mockReturnValueOnce(new Promise((yes,no)=>{resolve=yes;reject=no;}));const first=render(<B2BPortal onClose={()=>{}}/>);first.unmount();const next=render(<B2BPortal onClose={()=>{}}/>);await screen.findAllByText('Joint care');await act(async()=>{if(failure)reject(new Error('late failure'));else resolve({data:[{...products[0],name:'Stale product'}]});});expect(screen.queryByRole('alert')).not.toBeInTheDocument();expect(screen.queryByText('Stale product')).not.toBeInTheDocument();expect(screen.getAllByText('Joint care')[0]).toBeInTheDocument();next.unmount();});
|
||||
it('closes via callback',()=>{const close=vi.fn();const {container}=render(<B2BPortal onClose={close}/>);fireEvent.click(container.querySelector('button')!);expect(close).toHaveBeenCalledOnce();});
|
||||
@@ -21,6 +21,9 @@ const categories=[{id:'joints',name:'Joints',slug:'joints'},{id:'skin',name:'Ski
|
||||
beforeEach(()=>vi.clearAllMocks());
|
||||
describe('BlogPage',()=>{
|
||||
it('renders featured and regular posts as semantic links',()=>{render(<BlogPage blogs={blogs} categories={categories}/>);expect(screen.getAllByRole('heading',{level:2})[0]).toHaveTextContent('Skin article');expect(screen.getByRole('link',{name:/Skin article/})).toHaveAttribute('href','/blog/skin');expect(screen.getByRole('link',{name:/Joint article/})).toHaveAttribute('href','/blog/joint');});
|
||||
it('labels publication, including a same-day material update, author and stable team on featured and regular cards',()=>{const fresh=[{...blogs[0],publishedAt:'2026-01-01T08:00:00Z',contentUpdatedAt:'2026-01-02T08:00:00Z',authorTeam:'Clinical'}, {...blogs[1],publishedAt:'2026-01-02T08:00:00Z',contentUpdatedAt:'2026-01-02T12:00:00Z'}];render(<BlogPage blogs={fresh} categories={categories}/>);expect(screen.getAllByText(/تاریخ انتشار/)).toHaveLength(2);expect(screen.getAllByText(/آخرین بهروزرسانی/)).toHaveLength(2);expect(screen.getAllByText(/نویسنده:/)).toHaveLength(2);expect(screen.getByText(/تیم: Clinical/)).toBeInTheDocument();expect(screen.getByText(/تیم: پژوهش و محتوای علمی کنینا/)).toBeInTheDocument();expect(document.querySelectorAll('time[datetime]').length).toBeGreaterThanOrEqual(4);});
|
||||
it('stacks author and team on separate non-wrapping rows and keeps featured action on one line',()=>{render(<BlogPage blogs={blogs} categories={categories}/>);const featuredMeta=screen.getByTestId('featured-attribution');expect(featuredMeta).toHaveClass('flex-col');expect(screen.getByTestId('featured-read-more')).toHaveClass('whitespace-nowrap');const regularMeta=screen.getByTestId('regular-attribution-1');expect(regularMeta).toHaveClass('flex-col');expect(regularMeta.children).toHaveLength(2);expect(regularMeta.children[0]).toHaveClass('whitespace-nowrap');expect(regularMeta.children[1]).toHaveClass('whitespace-nowrap');});
|
||||
it('keeps the featured footer responsive without forcing attribution or action to wrap',()=>{render(<BlogPage blogs={blogs} categories={categories}/>);expect(screen.getByTestId('featured-footer')).toHaveClass('flex-col','sm:flex-row');expect(screen.getByTestId('featured-author-name')).toHaveClass('whitespace-nowrap');expect(screen.getByTestId('featured-team-name')).toHaveClass('whitespace-nowrap');});
|
||||
it('combines category, excerpt search and tags then resets empty intersection',()=>{render(<BlogPage blogs={blogs} categories={categories}/>);fireEvent.click(screen.getByRole('button',{name:'Joints'}));expect(h.replace).toHaveBeenCalledWith('/blog?categoryId=joints',{scroll:false});expect(screen.queryByText('Skin article')).not.toBeInTheDocument();fireEvent.change(screen.getByPlaceholderText('جستجو در موضوعات، بیماریها، ویتامینها...'),{target:{value:'MOBILITY'}});expect(screen.getByText('Joint article')).toBeInTheDocument();fireEvent.click(screen.getByRole('button',{name:'#coat'}));expect(screen.getByText('هیچ مقالهای با معیارهای جستجوی شما یافت نشد.')).toBeInTheDocument();fireEvent.click(screen.getByRole('button',{name:'پاکسازی همه فیلترها'}));expect(screen.getByText('Skin article')).toBeInTheDocument();expect(screen.getByText('Joint article')).toBeInTheDocument();});
|
||||
it('syncs category with route props',()=>{const view=render(<BlogPage blogs={blogs} categories={categories} initialCategoryId="joints"/>);expect(screen.queryByText('Skin article')).not.toBeInTheDocument();view.rerender(<BlogPage blogs={blogs} categories={categories} initialCategoryId="skin"/>);expect(screen.queryByText('Joint article')).not.toBeInTheDocument();});
|
||||
it('clears search and toggles tags off',()=>{render(<BlogPage blogs={blogs}/>);fireEvent.click(screen.getByRole('button',{name:'#health'}));expect(screen.queryByText('Skin article')).not.toBeInTheDocument();fireEvent.click(screen.getByRole('button',{name:'#health'}));expect(screen.getByText('Skin article')).toBeInTheDocument();fireEvent.change(screen.getByPlaceholderText('جستجو در موضوعات، بیماریها، ویتامینها...'),{target:{value:'missing'}});fireEvent.click(screen.getByRole('button',{name:'پاک کردن'}));expect(screen.getByText('Skin article')).toBeInTheDocument();});
|
||||
|
||||
@@ -89,7 +89,7 @@ describe("BlogPostClient Component", () => {
|
||||
// Breadcrumb and headers
|
||||
expect(screen.getByRole("heading", { level: 1, name: /راهنمای جامع کانیهیدروکس GAG/ })).toBeInTheDocument();
|
||||
expect(screen.getAllByText("سلامت استخوان و مفاصل").length).toBeGreaterThan(0);
|
||||
expect(screen.getByText("دکتر توماس بکر")).toBeInTheDocument();
|
||||
expect(screen.getByText("نویسنده: دکتر توماس بکر")).toBeInTheDocument();
|
||||
expect(screen.getByText("۱۵ فروردین ۱۴۰۵")).toBeInTheDocument();
|
||||
expect(screen.getAllByText(/دقیقه مطالعه/).length).toBeGreaterThan(0);
|
||||
|
||||
@@ -110,6 +110,15 @@ describe("BlogPostClient Component", () => {
|
||||
expect(screen.getByText("بستهبندی قوطی کانیهیدروکس")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("renders semantic publication, valid update and explicit author/team labels", () => {
|
||||
render(<BlogPostClient blog={{...mockBlog,publishedAt:"2026-01-01T00:00:00Z",contentUpdatedAt:"2026-01-02T00:00:00Z",authorTeam:"Science"}} sanitizedContent={mockBlog.content} publishedDate="۱۲ دی ۱۴۰۴" authorName="دکتر بکر" />);
|
||||
expect(screen.getByText(/تاریخ انتشار/)).toBeInTheDocument();
|
||||
expect(screen.getByText(/آخرین بهروزرسانی/)).toBeInTheDocument();
|
||||
expect(screen.getByText(/نویسنده: دکتر بکر/)).toBeInTheDocument();
|
||||
expect(screen.getByText(/تیم: Science/)).toBeInTheDocument();
|
||||
expect(document.querySelectorAll("time[datetime]").length).toBe(2);
|
||||
});
|
||||
|
||||
it("registers blog view count on mount via API", async () => {
|
||||
render(
|
||||
<BlogPostClient
|
||||
@@ -153,10 +162,7 @@ describe("BlogPostClient Component", () => {
|
||||
|
||||
// Scientific Consultation CTA
|
||||
expect(screen.getByText("نیاز به راهنمایی و دوز درمانی دارید؟")).toBeInTheDocument();
|
||||
expect(screen.getByRole("link", { name: /مشاوره هوشمند دارویی/ })).toHaveAttribute(
|
||||
"href",
|
||||
"/smart-advisor"
|
||||
);
|
||||
expect(screen.getByRole("button", { name: /مشاوره هوشمند دارویی/ })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("renders existing comments and handles new comment submission successfully", async () => {
|
||||
|
||||
@@ -110,9 +110,10 @@ describe("BlogPreviewSection Component", () => {
|
||||
});
|
||||
|
||||
// Author display
|
||||
expect(screen.getByText("دکتر مریم اکبری")).toBeInTheDocument();
|
||||
expect(screen.getByText("نویسنده: دکتر مریم اکبری")).toBeInTheDocument();
|
||||
// Default fallback author
|
||||
expect(screen.getByText("تحریریه کنینا")).toBeInTheDocument();
|
||||
expect(screen.getByText("نویسنده: کنینا")).toBeInTheDocument();
|
||||
expect(screen.getAllByText("تیم: پژوهش و محتوای علمی کنینا")).toHaveLength(2);
|
||||
|
||||
// Verify aria-label links with full title context
|
||||
const link1 = screen.getByLabelText("مطالعه مقاله: اهمیت کلسیم و مفاصل در رشد توله سگ ژرمن شپرد");
|
||||
@@ -122,6 +123,15 @@ describe("BlogPreviewSection Component", () => {
|
||||
expect(link2).toHaveAttribute("href", "/blog/cat-hair-loss-solutions");
|
||||
});
|
||||
|
||||
it("uses publication freshness and explicit byline labels on homepage cards", async () => {
|
||||
vi.mocked(api.get).mockResolvedValueOnce({ data: { blogs: [{ id:"b",slug:"b",title:"B",content:"",viewCount:0,createdAt:"2026-01-01T00:00:00Z",publishedAt:"2026-01-01T00:00:00Z",contentUpdatedAt:"2026-01-02T00:00:00Z",authorTeam:"Science" }] } });
|
||||
render(<BlogPreviewSection />);
|
||||
expect(await screen.findByText(/تاریخ انتشار/)).toBeInTheDocument();
|
||||
expect(screen.getByText(/آخرین بهروزرسانی/)).toBeInTheDocument();
|
||||
expect(screen.getByText(/نویسنده:/)).toBeInTheDocument();
|
||||
expect(screen.getByText(/تیم: Science/)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("handles api errors gracefully and renders null", async () => {
|
||||
vi.mocked(api.get).mockRejectedValueOnce(new Error("Failed to load"));
|
||||
const { container } = render(<BlogPreviewSection />);
|
||||
|
||||
@@ -98,11 +98,11 @@ describe('MobileBottomNav Component', () => {
|
||||
expect(screen.getByText('حساب من')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('hides component on product detail page (/shop/[id])', () => {
|
||||
it('retains component on product detail page (/shop/[id]) for continuous navigation', () => {
|
||||
vi.mocked(usePathname).mockReturnValue('/shop/canina-glucosamine-123');
|
||||
const { container } = render(<MobileBottomNav />);
|
||||
render(<MobileBottomNav />);
|
||||
|
||||
expect(container.firstChild).toBeNull();
|
||||
expect(screen.getByRole('navigation', { name: 'منوی ناوبری موبایل' })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('highlights the active tab according to current path', () => {
|
||||
|
||||
Loaded 100 of 114 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user