Export

.env-example

@@ -1,4 +1,3 @@
-NEXTAUTH_URL=http://localhost:3000
 NEXT_PUBLIC_SUPABASE_URL=
 NEXT_PUBLIC_SUPABASE_ANON_KEY=
 RESEND_API_KEY=

apps/dashboard/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "build": "NODE_ENV=production next build",
     "clean": "git clean -xdf .next .turbo node_modules",
-    "jobs": "bunx @trigger.dev/cli@latest dev --port 3001",
+    "jobs": "bunx @trigger.dev/cli@latest dev --port 3001 --client-id=midday-CpkS",
     "dev": "next dev -p 3001",
     "lint": "next lint",
     "format": "biome format --write .",
@@ -38,16 +38,16 @@
     "react-dom": "18.2.0",
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.48.2",
-    "recharts": "^2.9.3",
+    "recharts": "^2.10.1",
     "sharp": "^0.32.6",
     "zod": "^3.22.4"
   },
   "devDependencies": {
     "@midday/tsconfig": "workspace:*",
     "@t3-oss/env-nextjs": "^0.7.1",
-    "@types/node": "^20.9.1",
+    "@types/node": "^20.9.2",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   }
 }

apps/dashboard/src/actions/export-transactions-action.ts

@@ -19,6 +19,6 @@ export const exportTransactionsAction = action(
       },
     });
 
-    console.log(event);
+    return event;
   }
 );

apps/dashboard/src/actions/schema.ts

