Merge pull request #6 from midday-ai/feature/export

Export
midday-ai · Nov 23, 2023 · 93dd159 · 93dd159
2 parents 9d37379 + 40abdcf
commit 93dd159
Show file tree

Hide file tree

Showing 28 changed files with 120 additions and 56 deletions.
diff --git a/.env-example b/.env-example
@@ -1,4 +1,3 @@
-NEXTAUTH_URL=http://localhost:3000
 NEXT_PUBLIC_SUPABASE_URL=
 NEXT_PUBLIC_SUPABASE_ANON_KEY=
 RESEND_API_KEY=

diff --git a/apps/dashboard/package.json b/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 .",
@@ -31,23 +31,23 @@
     "framer-motion": "^10.16.5",
     "next": "14.0.4-canary.4",
     "next-international": "^1.1.4",
-    "next-safe-action": "^5.0.3",
+    "next-safe-action": "^5.1.2",
     "next-themes": "^0.2.1",
     "next-usequerystate": "^1.12.2",
     "react": "18.2.0",
     "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/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15",
-    "typescript": "^5.2.2"
+    "@types/node": "^20.9.4",
+    "@types/react": "^18.2.38",
+    "@types/react-dom": "^18.2.17",
+    "typescript": "^5.3.2"
   }
 }
diff --git a/apps/dashboard/src/actions/export-transactions-action.ts b/apps/dashboard/src/actions/export-transactions-action.ts
@@ -19,6 +19,6 @@ export const exportTransactionsAction = action(
       },
     });
 
-    console.log(event);
+    return event;
   }
 );
diff --git a/apps/dashboard/src/actions/schema.ts b/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(),
 });
