Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

fix delete_note_attachments depending on external files

ThieryMichel5541b3d3588e
diff --git a/.env.development b/.env.development
index 13861991..e84a293e 100644
--- a/.env.development
+++ b/.env.development
@@ -4,3 +4,5 @@ VITE_SUPABASE_URL=http://127.0.0.1:54321
VITE_SB_PUBLISHABLE_KEY=sb_publishable_ACJWlzQHlZjBrEguHvfOxg_3BJgxAaH
VITE_IS_DEMO=false
VITE_INBOUND_EMAIL=2aff30e603e54dc3eb556bd9e03ee099@inbound.postmarkapp.com
+
+VITE_ATTACHMENTS_BUCKET=attachments
diff --git a/.env.e2e b/.env.e2e
index 051658df..d8a84a08 100644
--- a/.env.e2e
+++ b/.env.e2e
@@ -5,3 +5,5 @@ VITE_SB_PUBLISHABLE_KEY=sb_publishable_ACJWlzQHlZjBrEguHvfOxg_3BJgxAaH
VITE_IS_DEMO=false
SERVICE_ROLE_KEY=eyJhbGciOiJFUzI1NiIsImtpZCI6ImIzM2Q0Njk2LWMwNzUtNGEzNy04OWRhLTVhYWM5ZjYwZDMxYyIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MjA4ODU4MjY4OH0.rCjn2ElCZyuZZY7MfYDzKmL_-gzSe91Vw8XryhpnKSblPiRpmOYVhG0C4SELh73WQpEkMfWH9d5sle4CogQ1Zw
+
+VITE_ATTACHMENTS_BUCKET=attachments
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4801ed5c..24c6bd7b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -60,6 +60,7 @@ jobs:
env:
VITE_IS_DEMO: true
VITE_INBOUND_EMAIL: ${{ vars.VITE_INBOUND_EMAIL }}
+ VITE_ATTACHMENTS_BUCKET: ${{ vars.VITE_ATTACHMENTS_BUCKET || 'attachments' }}
PRODUCTION_REMOTE: https://git:${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ vars.DEMO_DEPLOY_REPOSITORY }}
steps:
@@ -105,6 +106,7 @@ jobs:
IS_SUPABASE_CONFIGURED: ${{ secrets.SUPABASE_ACCESS_TOKEN && secrets.SUPABASE_DB_PASSWORD && secrets.SUPABASE_PROJECT_ID && secrets.SUPABASE_URL && secrets.SB_PUBLISHABLE_KEY }}
VITE_IS_DEMO: ${{ vars.VITE_IS_DEMO }}
VITE_INBOUND_EMAIL: ${{ vars.VITE_INBOUND_EMAIL }}
+ VITE_ATTACHMENTS_BUCKET: ${{ vars.VITE_ATTACHMENTS_BUCKET || 'attachments' }}
PRODUCTION_REMOTE: https://git:${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ vars.DEPLOY_REPOSITORY }}
POSTMARK_WEBHOOK_USER: ${{secrets.POSTMARK_WEBHOOK_USER}}
POSTMARK_WEBHOOK_PASSWORD: ${{secrets.POSTMARK_WEBHOOK_PASSWORD}}
@@ -153,6 +155,7 @@ jobs:
npx supabase secrets set POSTMARK_WEBHOOK_PASSWORD=${{ env.POSTMARK_WEBHOOK_PASSWORD }}
npx supabase secrets set POSTMARK_WEBHOOK_AUTHORIZED_IPS=${{ env.POSTMARK_WEBHOOK_AUTHORIZED_IPS }}
npx supabase secrets set VITE_INBOUND_EMAIL=${{ env.VITE_INBOUND_EMAIL }}
+ npx supabase secrets set VITE_ATTACHMENTS_BUCKET=${{ env.VITE_ATTACHMENTS_BUCKET }}
- if: ${{ env.IS_SUPABASE_CONFIGURED }}
name: 📡 Deploy supabase functions
diff --git a/doc/src/content/docs/developers/deploy.mdx b/doc/src/content/docs/developers/deploy.mdx
index 9360b17d..a9d6988e 100644
--- a/doc/src/content/docs/developers/deploy.mdx
+++ b/doc/src/content/docs/developers/deploy.mdx
@@ -72,6 +72,7 @@ POSTMARK_WEBHOOK_USER: User configured in Postmark to secure the webhook
POSTMARK_WEBHOOK_PASSWORD: Password configured in Postmark to secure the webhook
POSTMARK_WEBHOOK_AUTHORIZED_IPS: List of IPs (comma separated) authorized to send requests to the Postmark webhook
VITE_INBOUND_EMAIL: The email address configured in Postmark to receive inbound emails
+VITE_ATTACHMENTS_BUCKET: The name of the bucket used to store attachments. Optional default to `attachments`
```
> **Note:** The `POSTMARK_*` and `VITE_INBOUND_EMAIL` variables are required for Atomic CRM's inbound email features. Have a look at the the [inbound email configuration](../inbound-email-configuration) to learn more about their usage and setup.
diff --git a/doc/src/content/docs/developers/inbound-email-configuration.mdx b/doc/src/content/docs/developers/inbound-email-configuration.mdx
index ba4d6fad..d23ce4f7 100644
--- a/doc/src/content/docs/developers/inbound-email-configuration.mdx
+++ b/doc/src/content/docs/developers/inbound-email-configuration.mdx
@@ -38,6 +38,7 @@ npx supabase secrets set POSTMARK_WEBHOOK_USER=<user>
npx supabase secrets set POSTMARK_WEBHOOK_PASSWORD=<password>
npx supabase secrets set POSTMARK_WEBHOOK_AUTHORIZED_IPS=<comma-separated list of IPs>
npx supabase secrets set VITE_INBOUND_EMAIL=<your-postmark-inbound-email>
+npx supabase secrets set VITE_ATTACHMENTS_BUCKET=attachments
```
These commands will push the secrets to your remote Supabase project.
diff --git a/src/components/atomic-crm/providers/commons/attachments.ts b/src/components/atomic-crm/providers/commons/attachments.ts
index 8583fc61..4e920cb6 100644
--- a/src/components/atomic-crm/providers/commons/attachments.ts
+++ b/src/components/atomic-crm/providers/commons/attachments.ts
@@ -1 +1,2 @@
-export const ATTACHMENTS_BUCKET = "attachments";
+export const ATTACHMENTS_BUCKET =
+ import.meta.env.VITE_ATTACHMENTS_BUCKET || "attachments";
diff --git a/supabase/functions/delete_note_attachments/index.ts b/supabase/functions/delete_note_attachments/index.ts
index 2fc10430..545b639a 100644
--- a/supabase/functions/delete_note_attachments/index.ts
+++ b/supabase/functions/delete_note_attachments/index.ts
@@ -1,7 +1,9 @@
import "jsr:@supabase/functions-js/edge-runtime.d.ts";
import { AuthMiddleware } from "../_shared/authentication.ts";
import { supabaseAdmin } from "../_shared/supabaseAdmin.ts";
-import { ATTACHMENTS_BUCKET } from "../../../src/components/atomic-crm/providers/commons/attachments.ts";
+
+const ATTACHMENTS_BUCKET =
+ Deno.env.get("VITE_ATTACHMENTS_BUCKET") || "attachments";
type NoteAttachment = {
path?: string | null;
diff --git a/vite.config.ts b/vite.config.ts
index 64b50465..5760fd56 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -47,6 +47,9 @@ export default defineConfig({
"import.meta.env.VITE_INBOUND_EMAIL": JSON.stringify(
process.env.VITE_INBOUND_EMAIL,
),
+ "import.meta.env.VITE_ATTACHMENTS_BUCKET": JSON.stringify(
+ process.env.VITE_ATTACHMENTS_BUCKET,
+ ),
}
: undefined,
base: "./",