{kind === "publication" && <>
@@ -100,8 +106,8 @@ export function ContentFormPage() {
>}
{kind === "performer" && <>
-
-
+
+
{initiativeKinds.map(x =>
)}
@@ -116,6 +122,7 @@ export function ContentFormPage() {
مدیریت تصویر نوآور برتر
}
ذخیره در مدل typed مستقل با کنترل همزمانی
+
}
>;
}
@@ -138,5 +145,3 @@ function payload(kind: string, form: FormData, eventActivityType: string) {
if (kind === "event") return { activityType: Number(eventActivityType), title: str(form, "title"), eventDate: str(form, "eventDate"), place: str(form, "place"), organizer: str(form, "organizer"), link: str(form, "link"), eventType: str(form, "eventType"), role: str(form, "role"), audience: str(form, "audience"), summary: str(form, "summary"), achievement: str(form, "achievement"), axis: str(form, "axis"), participationType: str(form, "participationType"), presentationTitle: str(form, "presentationTitle"), area: str(form, "area"), presenceType: str(form, "presenceType"), productTitle: str(form, "productTitle"), status };
return { title: str(form, "title"), personnelNumber: str(form, "personnelNumber"), projectId: str(form, "projectId"), ideaOriginality: str(form, "ideaOriginality"), revenueBefore: str(form, "revenueBefore"), revenueAfter: str(form, "revenueAfter"), registeredInitiativesCount: num(form, "registeredInitiativesCount"), underReviewInitiativesCount: num(form, "underReviewInitiativesCount"), inProgressInitiativesCount: num(form, "inProgressInitiativesCount"), completedInitiativesCount: num(form, "completedInitiativesCount"), articlesCount: num(form, "articlesCount"), inventionsCount: num(form, "inventionsCount"), processImprovement: str(form, "processImprovement"), registeredInitiativesAmount: str(form, "registeredInitiativesAmount"), underReviewInitiativesAmount: str(form, "underReviewInitiativesAmount"), inProgressInitiativesAmount: str(form, "inProgressInitiativesAmount"), completedInitiativesAmount: str(form, "completedInitiativesAmount"), status };
}
-
-
diff --git a/app/admin/pages/EcosystemFormPage.tsx b/app/admin/pages/EcosystemFormPage.tsx
index 669b0da..aac2f31 100644
--- a/app/admin/pages/EcosystemFormPage.tsx
+++ b/app/admin/pages/EcosystemFormPage.tsx
@@ -1,4 +1,6 @@
import { ArrowRight, Save } from "lucide-react";
+import { focusAdminServerError, validateAdminForm } from "../lib/validateForm";
+import { FormErrorProvider } from "../components/Ui";
import { useEffect, useState, type FormEvent } from "react";
import { Link, useNavigate, useParams } from "react-router";
import {
@@ -10,7 +12,7 @@ import {
PageTitle,
Select,
} from "../components/Ui";
-import { ApiError, api } from "../lib/api";
+import { ApiError, adminFieldErrors, api } from "../lib/api";
import type { EcosystemActorItem } from "../types";
import { actorLabels } from "./EcosystemPage";
import { isMoneyField, unitHint } from "../lib/fieldUnits";
@@ -78,6 +80,7 @@ export function EcosystemFormPage() {
const [busy, setBusy] = useState(false);
const [loading, setLoading] = useState(editing);
const [error, setError] = useState("");
+ const [fieldErrors, setFieldErrors] = useState
>({});
const [activeTab, setActiveTab] = useState("common");
useEffect(() => {
if (!editing) return;
@@ -94,8 +97,10 @@ export function EcosystemFormPage() {
details?.[key] == null ? "" : String(details[key]);
async function submit(event: FormEvent) {
event.preventDefault();
+ if (!validateAdminForm(event.currentTarget, setActiveTab)) return;
setBusy(true);
setError("");
+ setFieldErrors({});
const f = new FormData(event.currentTarget);
const payload: Record = {
actorType: Number(type),
@@ -122,6 +127,11 @@ export function EcosystemFormPage() {
});
navigate("/admin/ecosystem", { replace: true });
} catch (reason) {
+ if (reason instanceof ApiError) {
+ const errors = adminFieldErrors(reason.problem);
+ setFieldErrors(errors);
+ focusAdminServerError(errors, setActiveTab);
+ }
setError(
reason instanceof ApiError
? reason.message
@@ -153,8 +163,9 @@ export function EcosystemFormPage() {
{editing && }
-