From 8080353075148443676b6b3be7bd14c7f15e3a71 Mon Sep 17 00:00:00 2001
From: bosiraphael <71827178+bosiraphael@users.noreply.github.com>
Date: Thu, 2 Nov 2023 10:36:28 +0100
Subject: [PATCH] Fix sort delete (#2312)

---
 .../views/hooks/internal/useViewSorts.ts      | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/front/src/modules/views/hooks/internal/useViewSorts.ts b/front/src/modules/views/hooks/internal/useViewSorts.ts
index abe0cb55de..9fe25ababe 100644
--- a/front/src/modules/views/hooks/internal/useViewSorts.ts
+++ b/front/src/modules/views/hooks/internal/useViewSorts.ts
@@ -14,10 +14,14 @@ import { ViewSort } from '@/views/types/ViewSort';
 import { useViewSetStates } from '../useViewSetStates';
 
 export const useViewSorts = (viewScopeId: string) => {
-  const { updateOneMutation, createOneMutation, findManyQuery } =
-    useFindOneObjectMetadataItem({
-      objectNameSingular: 'viewSortV2',
-    });
+  const {
+    updateOneMutation,
+    createOneMutation,
+    deleteOneMutation,
+    findManyQuery,
+  } = useFindOneObjectMetadataItem({
+    objectNameSingular: 'viewSortV2',
+  });
   const apolloClient = useApolloClient();
   const { setCurrentViewSorts } = useViewSetStates(viewScopeId);
 
@@ -72,7 +76,16 @@ export const useViewSorts = (viewScopeId: string) => {
         const deleteViewSorts = (viewSortIdsToDelete: string[]) => {
           if (!viewSortIdsToDelete.length) return;
 
-          // Todo
+          return Promise.all(
+            viewSortIdsToDelete.map((viewFilterId) =>
+              apolloClient.mutate({
+                mutation: deleteOneMutation,
+                variables: {
+                  idToDelete: viewFilterId,
+                },
+              }),
+            ),
+          );
         };
 
         const currentViewSorts = snapshot
@@ -117,7 +130,10 @@ export const useViewSorts = (viewScopeId: string) => {
         const sortKeysToDelete = Object.keys(savedViewSortsByKey).filter(
           (previousSortKey) => !sortKeys.includes(previousSortKey),
         );
-        await deleteViewSorts(sortKeysToDelete);
+        const sortIdsToDelete = sortKeysToDelete.map(
+          (sortKeyToDelete) => savedViewSortsByKey[sortKeyToDelete].id ?? '',
+        );
+        await deleteViewSorts(sortIdsToDelete);
         set(
           savedViewSortsScopedFamilyState({
             scopeId: viewScopeId,
@@ -129,6 +145,7 @@ export const useViewSorts = (viewScopeId: string) => {
     [
       apolloClient,
       createOneMutation,
+      deleteOneMutation,
       findManyQuery,
       updateOneMutation,
       viewScopeId,