test promise

apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx

@@ -8,12 +8,11 @@ import {
   FileSpreadsheetIcon,
   FileTextIcon,
   PlusCircleIcon,
-  PlusIcon,
-  TagIcon
+  PlusIcon
 } from 'lucide-react'
 import { MeiliSearchFilterBuilder } from 'meilisearch-helper'
 import { Suspense, useState } from 'react'
-import { Await, Link, useSearchParams } from 'react-router'
+import { Await, Link, useParams, useSearchParams } from 'react-router'
 import type { BookType } from 'xlsx'
 import * as XLSX from 'xlsx'
 
@@ -119,10 +118,7 @@ export default function Route({ loaderData: { data } }) {
               {selectedRows.length ? (
                 <>
                   <div className="flex gap-2.5 items-center">
-                    <DropdownMenuExport
-                      headers={headers}
-                      selectedRows={selectedRows}
-                    />
+                    <ExportMenu headers={headers} selectedRows={selectedRows} />
                   </div>
                 </>
               ) : (
@@ -248,18 +244,20 @@ function useRangeParams() {
   }
 }
 
-export function DropdownMenuExport({
+export function ExportMenu({
   headers,
   selectedRows = []
 }: {
   headers: Record<string, string>
   selectedRows: object[]
 }) {
-  const handleExport = (bookType: BookType) => () => {
+  const { orgid } = useParams()
+
+  const exportFile = (bookType: BookType) => () => {
     if (!selectedRows.length) {
       return
     }
-
+    const now = new Date()
     const header = Object.keys(headers)
     const data = selectedRows.map((data) => {
       const obj: Record<string, string> = flatten(data)
@@ -272,7 +270,7 @@ export function DropdownMenuExport({
       origin: 'A1'
     })
     XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1')
-    XLSX.writeFile(workbook, `${formatted.format(new Date())}.${bookType}`, {
+    XLSX.writeFile(workbook, `${orgid}_users_${+now}.${bookType}`, {
       bookType,
       compression: true
     })
@@ -287,10 +285,10 @@ export function DropdownMenuExport({
       </DropdownMenuTrigger>
       <DropdownMenuContent className="w-52" align="start">
         <DropdownMenuGroup className="*:cursor-pointer">
-          <DropdownMenuItem onClick={handleExport('xlsx')}>
+          <DropdownMenuItem onClick={exportFile('xlsx')}>
             <FileSpreadsheetIcon /> Microsoft Excel (.xlsx)
           </DropdownMenuItem>
-          <DropdownMenuItem onClick={handleExport('csv')}>
+          <DropdownMenuItem onClick={exportFile('csv')}>
             <FileTextIcon /> CSV (.csv)
           </DropdownMenuItem>
         </DropdownMenuGroup>