Sort notifications by scheduledAt and createdAt ...

Hide action menu when click cancel notification
WalissonPires · Mar 17, 2024 · a29c8ac · a29c8ac
1 parent 4560d07
commit a29c8ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/components/NotificationCard/index.tsx b/src/components/NotificationCard/index.tsx
@@ -20,6 +20,12 @@ export default function NotificationCard({ notification, showContact, onCancelCl
   const allowCancel = !canceledAt && !sendedAt;
   const hasActions = allowCancel;
 
+  const handleCancel = () => {
+
+    setVisible(false);
+    onCancelClick?.();
+  };
+
   return (
     <div className="flex flex-row justify-between px-4 py-6 hover:bg-slate-50">
       <div className="flex flex-col flex-1">
@@ -36,7 +42,7 @@ export default function NotificationCard({ notification, showContact, onCancelCl
         <DropdownMenu
           visible={visible}
           toggle={<DropdownMenuToggle onClick={() => setVisible(!visible)}><EllipsisVerticalIcon className="h-5 w-5"/></DropdownMenuToggle>}>
-          {allowCancel && <DropdownMenuItem onClick={onCancelClick}>
+          {allowCancel && <DropdownMenuItem onClick={handleCancel}>
             <span><XMarkIcon className="h-5 w-5 inline-block" /> Cancelar envio</span>
           </DropdownMenuItem>}
           {!hasActions && <DropdownMenuItem>Nenhum ação</DropdownMenuItem>}

diff --git a/src/domains/notifications/use-cases/get-notifications.ts b/src/domains/notifications/use-cases/get-notifications.ts
@@ -57,9 +57,11 @@ export class GetNotifications implements UseCase<GetNotificationsInput, PagedRes
           }
         }
       },
-      orderBy: {
+      orderBy: [{
         scheduledAt: 'desc'
-      }
+      }, {
+        createdAt: 'asc'
+      }]
     });
 
     const mapper = new NotificationMapper();