chore(workspace): eradicate all tsc errors and eslint warnings across frontend, admin, and backend
Deploy Canina / deploy (push) Failing after 29s
Deploy Canina / deploy (push) Failing after 29s
This commit is contained in:
1 parent
4659a7b1de
commit
9f11d8fb2d
98 files changed
+1272
-1009
No files matched your search
@@ -11,6 +11,49 @@ const CATEGORY_SLUG_TO_NAME: Record<string, string> = {
|
||||
'supplements': 'مکملهای غذایی و درمانی',
|
||||
};
|
||||
|
||||
interface BackendProduct {
|
||||
id?: string;
|
||||
artNo?: string;
|
||||
nameFa?: string;
|
||||
name?: string;
|
||||
nameEn?: string;
|
||||
scientificTagline?: string;
|
||||
description?: string;
|
||||
shortDescription?: string;
|
||||
priceDisplay?: string;
|
||||
priceValue?: number;
|
||||
category?: { name?: string } | string;
|
||||
categorySlug?: string;
|
||||
unit?: string;
|
||||
packageSize?: number;
|
||||
dosageLogic?: string;
|
||||
benefits?: string;
|
||||
suitableFor?: string;
|
||||
requiresRx?: boolean;
|
||||
storage?: string;
|
||||
specialBadge?: string;
|
||||
onSetOfAction?: string;
|
||||
optimisticTemplate?: string;
|
||||
feedingAdvice?: string;
|
||||
slug?: string;
|
||||
imageUrl?: string;
|
||||
image?: string;
|
||||
productGroup?: string;
|
||||
ingredientList?: Array<{ ingredient: string }>;
|
||||
ingredients?: string;
|
||||
symptoms?: Array<{ symptom?: string } | string>;
|
||||
keyBenefits?: unknown;
|
||||
expectedResults?: unknown;
|
||||
scientificValidation?: unknown;
|
||||
doctorNotes?: unknown;
|
||||
scientificArticles?: unknown;
|
||||
compositionTable?: unknown;
|
||||
analyticalConstituents?: unknown;
|
||||
additivesPerKg?: unknown;
|
||||
faqList?: unknown;
|
||||
specialist?: unknown;
|
||||
}
|
||||
|
||||
export class ProductService {
|
||||
private static instance: ProductService;
|
||||
|
||||
@@ -24,7 +67,7 @@ export class ProductService {
|
||||
}
|
||||
|
||||
private mapBackendToFrontend(inputData: Record<string, unknown>): Product {
|
||||
const data = inputData as any;
|
||||
const data = inputData as unknown as BackendProduct;
|
||||
// Find the local static product to inherit functions like calculateDosage
|
||||
const local = PRODUCTS.find(p =>
|
||||
p.artNo === data.artNo ||
|
||||
@@ -32,32 +75,45 @@ export class ProductService {
|
||||
(typeof data.slug === 'string' && data.slug.includes(p.id))
|
||||
);
|
||||
|
||||
const safeParse = (val: unknown, fallback: unknown) => {
|
||||
const safeParse = <T>(val: unknown, fallback: T): T => {
|
||||
if (!val) return fallback;
|
||||
if (typeof val === 'string') {
|
||||
try { return JSON.parse(val); } catch { return fallback; }
|
||||
try { return JSON.parse(val) as T; } catch { return fallback; }
|
||||
}
|
||||
return val;
|
||||
return val as T;
|
||||
};
|
||||
|
||||
const categoryName = typeof data.category === 'object' && data.category !== null
|
||||
? data.category.name
|
||||
: (typeof data.category === 'string' ? data.category : (CATEGORY_SLUG_TO_NAME[data.categorySlug || ''] || data.categorySlug || ''));
|
||||
|
||||
const priceVal = Number(data.priceValue || 0);
|
||||
|
||||
const defaultSpecialist = local?.specialist || {
|
||||
name: 'تیم تخصصی کانینا',
|
||||
title: 'مشاور علمی و دارویی',
|
||||
image: '/images/vets/vet1.webp',
|
||||
message: 'تمامی محصولات مکمل کانینا دارای استانداردهای دارویی آلمان و تاییدیه کلینیکی هستند.'
|
||||
};
|
||||
|
||||
return {
|
||||
id: data.id,
|
||||
artNo: data.artNo,
|
||||
id: data.id || '',
|
||||
artNo: data.artNo || '',
|
||||
name: data.nameFa || data.name || '',
|
||||
nameFa: data.nameFa || data.name || '',
|
||||
nameEn: data.nameEn || '',
|
||||
scientificTagline: data.scientificTagline,
|
||||
description: data.description,
|
||||
scientificTagline: data.scientificTagline || '',
|
||||
description: data.description || '',
|
||||
shortDescription: data.shortDescription || '',
|
||||
price: data.priceDisplay || `${data.priceValue.toLocaleString('fa-IR')} تومان`,
|
||||
priceValue: Number(data.priceValue),
|
||||
category: data.category?.name || data.category || CATEGORY_SLUG_TO_NAME[data.categorySlug] || data.categorySlug || '',
|
||||
categorySlug: data.categorySlug,
|
||||
unit: data.unit,
|
||||
packageSize: data.packageSize,
|
||||
dosage_logic: data.dosageLogic,
|
||||
benefits: data.benefits,
|
||||
suitableFor: data.suitableFor as PetType,
|
||||
price: data.priceDisplay || `${priceVal.toLocaleString('fa-IR')} تومان`,
|
||||
priceValue: priceVal,
|
||||
category: categoryName || '',
|
||||
categorySlug: data.categorySlug || '',
|
||||
unit: data.unit || 'عدد',
|
||||
packageSize: Number(data.packageSize || 100),
|
||||
dosage_logic: data.dosageLogic || '',
|
||||
benefits: data.benefits || '',
|
||||
suitableFor: (data.suitableFor as PetType) || 'سگ',
|
||||
requiresRx: Boolean(data.requiresRx),
|
||||
storage: data.storage,
|
||||
specialBadge: data.specialBadge,
|
||||
@@ -69,18 +125,14 @@ export class ProductService {
|
||||
? data.imageUrl
|
||||
: (local?.image || (data.imageUrl ? `/api${data.imageUrl}` : data.image || '')),
|
||||
|
||||
main_ingredients: data.ingredientList?.map((i: { ingredient: string }) => i.ingredient) || data.ingredients?.split(/[،,-]/).map((s: string) => s.trim()).filter(Boolean) || [],
|
||||
symptoms: data.symptoms?.map((s: { symptom?: string }) => s.symptom || s) || [],
|
||||
keyBenefits: safeParse(data.keyBenefits, []),
|
||||
expectedResults: safeParse(data.expectedResults, []),
|
||||
benefitsList: safeParse(data.benefitsList, []),
|
||||
faqs: safeParse(data.faqs, []),
|
||||
analysis: safeParse(data.analysis, {}),
|
||||
specialist: safeParse(data.specialist, null),
|
||||
relatedProducts: safeParse(data.relatedProducts, []),
|
||||
contraindications: safeParse(data.contraindications, []),
|
||||
|
||||
calculateDosage: local?.calculateDosage || (() => ({ quantity: 0, unit: '', description: '' }))
|
||||
main_ingredients: data.ingredientList?.map(i => i.ingredient) || data.ingredients?.split(/[،,-]/).map(s => s.trim()).filter(Boolean) || [],
|
||||
symptoms: data.symptoms?.map(s => typeof s === 'string' ? s : s.symptom || '').filter(Boolean) || [],
|
||||
keyBenefits: safeParse<Product['keyBenefits']>(data.keyBenefits, local?.keyBenefits || []),
|
||||
expectedResults: safeParse<Product['expectedResults']>(data.expectedResults, local?.expectedResults || []),
|
||||
analysis: safeParse<Record<string, string>>(data.compositionTable, local?.analysis || {}),
|
||||
specialist: safeParse<Product['specialist']>(data.specialist, defaultSpecialist),
|
||||
|
||||
calculateDosage: local?.calculateDosage,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ describe('userStore', () => {
|
||||
|
||||
vi.mocked(authService.getProfile).mockResolvedValue(mockProfileData);
|
||||
|
||||
(globalThis as any)._testToken = 'test-token';
|
||||
(globalThis as unknown as { _testToken?: string })._testToken = 'test-token';
|
||||
const store = useUserStore.getState();
|
||||
await store.fetchProfile();
|
||||
|
||||
|
||||
@@ -184,7 +184,7 @@ export const useUserStore = create<UserStore>()(
|
||||
},
|
||||
fetchProfile: async () => {
|
||||
try {
|
||||
const token = typeof window !== 'undefined' && window.localStorage ? localStorage.getItem('accessToken') : (globalThis as any)._testToken;
|
||||
const token = typeof window !== 'undefined' && window.localStorage ? localStorage.getItem('accessToken') : (globalThis as unknown as { _testToken?: string })._testToken;
|
||||
if (!token) {
|
||||
try { usePetStore.getState().reset(); } catch {}
|
||||
try { localStorage.removeItem("canina-pets"); } catch {}
|
||||
|
||||
Reference in new issue
Block a user