WIPVOLONT

2025-12-14 21:14:55 +05:00
parent 433b9e896c
commit 0df52352a8
12 changed files with 893 additions and 440 deletions
--- a/app/components/ModeratorRequestDetailsModal.jsx
+++ b/app/components/ModeratorRequestDetailsModal.jsx
@@ -13,7 +13,7 @@ const ModeratorRequestModal = ({ request, onClose, onModerated }) => {
    // request.status: "pending_moderation" | "approved" | "rejected"
    const isApproved = request.status === "approved";
    const isRejected = request.status === "rejected";
-    const isPending = request.status === "pending_moderation";
+    const isPending = request.status === "На модерации";

    const getAccessToken = () => {
        if (typeof window === "undefined") return null;
@@ -43,171 +43,170 @@ const ModeratorRequestModal = ({ request, onClose, onModerated }) => {
    const deadlineTime = request.deadlineTime || request.time || "";

    const handleApprove = async () => {
-  if (!API_BASE || submitting) return;
-  const token = getAccessToken();
-  if (!token) {
-    setError("Вы не авторизованы");
-    return;
-  }
+        if (!API_BASE || submitting) return;
+        const token = getAccessToken();
+        if (!token) {
+            setError("Вы не авторизованы");
+            return;
+        }

-  console.log("[MODERATION] APPROVE start", {
-    requestId: request.id,
-    statusBefore: request.status,
-  });
+        console.log("[MODERATION] APPROVE start", {
+            requestId: request.id,
+            statusBefore: request.status,
+        });

-  try {
-    setSubmitting(true);
-    setError("");
+        try {
+            setSubmitting(true);
+            setError("");

-    const res = await fetch(
-      `${API_BASE}/moderation/requests/${request.id}/approve`,
-      {
-        method: "POST",
-        headers: {
-          Accept: "application/json",
-          Authorization: `Bearer ${token}`,
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ comment: null }),
-      }
-    );
+            const res = await fetch(
+                `${API_BASE}/moderation/requests/${request.id}/approve`,
+                {
+                    method: "POST",
+                    headers: {
+                        Accept: "application/json",
+                        Authorization: `Bearer ${token}`,
+                        "Content-Type": "application/json",
+                    },
+                    body: JSON.stringify({ comment: null }),
+                }
+            );

-    console.log("[MODERATION] APPROVE response status", res.status);
+            console.log("[MODERATION] APPROVE response status", res.status);

-    const text = await res.text();
-    let data = null;
-    if (text) {
-      try {
-        data = JSON.parse(text);
-      } catch {
-        data = null;
-      }
-    }
+            const text = await res.text();
+            let data = null;
+            if (text) {
+                try {
+                    data = JSON.parse(text);
+                } catch {
+                    data = null;
+                }
+            }

-    console.log("[MODERATION] APPROVE response body", data || text);
+            console.log("[MODERATION] APPROVE response body", data || text);

-    if (!res.ok) {
-      let msg = "Не удалось одобрить заявку";
-      if (data && typeof data === "object" && data.error) {
-        msg = data.error;
-      } else if (text) {
-        msg = text;
-      }
-      console.log("[MODERATION] APPROVE error", msg);
-      setError(msg);
-      setSubmitting(false);
-      return;
-    }
+            if (!res.ok) {
+                let msg = "Не удалось одобрить заявку";
+                if (data && typeof data === "object" && data.error) {
+                    msg = data.error;
+                } else if (text) {
+                    msg = text;
+                }
+                console.log("[MODERATION] APPROVE error", msg);
+                setError(msg);
+                setSubmitting(false);
+                return;
+            }

-    onModerated?.({
-      ...request,
-      status: "approved",
-      moderationResult: data,
-    });
+            onModerated?.({
+                ...request,
+                status: "approved",
+                moderationResult: data,
+            });

-    console.log("[MODERATION] APPROVE success", {
-      requestId: request.id,
-      newStatus: "approved",
-    });
+            console.log("[MODERATION] APPROVE success", {
+                requestId: request.id,
+                newStatus: "approved",
+            });

-    setSubmitting(false);
-    onClose();
-  } catch (e) {
-    console.log("[MODERATION] APPROVE exception", e);
-    setError(e.message || "Ошибка сети");
-    setSubmitting(false);
-  }
-};
+            setSubmitting(false);
+            onClose();
+        } catch (e) {
+            console.log("[MODERATION] APPROVE exception", e);
+            setError(e.message || "Ошибка сети");
+            setSubmitting(false);
+        }
+    };

-const handleRejectConfirm = async () => {
-  if (!API_BASE || submitting) return;
-  const token = getAccessToken();
-  if (!token) {
-    setError("Вы не авторизованы");
-    return;
-  }
-  if (!rejectReason.trim()) {
-    setError("Укажите причину отклонения");
-    return;
-  }
+    const handleRejectConfirm = async () => {
+        if (!API_BASE || submitting) return;
+        const token = getAccessToken();
+        if (!token) {
+            setError("Вы не авторизованы");
+            return;
+        }
+        if (!rejectReason.trim()) {
+            setError("Укажите причину отклонения");
+            return;
+        }

-  console.log("[MODERATION] REJECT start", {
-    requestId: request.id,
-    statusBefore: request.status,
-    reason: rejectReason,
-  });
+        console.log("[MODERATION] REJECT start", {
+            requestId: request.id,
+            statusBefore: request.status,
+            reason: rejectReason,
+        });

-  try {
-    setSubmitting(true);
-    setError("");
+        try {
+            setSubmitting(true);
+            setError("");

-    const res = await fetch(
-      `${API_BASE}/moderation/requests/${request.id}/reject`,
-      {
-        method: "POST",
-        headers: {
-          Accept: "application/json",
-          Authorization: `Bearer ${token}`,
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ comment: rejectReason }),
-      }
-    );
+            const res = await fetch(
+                `${API_BASE}/moderation/requests/${request.id}/reject`,
+                {
+                    method: "POST",
+                    headers: {
+                        Accept: "application/json",
+                        Authorization: `Bearer ${token}`,
+                        "Content-Type": "application/json",
+                    },
+                    body: JSON.stringify({ comment: rejectReason }),
+                }
+            );

-    console.log("[MODERATION] REJECT response status", res.status);
+            console.log("[MODERATION] REJECT response status", res.status);

-    const text = await res.text();
-    let data = null;
-    if (text) {
-      try {
-        data = JSON.parse(text);
-      } catch {
-        data = null;
-      }
-    }
+            const text = await res.text();
+            let data = null;
+            if (text) {
+                try {
+                    data = JSON.parse(text);
+                } catch {
+                    data = null;
+                }
+            }

-    console.log("[MODERATION] REJECT response body", data || text);
+            console.log("[MODERATION] REJECT response body", data || text);

-    if (!res.ok) {
-      let msg = "Не удалось отклонить заявку";
-      if (data && typeof data === "object" && data.error) {
-        msg = data.error;
-      } else if (text) {
-        msg = text;
-      }
-      console.log("[MODERATION] REJECT error", msg);
-      setError(msg);
-      setSubmitting(false);
-      return;
-    }
+            if (!res.ok) {
+                let msg = "Не удалось отклонить заявку";
+                if (data && typeof data === "object" && data.error) {
+                    msg = data.error;
+                } else if (text) {
+                    msg = text;
+                }
+                console.log("[MODERATION] REJECT error", msg);
+                setError(msg);
+                setSubmitting(false);
+                return;
+            }

-    onModerated?.({
-      ...request,
-      status: "rejected",
-      rejectReason,
-      moderationResult: data,
-    });
+            onModerated?.({
+                ...request,
+                status: "rejected",
+                rejectReason: (data && data.moderation_comment) || rejectReason,
+                moderationResult: data,
+            });

-    console.log("[MODERATION] REJECT success", {
-      requestId: request.id,
-      newStatus: "rejected",
-    });
-
-    setShowRejectPopup(false);
-    setSubmitting(false);
-    onClose();
-  } catch (e) {
-    console.log("[MODERATION] REJECT exception", e);
-    setError(e.message || "Ошибка сети");
-    setSubmitting(false);
-  }
-};
+            console.log("[MODERATION] REJECT success", {
+                requestId: request.id,
+                newStatus: "rejected",
+            });

+            setShowRejectPopup(false);
+            setSubmitting(false);
+            onClose();
+        } catch (e) {
+            console.log("[MODERATION] REJECT exception", e);
+            setError(e.message || "Ошибка сети");
+            setSubmitting(false);
+        }
+    };

    return (
        <>
            <div className="fixed inset-0 z-40 flex flex-col bg-[#90D2F9] px-4 pt-4 pb-20">
-                <div className="flex.items-center gap-2 mb-3">
+                <div className="flex items-center gap-2 mb-3">
                    <button
                        type="button"
                        onClick={onClose}
@@ -272,7 +271,7 @@ const handleRejectConfirm = async () => {
                                            : "bg-[#E9D171]"
                                    }`}
                            >
-                                <span className="text-[12px] font-montserrat font-semibold text-black">
+                                <span className="text-[12px] font-montserrat font-semibold text-white">
                                    {isApproved
                                        ? "Принята"
                                        : isRejected
@@ -299,14 +298,14 @@ const handleRejectConfirm = async () => {
                        )}

                        {isRejected && (
-                            <div className="w-full.bg-[#FFE2E2] rounded-[10px] px-3 py-2">
+                            <div className="w-full bg-[#FFE2E2] rounded-[10px] px-3 py-2">
                                <p className="text-[14px] font-montserrat font-bold text-[#E06767] mb-1">
                                    Причина отклонения
                                </p>
                                <p className="text-[12px] font-montserrat text-black whitespace-pre-line">
-                                    {request.rejectReason && request.rejectReason.trim().length > 0
+                                    {(request.rejectReason && request.rejectReason.trim().length > 0
                                        ? request.rejectReason
-                                        : "Причина не указана"}
+                                        : request.moderation_comment) || "Причина не указана"}
                                </p>
                            </div>
                        )}
@@ -319,7 +318,8 @@ const handleRejectConfirm = async () => {
                    </div>
                </div>

-                
+                {/* Кнопки показываем только для pending_moderation */}
+                {isPending && (
                    <div className="mt-4 w-full max-w-[400px] mx-auto flex items-center justify-between gap-3">
                        <button
                            type="button"
@@ -342,7 +342,7 @@ const handleRejectConfirm = async () => {
                            </span>
                        </button>
                    </div>
-               
+                )}
            </div>

            {showRejectPopup && (
@@ -368,7 +368,7 @@ const handleRejectConfirm = async () => {
                                disabled={submitting}
                                className="w-full h-10 bg-[#E06767] rounded-[10px] flex items-center justify-center disabled:opacity-60"
                            >
-                                <span className="text-[16px] font-montserrat font-bold text-white">
+                                <span className="text-[16px] font-montserrat font-bold text.white">
                                    {submitting ? "Сохранение..." : "Подтвердить"}
                                </span>
                            </button>