diff --git a/apps/dashboard/src/app/[locale]/@dashboard/(root)/transactions/page.tsx b/apps/dashboard/src/app/[locale]/@dashboard/(root)/transactions/page.tsx
@@ -40,7 +40,13 @@ export default async function Transactions({
           fallback={<Loading collapsed={Boolean(transactionId)} />}
           key={page}
         >
-          <Table filter={filter} page={page} sort={sort} noAccounts={empty} />
+          <Table
+            filter={filter}
+            page={page}
+            sort={sort}
+            noAccounts={empty}
+            initialTransactionId={searchParams.id}
+          />
         </Suspense>
       </div>
 

diff --git a/apps/dashboard/src/app/api/download/document/route.ts b/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(

diff --git a/apps/dashboard/src/components/attachments.tsx b/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()}
       >

diff --git a/apps/dashboard/src/components/modals/export-transactions-modal.tsx b/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>

diff --git a/apps/dashboard/src/components/notification-setting.tsx b/apps/dashboard/src/components/notification-setting.tsx
@@ -20,7 +20,7 @@ export function NotificationSetting({
         ...state,
         enabled: !state.enabled,
       };
-    },
+    }
   );
 
   const onChange = () => {
@@ -35,7 +35,7 @@ export function NotificationSetting({
   };
 
   return (
-    <div className="flex items-center space-x-2">
+    <div className="flex items-center space-x-2 mb-3">
       <Checkbox
         id={id}
         checked={optimisticData.enabled}

diff --git a/apps/dashboard/src/components/notification-settings.tsx b/apps/dashboard/src/components/notification-settings.tsx
@@ -1,8 +1,15 @@
 import { updateSubscriberPreferenceAction } from "@/actions/update-subscriber-preference-action";
 import { getSubscriberPreferences } from "@midday/notification";
 import { getUser } from "@midday/supabase/cached-queries";
+import { Skeleton } from "@midday/ui/skeleton";
 import { NotificationSetting } from "./notification-setting";
 
+export function NotificationSettingsSkeleton() {
+  return [...Array(2)].map((_, index) => (
+    <Skeleton key={index.toString()} className="h-4 w-[25%] mb-3" />
+  ));
+}
+
 export async function NotificationSettings() {
   const { data: userData } = await getUser();
   const { data: subscriberPreferences } = await getSubscriberPreferences({

diff --git a/apps/dashboard/src/components/notifications-settings-list.tsx b/apps/dashboard/src/components/notifications-settings-list.tsx
@@ -5,9 +5,11 @@ import {
   CardHeader,
   CardTitle,
 } from "@midday/ui/card";
-import { Skeleton } from "@midday/ui/skeleton";
 import { Suspense } from "react";
-import { NotificationSettings } from "./notification-settings";
+import {
+  NotificationSettings,
+  NotificationSettingsSkeleton,
+} from "./notification-settings";
 
 export async function NotificationsSettingsList() {
   return (
@@ -20,7 +22,7 @@ export async function NotificationsSettingsList() {
       </CardHeader>
 
       <CardContent>
-        <Suspense fallback={<Skeleton className="h-4 w-[25%]" />}>
+        <Suspense fallback={<NotificationSettingsSkeleton />}>
           <NotificationSettings />
         </Suspense>
       </CardContent>

diff --git a/apps/dashboard/src/components/tables/transactions/data-table.tsx b/apps/dashboard/src/components/tables/transactions/data-table.tsx
@@ -16,12 +16,14 @@ type Item = {
 type ItemsProps = {
   data: Item[];
   teamId?: string;
+  initialTransactionId: string;
 };
 
-export function DataTable({ data, teamId }: ItemsProps) {
+export function DataTable({ data, teamId, initialTransactionId }: ItemsProps) {
   const supabase = createClient();
   const router = useRouter();
   const [transactionId, setTransactionId] = useQueryState("id", {
+    defaultValue: initialTransactionId,
     shallow: false, // TODO: Fix without this (redirect after mutation)
   });
 
@@ -80,7 +82,7 @@ export function DataTable({ data, teamId }: ItemsProps) {
       .on(
         "postgres_changes",
         {
-          event: "*",
+          event: "INSERT",
           schema: "public",
           table: "transactions",
           filter: `team_id=eq.${teamId}`,

diff --git a/apps/dashboard/src/components/tables/transactions/index.tsx b/apps/dashboard/src/components/tables/transactions/index.tsx
@@ -8,7 +8,13 @@ import { Loading } from "./loading";
 
 const pageSize = 50;
 
-export async function Table({ filter, page, sort, noAccounts }) {
+export async function Table({
+  filter,
+  page,
+  sort,
+  noAccounts,
+  initialTransactionId,
+}) {
   const hasFilters = Object.keys(filter).length > 0;
   const { to, from } = getPagination(page, pageSize);
   const { data: userData } = await getUser();
@@ -30,7 +36,11 @@ export async function Table({ filter, page, sort, noAccounts }) {
 
   return (
     <>
-      <DataTable data={data} teamId={userData.team_id} />
+      <DataTable
+        data={data}
+        teamId={userData.team_id}
+        initialTransactionId={initialTransactionId}
+      />
       {hasFilters ? (
         <div className="h-10" />
       ) : (

diff --git a/apps/dashboard/src/jobs/transactions.ts b/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";
@@ -71,7 +72,7 @@ client.defineJob({
     table: "bank_accounts",
   }),
   run: async (payload, io) => {
-    await io.sendEvent("Schedule Transactions", {
+    await io.sendEvent("Transactions Initial Sync", {
       id: payload.record.id,
       name: "transactions.initial.sync",
       payload: {
@@ -86,7 +87,7 @@ client.defineJob({
     await dynamicSchedule.register(payload.record.id, {
       type: "interval",
       options: {
-        seconds: 3600 * 4, // every 4h
+        seconds: 3600, // every 1h
       },
     });
   },
@@ -236,7 +237,7 @@ client.defineJob({
 
 client.defineJob({
   id: "transactions-initial-sync",
-  name: "Transactions - Initial",
+  name: "Transactions - Initial Sync",
   version: "1.0.0",
   trigger: eventTrigger({
     name: "transactions.initial.sync",
@@ -252,6 +253,14 @@ client.defineJob({
 
     const { transactions } = await getTransactions(accountId);
 
+    // Update bank account last_accessed
+    await io.supabase.client
+      .from("bank_accounts")
+      .update({
+        last_accessed: new Date(),
+      })
+      .eq("id", recordId);
+
     if (!transactions?.booked.length) {
       await io.logger.info("No transactions found");
     }
@@ -260,7 +269,7 @@ client.defineJob({
       .from("transactions")
       .insert(
         transformTransactions(transactions?.booked, {
-          accountId: recordId,
+          accountId: recordId, // Bank account record id
           teamId: teamId,
         })
       )
@@ -287,23 +296,39 @@ 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", {
+    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: "",

diff --git a/apps/website/package.json b/apps/website/package.json
@@ -23,8 +23,8 @@
   },
   "devDependencies": {
     "@midday/tsconfig": "workspace:*",
-    "@types/node": "^20.9.1",
-    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15"
+    "@types/node": "^20.9.4",
+    "@types/react": "^18.2.38",
+    "@types/react-dom": "^18.2.17"
   }
 }
diff --git a/apps/website/src/locales/en.ts b/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",

diff --git a/bun.lockb b/bun.lockb