@@ -66,6 +66,6 @@ export const createAttachmentsSchema = z.array(
 export const deleteAttachmentSchema = z.string();
 
 export const exportTransactionsSchema = z.object({
-  from: z.string(),
-  to: z.string(),
+  from: z.coerce.date(),
+  to: z.coerce.date(),
 });

apps/dashboard/src/app/api/download/document/route.ts

@@ -9,7 +9,7 @@ export async function GET(req, res) {
   const path = requestUrl.searchParams.get("path");
   const filename = requestUrl.searchParams.get("filename");
 
-  const { data } = await supabase.storage.from("files").download(path);
+  const { data } = await supabase.storage.from("vault").download(path);
   const responseHeaders = new Headers(res.headers);
 
   responseHeaders.set(

apps/dashboard/src/components/attachments.tsx

@@ -87,7 +87,7 @@ export function Attachments({ id, data }) {
     const uploadedFiles = await Promise.all(
       acceptedFiles.map(async (acceptedFile) => {
         const { path } = await uploadFile({
-          bucket: "files",
+          bucket: "vault",
           path: `${userData?.team_id}/transactions/${id}`,
           file: acceptedFile,
         });
@@ -99,7 +99,7 @@ export function Attachments({ id, data }) {
           transaction_id: id,
           type: acceptedFile.type,
         };
-      }),
+      })
     );
 
     const { data: newFiles } = await createAttachmentsAction(uploadedFiles);
@@ -120,7 +120,7 @@ export function Attachments({ id, data }) {
       <div
         className={cn(
           "w-full h-[120px] border-dotted border-2 border-border rounded-xl text-center flex flex-col justify-center space-y-1 transition-colors text-[#606060]",
-          isDragActive && "bg-secondary text-white",
+          isDragActive && "bg-secondary text-white"
         )}
         {...getRootProps()}
       >

apps/dashboard/src/components/modals/export-transactions-modal.tsx

@@ -10,23 +10,40 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@midday/ui/dialog";
+import { useToast } from "@midday/ui/use-toast";
 import { Loader2 } from "lucide-react";
 import { useAction } from "next-safe-action/hook";
 import { useSearchParams } from "next/navigation";
 import { useEffect } from "react";
 
 export function ExportTransactionsModal({ isOpen, setOpen }) {
   const searchParams = useSearchParams();
-  const { execute, status } = useAction(exportTransactionsAction);
+  const { execute, status, result } = useAction(exportTransactionsAction);
   const filter = searchParams.get("filter");
   const date = filter ? JSON.parse(filter)?.date : null;
+  const { toast } = useToast();
 
   useEffect(() => {
     if (status === "hasSucceeded" && isOpen) {
       setOpen(false);
     }
   }, [status]);
 
+  useEffect(() => {
+    if (result.data) {
+      toast({
+        duration: 6000,
+        title: "Exporting...",
+        description: "Your export is ready base on 46 transactions.",
+        // action: (
+        //   <ToastAction altText="Yes" onClick={handleUpdateSimilar}>
+        //     Yes
+        //   </ToastAction>
+        // ),
+      });
+    }
+  }, [result]);
+
   return (
     <Dialog open={isOpen} onOpenChange={setOpen}>
       <DialogContent>

apps/dashboard/src/jobs/transactions.ts

@@ -3,6 +3,7 @@ import { TransactionsEmail } from "@midday/email/emails/transactions";
 import { getI18n } from "@midday/email/locales";
 import { getTransactions } from "@midday/gocardless";
 import { TriggerEvents, triggerBulk } from "@midday/notification";
+import { getTransactionsQuery } from "@midday/supabase/queries";
 import { Database } from "@midday/supabase/src/types";
 import { renderAsync } from "@react-email/components";
 import { eventTrigger } from "@trigger.dev/sdk";
@@ -287,23 +288,41 @@ client.defineJob({
   trigger: eventTrigger({
     name: "transactions.export",
     schema: z.object({
-      from: z.string().datetime(),
-      to: z.string().datetime(),
+      from: z.coerce.date(),
+      to: z.coerce.date(),
       teamId: z.string(),
     }),
   }),
   integrations: { supabase },
   run: async (payload, io) => {
     const { from, to, teamId } = payload;
 
-    const generateExport = await io.createStatus("generate-export", {
-      label: "Generating memes",
+    const client = await io.supabase.client;
+
+    const generateExport = await io.createStatus("generate-export-start", {
+      label: "Generating export",
       state: "loading",
     });
 
     await io.logger.info("Transactions Export");
 
-    await generateExport.update("generate-export", {
+    console.log(from, to);
+
+    const data = await getTransactionsQuery(client, {
+      teamId,
+      from: 0,
+      to: 100000,
+      filter: {
+        date: {
+          from: from.toDateString(),
+          to: to.toDateString(),
+        },
+      },
+    });
+
+    await io.logger.info(`Transactions: ${JSON.stringify(data, null, 2)}`);
+
+    await generateExport.update("generate-export-done", {
       state: "success",
       data: {
         url: "",

apps/website/package.json

@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@midday/tsconfig": "workspace:*",
-    "@types/node": "^20.9.1",
+    "@types/node": "^20.9.2",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15"
   }

apps/website/src/locales/en.ts

@@ -8,7 +8,7 @@ export default {
     email: "Enter your email",
     open: "Open source",
     live: "Live profit/loss",
-    document: "Files",
+    document: "Vault",
     reciept: "Receipt linking",
     time: "Time tracking",
     ai: "AI-enhanced filter & search",

package.json

@@ -24,7 +24,7 @@
     "@biomejs/biome": "1.3.3",
     "@manypkg/cli": "^0.21.0",
     "turbo": "^1.10.16",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "devDependencies": {
     "vercel": "^32.5.5"

packages/email/package.json

@@ -17,6 +17,6 @@
     "react-email": "1.9.5"
   },
   "devDependencies": {
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   }
 }

packages/gocardless/package.json

@@ -14,6 +14,6 @@
       "@midday/kv": "workspace:*"
     },
     "devDependencies": {
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.2"
     }
   }

packages/location/package.json

@@ -11,6 +11,6 @@
       "check:types": "tsc --noEmit"
     },
     "devDependencies": {
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.2"
     }
   }

packages/notification/package.json

@@ -13,6 +13,6 @@
     "@novu/node": "^0.21.0"
   },
   "devDependencies": {
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   }
 }

packages/supabase/package.json

@@ -16,7 +16,7 @@
     "supabase": "^1.112.0"
   },
   "devDependencies": {
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "exports": {
     "./server": "./src/client/server.ts",

packages/supabase/src/mutations/index.ts

@@ -182,7 +182,7 @@ export async function deleteAttachment(supabase: Client, id: string) {
     .single();
 
   remove(supabase, {
-    bucket: "files",
+    bucket: "vault",
     path: `${data.team_id}/transactions/${data.transaction_id}/${data.name}`,
   });
 

packages/supabase/src/queries/cached-queries.ts

@@ -149,7 +149,6 @@ export const getMetrics = async (params) => {
     ["metrics", teamId],
     {
       tags: [`metrics_${teamId}`],
-      revalidate: 10,
     }
   )(params);
 };

packages/supabase/src/queries/index.ts

@@ -180,8 +180,8 @@ export async function getSpendingQuery(
 
 type GetTransactionsParams = {
   teamId: string;
-  from: number;
   to: number;
+  from: number;
   sort: {
     column: string;
     value: "asc" | "desc";

packages/ui/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "autoprefixer": "^10.4.16",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "exports": {
     "./calendar": "./src/components/calendar.tsx",

turbo.json

@@ -38,8 +38,6 @@
 		}
 	},
 	"globalEnv": [
-		"POSTGRES_URL",
-		"NEXTAUTH_SECRET",
-		"NEXTAUTH_URL"
+		"POSTGRES_URL"
 	]
 }