hotfix

Author: joelsaav

client/package-lock.json

@@ -2,7 +2,9 @@ import { useMemo } from "react";
 import { useTasks } from "./useTasks";
 import { useLists } from "@/hooks/useLists";
 
-export function useTaskFilters() {
+type ListMode = "owned" | "shared" | "all";
+
+export function useTaskFilters(listMode: ListMode = "all") {
   const {
     accessibleTasks,
     filteredTasks,
@@ -15,19 +17,31 @@ export function useTaskFilters() {
     toggleSort,
     sorting,
   } = useTasks();
-  const { accessibleLists } = useLists();
+  const { accessibleLists, ownedLists, sharedLists } = useLists();
+
+  const listsToUse = useMemo(() => {
+    switch (listMode) {
+      case "owned":
+        return ownedLists;
+      case "shared":
+        return sharedLists;
+      case "all":
+      default:
+        return accessibleLists;
+    }
+  }, [listMode, ownedLists, sharedLists, accessibleLists]);
 
   const selectedListId = filters.listId;
   const listTaskCounts = useMemo(
     () =>
-      accessibleLists.map((list) => ({
+      listsToUse.map((list) => ({
         id: list.id,
         name: list.name,
         count: accessibleTasks.filter((task) => task.listId === list.id).length,
         description: list.description,
         owner: list.owner,
       })),
-    [accessibleLists, accessibleTasks],
+    [listsToUse, accessibleTasks],
   );
 
   const handleListFilter = (listId: string | null) => {
@@ -46,6 +60,6 @@ export function useTaskFilters() {
     sortBy,
     toggleSort,
     sorting,
-    accessibleLists,
+    accessibleLists: listsToUse,
   };
 }

client/src/hooks/tasks/useTaskFilters.ts

@@ -5,6 +5,7 @@ import {
   taskAdded,
   taskUpdated,
   taskDeleted,
+  tasksDeletedByList,
 } from "../store/slices/tasksSlice";
 import {
   listUpdated,
@@ -39,6 +40,14 @@ export const useSocket = () => {
         dispatch(taskDeleted(taskId));
       });
 
+      socket.on("task:shared", (task: Task) => {
+        dispatch(taskAdded(task));
+      });
+
+      socket.on("task:unshared", (taskId: string) => {
+        dispatch(taskDeleted(taskId));
+      });
+
       socket.on("list:updated", (list: List) => {
         dispatch(listUpdated(list));
       });
@@ -53,9 +62,15 @@ export const useSocket = () => {
 
       socket.on("list:shared", (list: List) => {
         dispatch(listCreated(list));
+        if (list.tasks && Array.isArray(list.tasks)) {
+          for (const task of list.tasks) {
+            dispatch(taskAdded(task));
+          }
+        }
       });
 
       socket.on("list:unshared", (listId: string) => {
+        dispatch(tasksDeletedByList(listId));
         dispatch(listDeleted(listId));
       });
 
@@ -69,6 +84,8 @@ export const useSocket = () => {
       socket.off("task:created");
       socket.off("task:updated");
       socket.off("task:deleted");
+      socket.off("task:shared");
+      socket.off("task:unshared");
       socket.off("list:updated");
       socket.off("list:created");
       socket.off("list:deleted");

client/src/hooks/useSocket.ts

@@ -313,6 +313,8 @@
     "sharedBy": "Shared by: {{name}} ({{email}})",
     "errorShareTask": "Error sharing the task. Check the email.",
     "errorShareList": "Error sharing the list. Check the email.",
+    "leaveConfirmation": "Are you sure you want to leave the task \"{{name}}\"? You will no longer have access to it.",
+    "leaveListConfirmation": "Are you sure you want to leave this list? You will no longer have access to it or its tasks.",
     "removeCollaborator": {
       "title": "Are you sure?",
       "descriptionTask": "This action will remove the collaborator from the task.",
@@ -412,4 +414,4 @@
     "share": "Share",
     "leave": "Leave"
   }
-}
+}

client/src/locales/en.json

@@ -313,6 +313,8 @@
     "sharedBy": "Compartido por: {{name}} ({{email}})",
     "errorShareTask": "Error al compartir la tarea. Verifica el email.",
     "errorShareList": "Error al compartir la lista. Verifica el email.",
+    "leaveConfirmation": "¿Estás seguro de que quieres salir de la tarea \"{{name}}\"? Ya no tendrás acceso a ella.",
+    "leaveListConfirmation": "¿Estás seguro de que quieres salir de esta lista? Ya no tendrás acceso a ella ni a sus tareas.",
     "removeCollaborator": {
       "title": "¿Estás seguro?",
       "descriptionTask": "Esta acción eliminará al colaborador de la tarea.",
@@ -415,4 +417,4 @@
   "accessibility": {
     "close": "Cerrar"
   }
-}
+}

client/src/locales/es.json

@@ -22,7 +22,7 @@ export default function SharedPage() {
     sortBy,
     toggleSort,
     sorting,
-  } = useTaskFilters();
+  } = useTaskFilters("shared");
 
   const { fetchSharedTasks, isLoading } = useTasks();
   const {

client/src/pages/authenticated/sharedPage.tsx

@@ -23,7 +23,7 @@ export default function TasksPage() {
     sortBy,
     toggleSort,
     sorting,
-  } = useTaskFilters();
+  } = useTaskFilters("owned");
 
   const { fetchAllTasks, isLoading } = useTasks();
   const { fetchAllLists, isLoading: isLoadingLists } = useLists();