ajustes de grupo e propostas

Author: LucasRGuimaraes

codigo-fonte/cultivo/apps/web/src/routes/groups/index.tsx

@@ -1,5 +1,5 @@
 import { createFileRoute, Link, useNavigate } from "@tanstack/react-router";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useQuery, useMutation } from "convex/react";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
@@ -36,7 +36,7 @@ function RouteComponent() {
   const removeParticipant = useMutation(api.group.removeParticipant);
 
   const [editing, setEditing] = useState(false);
-  const [editGroup, setEditGroup] = useState<any | null>(null);
+  const [editGroup, setEditGroup] = useState<any>(null);
 
   // Check if user is already in a group
   const isInGroup = userGroup !== undefined && userGroup !== null;
@@ -46,6 +46,58 @@ function RouteComponent() {
     await remove({ id });
   }
 
+  async function handleRemoveParticipant(groupId: any, participantId: any) {
+    try {
+      console.log("=== Iniciando remoção de participante ===");
+      console.log("Group ID:", groupId);
+      console.log("Participant ID:", participantId);
+      console.log("Estado atual editGroup:", editGroup);
+
+      await removeParticipant({
+        groupId,
+        userId: participantId,
+      });
+
+      console.log("✅ Participante removido no backend");
+
+      // Atualizar o estado local removendo o participante
+      setEditGroup((prev: any) => {
+        console.log("Estado anterior:", prev);
+        if (!prev) {
+          console.log("⚠️ Estado anterior é null");
+          return prev;
+        }
+
+        const newParticipants = prev.participants.filter(
+          (pid: any) => String(pid) !== String(participantId)
+        );
+        const newParticipantsFull = prev.participantsFull.filter(
+          (participant: any) =>
+            String(participant._id) !== String(participantId)
+        );
+
+        console.log("Participantes antes:", prev.participants.length);
+        console.log("Participantes depois:", newParticipants.length);
+        console.log("ParticipantsFull antes:", prev.participantsFull.length);
+        console.log("ParticipantsFull depois:", newParticipantsFull.length);
+
+        const newState = {
+          ...prev,
+          participants: newParticipants,
+          participantsFull: newParticipantsFull,
+        };
+
+        console.log("Novo estado:", newState);
+        return newState;
+      });
+
+      console.log("=== Remoção concluída ===");
+    } catch (error) {
+      console.error("❌ Erro ao remover participante:", error);
+      alert(`Erro ao remover participante: ${error}`);
+    }
+  }
+
   return (
     <main className="min-h-screen bg-[#f8f3ed] py-8 px-4 pt-16">
       <div className="max-w-4xl mx-auto space-y-6">
@@ -363,19 +415,12 @@ function RouteComponent() {
                       </span>
                     ) : (
                       <Button
+                        type="button"
                         size="sm"
                         variant="destructive"
-                        onClick={async () => {
-                          await removeParticipant({
-                            groupId: editGroup._id,
-                            userId: p._id,
-                          });
-                          const refreshed =
-                            groups?.find(
-                              (gg: any) => gg._id === editGroup._id
-                            ) ?? null;
-                          setEditGroup(refreshed);
-                        }}
+                        onClick={() =>
+                          handleRemoveParticipant(editGroup._id, p._id)
+                        }
                       >
                         Remover
                       </Button>

codigo-fonte/cultivo/apps/web/src/routes/groups/join.tsx

@@ -24,16 +24,28 @@ function JoinGroupPage() {
   const { groupId: groupIdParam } = Route.useSearch();
   const groupId = groupIdParam as Id<"groups">;
   const userId = getUserIdFromLocalStorage();
-  
+
   const group = useQuery(api.group.getById, groupId ? { id: groupId } : "skip");
+  const currentUser = useQuery(
+    api.user.getById,
+    userId ? { id: userId as Id<"users"> } : "skip"
+  );
   const addParticipant = useMutation(api.group.addParticipant);
-  
+
   const [isJoining, setIsJoining] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
   // Auto-join and redirect when group loads
   useEffect(() => {
-    if (!group || !userId || isJoining) return;
+    if (!group || !userId || !currentUser || isJoining) return;
+
+    // Verificar se o usuário é do tipo "Produtor Rural"
+    if (currentUser.tipo_usuario !== "Produtor Rural") {
+      setError(
+        "Apenas usuários do tipo 'Produtor Rural' podem participar de grupos."
+      );
+      return;
+    }
 
     const isAlreadyMember = group.participants?.some(
       (p: any) => String(p) === String(userId)
@@ -62,14 +74,24 @@ function JoinGroupPage() {
     };
 
     joinGroup();
-  }, [group, userId, groupId, addParticipant, navigate, isJoining]);
+  }, [
+    group,
+    userId,
+    currentUser,
+    groupId,
+    addParticipant,
+    navigate,
+    isJoining,
+  ]);
 
   // Loading state
   if (!groupId) {
     return (
       <div className="min-h-screen flex items-center justify-center bg-[#f8f3ed] p-4">
         <Card className="bg-white border-none shadow-lg p-8 max-w-md w-full text-center">
-          <div className="text-red-600 text-lg font-semibold mb-2">Link Inválido</div>
+          <div className="text-red-600 text-lg font-semibold mb-2">
+            Link Inválido
+          </div>
           <p className="text-[#7c6a5c] mb-4">
             O link de convite está incompleto ou inválido.
           </p>