fix: sidebar accordion + koja slug + support ticket LINQ crash
CI/CD / CI · API (dotnet build + test) (push) Successful in 5m50s
CI/CD / CI · Admin API (dotnet build) (push) Successful in 32s
CI/CD / CI · Dashboard (tsc) (push) Successful in 1m3s
CI/CD / CI · Admin Web (tsc) (push) Successful in 35s
CI/CD / CI · Website (tsc) (push) Successful in 44s
CI/CD / CI · Koja (tsc) (push) Successful in 48s
CI/CD / Deploy · all services (push) Has been cancelled

Sidebar:
- All groups start collapsed on first load (v4 storage key resets old state)
- Opening one group closes all others (accordion)
- Navigating to a section opens only that section's group

Koja slug:
- SlugHelper: Persian->Latin transliteration, slug validation
- Registration accepts optional custom slug; auto-derives from cafe name
- Slug can be updated from dashboard Settings -> Profile
- Settings PATCH validates uniqueness (SLUG_TAKEN) and format (INVALID_SLUG)
- koja.meezi.ir/{slug} now redirects to /fa/cafe/{slug} (short URL support)

Bug fix:
- SupportTicketService: cafeId/status filters applied before Select() projection
  to fix EF "could not be translated" crash on the support tickets page

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
soroush.asadi
2026-05-31 22:28:25 +03:30
parent 38e3f6a5a2
commit cd1af30bbc
17 changed files with 401 additions and 58 deletions
File diff suppressed because one or more lines are too long
+12 -3
View File
@@ -52,7 +52,10 @@
"usernamePlaceholder": "اسم المستخدم",
"password": "كلمة المرور",
"passwordPlaceholder": "كلمة المرور",
"invalidCredentials": "اسم المستخدم أو كلمة المرور غير صحيحة."
"invalidCredentials": "اسم المستخدم أو كلمة المرور غير صحيحة.",
"kojaSlug": "عنوان الملف الشخصي في كوجا",
"kojaSlugHint": "يجد الزوار مقهاكم على هذا العنوان",
"kojaSlugPlaceholder": "مثال: my-cafe"
},
"roles": {
"owner": "المالك",
@@ -1146,7 +1149,13 @@
"uploadLogo": "رفع الشعار",
"uploadCover": "رفع الغلاف",
"saved": "تم حفظ الملف.",
"reloginHint": "تم تحديث الخطة؛ سجّل الخروج والدخول إن لزم."
"reloginHint": "تم تحديث الخطة؛ سجّل الخروج والدخول إن لزم.",
"slug": "عنوان ملف كوجا",
"slugHint": "صفحة مقهاكم على كوجا — أحرف صغيرة وأرقام وشرطات فقط",
"slugPlaceholder": "my-cafe",
"slugTaken": "هذا العنوان مأخوذ. الرجاء اختيار عنوان آخر.",
"slugInvalid": "عنوان غير صالح. استخدم الأحرف الصغيرة والأرقام والشرطات فقط.",
"kojaUrl": "رابط كوجا"
},
"taraz": "تاراز (الضرائب)",
"tarazHint": "إرسال فواتير الأمس إلى تاراز (وضع تجريبي).",
@@ -1502,4 +1511,4 @@
"premium": "پریمیوم"
}
}
}
}
+12 -3
View File
@@ -63,7 +63,10 @@
"usernamePlaceholder": "Username",
"password": "Password",
"passwordPlaceholder": "Password",
"invalidCredentials": "Incorrect username or password."
"invalidCredentials": "Incorrect username or password.",
"kojaSlug": "Koja profile address",
"kojaSlugHint": "Customers will find your cafe at this address",
"kojaSlugPlaceholder": "e.g. my-cafe"
},
"roles": {
"owner": "Owner",
@@ -1228,7 +1231,13 @@
"uploadLogo": "Upload logo",
"uploadCover": "Upload cover",
"saved": "Profile saved.",
"reloginHint": "Plan updated; sign out and in again if the badge looks wrong."
"reloginHint": "Plan updated; sign out and in again if the badge looks wrong.",
"slug": "Koja profile address",
"slugHint": "Your cafe page on Koja — lowercase letters, digits, hyphens only",
"slugPlaceholder": "my-cafe",
"slugTaken": "This address is already taken. Please choose another.",
"slugInvalid": "Invalid address. Use lowercase letters, digits, and hyphens only.",
"kojaUrl": "Koja URL"
},
"taraz": "Taraz (tax system)",
"tarazHint": "Submit yesterday's invoices to Taraz (demo mode logs only).",
@@ -1655,4 +1664,4 @@
"premium": "Premium"
}
}
}
}
+12 -3
View File
@@ -63,7 +63,10 @@
"usernamePlaceholder": "نام کاربری",
"password": "رمز عبور",
"passwordPlaceholder": "رمز عبور",
"invalidCredentials": "نام کاربری یا رمز عبور اشتباه است."
"invalidCredentials": "نام کاربری یا رمز عبور اشتباه است.",
"kojaSlug": "آدرس پروفایل در کوجا",
"kojaSlugHint": "بازدیدکنندگان از این آدرس کافه شما را پیدا می‌کنند",
"kojaSlugPlaceholder": "مثال: cafe-roya"
},
"roles": {
"owner": "مالک",
@@ -1233,7 +1236,13 @@
"uploadLogo": "بارگذاری لوگو",
"uploadCover": "بارگذاری کاور",
"saved": "پروفایل ذخیره شد.",
"reloginHint": "پلن به‌روز شد؛ در صورت نیاز یک‌بار خارج و وارد شوید."
"reloginHint": "پلن به‌روز شد؛ در صورت نیاز یک‌بار خارج و وارد شوید.",
"slug": "آدرس پروفایل کوجا",
"slugHint": "آدرس صفحه کافه شما در کوجا — فقط حروف انگلیسی، اعداد و خط تیره",
"slugPlaceholder": "cafe-roya",
"slugTaken": "این آدرس قبلاً گرفته شده. آدرس دیگری انتخاب کنید.",
"slugInvalid": "آدرس نامعتبر است. فقط حروف انگلیسی کوچک، اعداد و خط تیره مجاز است.",
"kojaUrl": "آدرس کوجا"
},
"plans": {
"compareLabel": "مقایسه پلن‌ها",
@@ -1656,4 +1665,4 @@
"premium": "پریمیوم"
}
}
}
}
@@ -1,6 +1,6 @@
"use client";
import { useState } from "react";
import { useState, useEffect } from "react";
import { useTranslations } from "next-intl";
import { useRouter, Link } from "@/i18n/routing";
import { useSearchParams } from "next/navigation";
@@ -14,6 +14,46 @@ import { LabeledField } from "@/components/ui/labeled-field";
import { OtpInput } from "@/components/ui/otp-input";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
/** Client-side Persian-to-Latin slugifier — mirrors SlugHelper.Slugify on the backend */
const PERSIAN_MAP: Record<string, string> = {
آ: "a", ا: "a", أ: "a", إ: "a",
ب: "b", پ: "p", ت: "t", ث: "s",
ج: "j", چ: "ch", ح: "h", خ: "kh",
د: "d", ذ: "z", ر: "r", ز: "z", ژ: "zh",
س: "s", ش: "sh", ص: "s", ض: "z",
ط: "t", ظ: "z", ع: "a", غ: "gh",
ف: "f", ق: "gh", ک: "k", ك: "k", گ: "g",
ل: "l", م: "m", ن: "n", و: "v",
ه: "h", ی: "i", ي: "i",
ئ: "y", ء: "", ة: "t", ى: "a", ؤ: "o",
"۰": "0", "۱": "1", "۲": "2", "۳": "3", "۴": "4",
"۵": "5", "۶": "6", "۷": "7", "۸": "8", "۹": "9",
};
function slugify(input: string): string {
let s = "";
for (const ch of input) {
if (ch in PERSIAN_MAP) {
s += PERSIAN_MAP[ch];
} else if (/[a-zA-Z0-9]/.test(ch)) {
s += ch.toLowerCase();
} else if (/[\s\-_]/.test(ch)) {
s += "-";
}
}
return s.replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
}
function isValidSlug(slug: string): boolean {
if (!slug || slug.length < 2 || slug.length > 80) return false;
return /^[a-z0-9][a-z0-9\-]*[a-z0-9]$/.test(slug);
}
const KOJA_BASE =
typeof window !== "undefined" && window.location.hostname.includes("meezi.ir")
? "koja.meezi.ir"
: "koja.meezi.ir";
function RegisterForm() {
const t = useTranslations("auth");
const router = useRouter();
@@ -22,20 +62,31 @@ function RegisterForm() {
const [phone, setPhone] = useState(searchParams.get("phone") ?? "");
const [cafeName, setCafeName] = useState("");
const [slug, setSlug] = useState("");
const [slugEdited, setSlugEdited] = useState(false);
const [code, setCode] = useState("");
const [step, setStep] = useState<"info" | "otp">("info");
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
// Auto-derive slug from café name unless the user has manually edited it
useEffect(() => {
if (!slugEdited) {
setSlug(slugify(cafeName));
}
}, [cafeName, slugEdited]);
const slugValid = isValidSlug(slug);
const errorMessage = (err: unknown) => {
if (err instanceof ApiClientError) {
switch (err.code) {
case "RATE_LIMITED": return t("rateLimited");
case "ALREADY_REGISTERED": return t("alreadyRegistered");
case "SMS_FAILED": return t("smsFailed");
case "INVALID_OTP": return t("invalidOtp");
case "RATE_LIMITED": return t("rateLimited");
case "ALREADY_REGISTERED": return t("alreadyRegistered");
case "SMS_FAILED": return t("smsFailed");
case "INVALID_OTP": return t("invalidOtp");
case "REGISTRATION_EXPIRED": return t("registrationExpired");
default: return err.message;
default: return err.message;
}
}
return err instanceof Error ? err.message : String(err);
@@ -45,7 +96,11 @@ function RegisterForm() {
setLoading(true);
setError(null);
try {
await apiPost("/api/auth/register", { phone, cafeName });
await apiPost("/api/auth/register", {
phone,
cafeName,
slug: slugValid ? slug : undefined,
});
setStep("otp");
} catch (e) {
setError(errorMessage(e));
@@ -94,6 +149,31 @@ function RegisterForm() {
required
/>
</LabeledField>
{/* Koja slug / profile URL */}
<LabeledField
label={t("kojaSlug")}
htmlFor="reg-slug"
hint={t("kojaSlugHint")}
>
<Input
id="reg-slug"
value={slug}
onChange={(e) => {
setSlugEdited(true);
setSlug(e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ""));
}}
placeholder={t("kojaSlugPlaceholder")}
dir="ltr"
className="text-start font-mono text-sm"
/>
{slug && (
<p className={`mt-1 text-xs font-mono ${slugValid ? "text-muted-foreground" : "text-destructive"}`}>
{KOJA_BASE}/{slug}
</p>
)}
</LabeledField>
<LabeledField label={t("phone")} htmlFor="reg-phone">
<Input
id="reg-phone"
@@ -45,7 +45,8 @@ function buildDefaultOpenGroups(): OpenGroupsState {
const stored = readStoredOpenGroups();
const defaults: OpenGroupsState = {};
for (const g of NAV_GROUPS) {
defaults[g.id] = stored[g.id] ?? g.defaultOpen;
// Default ALL groups closed on first visit; only restore if user explicitly saved state.
defaults[g.id] = stored[g.id] ?? false;
}
return defaults;
}
@@ -238,20 +239,31 @@ export function Sidebar({ side }: { side: "left" | "right" }) {
[role, branchId, permissions]
);
/** Accordion: opening a group collapses all others. */
const setGroupOpen = useCallback((groupId: NavGroupId, open: boolean) => {
setOpenGroups((prev) => {
const next = { ...prev, [groupId]: open };
setOpenGroups((_prev) => {
const next: OpenGroupsState = {};
for (const g of NAV_GROUPS) {
// If opening: only the clicked group becomes true; everything else closes.
// If closing: just close the clicked group, leave others as-is.
next[g.id] = open ? g.id === groupId : g.id === groupId ? false : (_prev[g.id] ?? false);
}
persistOpenGroups(next);
return next;
});
}, []);
// When navigating to a new path, open only the group that contains that path (accordion).
useEffect(() => {
const activeGroup = findNavGroupForPath(pathname);
if (!activeGroup) return;
setOpenGroups((prev) => {
if (prev[activeGroup]) return prev;
const next = { ...prev, [activeGroup]: true };
if (prev[activeGroup]) return prev; // already open, nothing to do
// Accordion: open active group, close all others
const next: OpenGroupsState = {};
for (const g of NAV_GROUPS) {
next[g.id] = g.id === activeGroup;
}
persistOpenGroups(next);
return next;
});
@@ -24,6 +24,8 @@ export function SettingsShopPanel({ cafeId }: SettingsShopPanelProps) {
const queryClient = useQueryClient();
const [name, setName] = useState("");
const [slug, setSlug] = useState("");
const [slugError, setSlugError] = useState<string | null>(null);
const [city, setCity] = useState("");
const [phone, setPhone] = useState("");
const [address, setAddress] = useState("");
@@ -37,6 +39,7 @@ export function SettingsShopPanel({ cafeId }: SettingsShopPanelProps) {
useEffect(() => {
if (!cafeSettings) return;
setName(cafeSettings.name ?? "");
setSlug(cafeSettings.slug ?? "");
setCity(cafeSettings.city ?? "");
setPhone(cafeSettings.phone ?? "");
setAddress(cafeSettings.address ?? "");
@@ -47,9 +50,16 @@ export function SettingsShopPanel({ cafeId }: SettingsShopPanelProps) {
}, [cafeSettings]);
const saveProfile = useMutation({
mutationFn: () =>
apiPatch<CafeSettings>(`/api/cafes/${cafeId}/settings`, {
mutationFn: () => {
setSlugError(null);
const slugTrimmed = slug.trim();
const isValidSlug = !slugTrimmed || /^[a-z0-9][a-z0-9\-]*[a-z0-9]$/.test(slugTrimmed);
if (slugTrimmed && !isValidSlug) {
throw new Error("INVALID_SLUG");
}
return apiPatch<CafeSettings>(`/api/cafes/${cafeId}/settings`, {
name,
slug: slugTrimmed || undefined,
city,
phone,
address,
@@ -57,11 +67,20 @@ export function SettingsShopPanel({ cafeId }: SettingsShopPanelProps) {
logoUrl: logoUrl || null,
coverImageUrl: coverImageUrl || null,
snappfoodVendorId,
}),
});
},
onSuccess: (data) => {
queryClient.setQueryData(cafeSettingsQueryKey(cafeId), data);
notify.success(t("profile.saved"));
},
onError: (err: unknown) => {
const msg = err instanceof Error ? err.message : String(err);
if (msg === "INVALID_SLUG") {
setSlugError(t("profile.slugInvalid"));
} else if (msg.includes("SLUG_TAKEN")) {
setSlugError(t("profile.slugTaken"));
}
},
});
const uploadLogo = useMutation({
@@ -129,6 +148,33 @@ export function SettingsShopPanel({ cafeId }: SettingsShopPanelProps) {
</label>
</div>
</div>
{/* Koja slug */}
<LabeledField
label={t("profile.slug")}
htmlFor="cafe-slug"
hint={t("profile.slugHint")}
>
<Input
id="cafe-slug"
value={slug}
onChange={(e) => {
setSlugError(null);
setSlug(e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ""));
}}
placeholder={t("profile.slugPlaceholder")}
dir="ltr"
className="font-mono text-sm"
/>
{slug && (
<p className={`text-xs font-mono ${slugError ? "text-destructive" : "text-muted-foreground"}`}>
koja.meezi.ir/{slug}
</p>
)}
{slugError && (
<p className="text-xs text-destructive">{slugError}</p>
)}
</LabeledField>
<div className="grid gap-4 sm:grid-cols-2">
<LabeledField label={t("profile.name")} htmlFor="cafe-name">
<Input id="cafe-name" value={name} onChange={(e) => setName(e.target.value)} />
+1 -1
View File
@@ -117,7 +117,7 @@ export const NAV_GROUPS: NavGroupDef[] = [
},
];
export const NAV_GROUPS_STORAGE_KEY = "meezi:nav-groups:v3";
export const NAV_GROUPS_STORAGE_KEY = "meezi:nav-groups:v4";
/** Branch-scoped staff only see daily operations. */
export const BRANCH_ONLY_NAV_GROUP: NavGroupId = "operations";
+10
View File
@@ -50,6 +50,16 @@ const nextConfig: NextConfig = {
{ protocol: "http", hostname: "**" },
],
},
async redirects() {
return [
// Short URL: koja.meezi.ir/my-cafe → koja.meezi.ir/fa/cafe/my-cafe
{
source: "/:slug([a-z0-9][a-z0-9-]*[a-z0-9])",
destination: "/fa/cafe/:slug",
permanent: false,
},
];
},
};
export default withPWA(withNextIntl(nextConfig));