ali_mohaghegh/ERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(frontend): repair merge-damaged syntax left by the pm/RBAC revert cycle

Browse Source 
Stray braces in App.tsx / ChangeInventoryPage.tsx, an orphaned admin gate in ArrivalsPage.tsx, and a literal revert commit subject pasted into LoginPage.tsx — all made the committed tree unbuildable.
This commit is contained in:
MMD
2026-10-06 15:39:43 +03:30
parent 4b84844b54
commit 965054093e
4 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/App.tsx
-1
View File
@@ -101,7 +101,6 @@ function RequireAuth({ children }: { children: React.ReactNode }) {
return <Navigate to="/panel/pm" replace />; return <Navigate to="/panel/pm" replace />;
} }
} }
}
return <>{children}</>; return <>{children}</>;
} }
frontend/src/pages/Auth/LoginPage.tsx
+1 -1
View File
@@ -95,7 +95,7 @@ export function LoginPage() {
// سرپرست پروژه → پنل مدیریت پروژه (PM)؛ مدیر پروژه → پنل انبار؛ بقیه → دفتر // سرپرست پروژه → پنل مدیریت پروژه (PM)؛ مدیر پروژه → پنل انبار؛ بقیه → دفتر
if (user.role === "supervisor") navigate("/panel/pm"); if (user.role === "supervisor") navigate("/panel/pm");
else navigate(user.role === "pm" ? "/inventory" : "/"); else navigate(user.role === "pm" ? "/inventory" : "/");
} (revert: restore production to the state before 730d0bd (PM/RBAC work moved to 'pm')) }
} catch (err) { } catch (err) {
toast.error(err instanceof Error ? err.message : "خطا در ورود"); toast.error(err instanceof Error ? err.message : "خطا در ورود");
} finally { } finally {
frontend/src/pages/Inventory/ArrivalsPage.tsx
-2
View File
@@ -268,8 +268,6 @@ export function ArrivalsPage() {
} }
}; };
if (!isAdmin && !isPM) {
if (!canAccess) { if (!canAccess) {
return ( return (
frontend/src/pages/Inventory/ChangeInventoryPage.tsx
-1
View File
@@ -573,7 +573,6 @@ export function ChangeInventoryPage() {
if (type === "PROJECT_TRANSFER") { if (type === "PROJECT_TRANSFER") {
return !!(whId && toProjectId && matTxt.trim() && unitTxt.trim() && parseNum(qty) > 0); return !!(whId && toProjectId && matTxt.trim() && unitTxt.trim() && parseNum(qty) > 0);
} }
}
if (type === "TRANSFER") return !!(fromId && toId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0)); if (type === "TRANSFER") return !!(fromId && toId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
if (type === "RETURN") return !!(whId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0)); if (type === "RETURN") return !!(whId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
if (type === "FOUND") { if (type === "FOUND") {