Skip to content

Commit aa75914

Browse files
authored
Remove sync status indicator and fix JSON trailing commas (#1924)
# READ CAREFULLY THEN REMOVE Remove bullet points that are not relevant. PLEASE REFRAIN FROM USING AI TO WRITE YOUR CODE AND PR DESCRIPTION. IF YOU DO USE AI TO WRITE YOUR CODE PLEASE PROVIDE A DESCRIPTION AND REVIEW IT CAREFULLY. MAKE SURE YOU UNDERSTAND THE CODE YOU ARE SUBMITTING USING AI. - Pull requests that do not follow these guidelines will be closed without review or comment. - If you use AI to write your PR description your pr will be close without review or comment. - If you are unsure about anything, feel free to ask for clarification. ## Description Please provide a clear description of your changes. --- ## Type of Change Please delete options that are not relevant. - [ ] 🐛 Bug fix (non-breaking change which fixes an issue) - [ ] ✨ New feature (non-breaking change which adds functionality) - [ ] 💥 Breaking change (fix or feature with breaking changes) - [ ] 📝 Documentation update - [ ] 🎨 UI/UX improvement - [ ] 🔒 Security enhancement - [ ] ⚡ Performance improvement ## Areas Affected Please check all that apply: - [ ] Email Integration (Gmail, IMAP, etc.) - [ ] User Interface/Experience - [ ] Authentication/Authorization - [ ] Data Storage/Management - [ ] API Endpoints - [ ] Documentation - [ ] Testing Infrastructure - [ ] Development Workflow - [ ] Deployment/Infrastructure ## Testing Done Describe the tests you've done: - [ ] Unit tests added/updated - [ ] Integration tests added/updated - [ ] Manual testing performed - [ ] Cross-browser testing (if UI changes) - [ ] Mobile responsiveness verified (if UI changes) ## Security Considerations For changes involving data or authentication: - [ ] No sensitive data is exposed - [ ] Authentication checks are in place - [ ] Input validation is implemented - [ ] Rate limiting is considered (if applicable) ## Checklist - [ ] I have read the [CONTRIBUTING](https://github.com/Mail-0/Zero/blob/staging/.github/CONTRIBUTING.md) document - [ ] My code follows the project's style guidelines - [ ] I have performed a self-review of my code - [ ] I have commented my code, particularly in complex areas - [ ] I have updated the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix/feature works - [ ] All tests pass locally - [ ] Any dependent changes are merged and published ## Additional Notes Add any other context about the pull request here. ## Screenshots/Recordings Add screenshots or recordings here if applicable. --- _By submitting this pull request, I confirm that my contribution is made under the terms of the project's license._ <!-- This is an auto-generated description by cubic. --> --- ## Summary by cubic Removed the sync status indicator from the mail layout and fixed trailing commas in wrangler.jsonc files to ensure valid JSONC formatting. - **Bug Fixes** - Cleaned up JSONC files by removing trailing commas that could cause parsing errors. <!-- End of auto-generated description by cubic. --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Removed the syncing status indicator from the mail interface. * **Chores** * Updated configuration files with improved formatting and added new rules for handling certain file types in different environments. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent fec8e1b commit aa75914

File tree

2 files changed

+30
-48
lines changed

2 files changed

+30
-48
lines changed

apps/mail/components/mail/mail.tsx

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ export function MailLayout() {
326326
const { data: activeConnection } = useActiveConnection();
327327
const { activeFilters, clearAllFilters } = useCommandPalette();
328328
const [, setIsCommandPaletteOpen] = useQueryState('isCommandPaletteOpen');
329-
const [{ isSyncing, syncingFolders, storageSize }] = useDoState();
330329

331330
useEffect(() => {
332331
if (prevFolderRef.current !== folder && mail.bulkSelected.length > 0) {
@@ -394,39 +393,8 @@ export function MailLayout() {
394393
const defaultCategoryId = useDefaultCategoryId();
395394
const [category] = useQueryState('category', { defaultValue: defaultCategoryId });
396395

397-
return (
396+
return (
398397
<TooltipProvider delayDuration={0}>
399-
<div className="fixed right-2 top-2 z-10 flex items-center gap-2">
400-
<div className="bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 flex items-center gap-2 rounded-lg border px-3 py-1.5 shadow-sm">
401-
<div className="flex items-center gap-1.5">
402-
<div className={cn(
403-
"h-2 w-2 rounded-full",
404-
isSyncing || storageSize === 0 ? "bg-orange-500 animate-pulse" : "bg-green-500"
405-
)} />
406-
<span className="text-muted-foreground text-xs font-medium">
407-
{isSyncing || storageSize === 0 ? 'Syncing emails...' : 'Synced'}
408-
</span>
409-
</div>
410-
411-
{storageSize && (
412-
<>
413-
<div className="bg-border h-3 w-px" />
414-
<span className="text-muted-foreground text-xs">
415-
{storageSize}
416-
</span>
417-
</>
418-
)}
419-
420-
{syncingFolders.length > 0 && (
421-
<>
422-
<div className="bg-border h-3 w-px" />
423-
<span className="text-muted-foreground text-xs">
424-
{syncingFolders.join(', ')}
425-
</span>
426-
</>
427-
)}
428-
</div>
429-
</div>
430398
<PricingDialog />
431399
<div className="rounded-inherit z-5 relative flex p-0 md:mr-0.5 md:mt-1">
432400
<ResizablePanelGroup

apps/server/wrangler.jsonc

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
},
7373
{
7474
"queue": "send-email-queue",
75-
"binding": "send_email_queue"
75+
"binding": "send_email_queue",
7676
},
7777
],
7878
"consumers": [
@@ -83,7 +83,7 @@
8383
"queue": "thread-queue",
8484
},
8585
{
86-
"queue": "send-email-queue"
86+
"queue": "send-email-queue",
8787
},
8888
],
8989
},
@@ -177,15 +177,15 @@
177177
},
178178
{
179179
"binding": "pending_emails_status",
180-
"id": "e65f8f72441d4eadb9d5ae36269316c9"
180+
"id": "e65f8f72441d4eadb9d5ae36269316c9",
181181
},
182182
{
183183
"binding": "pending_emails_payload",
184-
"id": "e65f8f72441d4eadb9d5ae36269316c9_payload"
184+
"id": "e65f8f72441d4eadb9d5ae36269316c9_payload",
185185
},
186186
{
187187
"binding": "scheduled_emails",
188-
"id": "e65f8f72441d4eadb9d5ae36269316c9_scheduled"
188+
"id": "e65f8f72441d4eadb9d5ae36269316c9_scheduled",
189189
},
190190
{
191191
"binding": "snoozed_emails",
@@ -194,6 +194,13 @@
194194
],
195195
},
196196
"staging": {
197+
"rules": [
198+
{
199+
"type": "Text",
200+
"globs": ["**/*.sql"],
201+
"fallthrough": true,
202+
},
203+
],
197204
"triggers": {
198205
"crons": ["0 0 * * *", "0 * * * *"],
199206
},
@@ -259,7 +266,7 @@
259266
},
260267
{
261268
"queue": "send-email-queue-staging",
262-
"binding": "send_email_queue"
269+
"binding": "send_email_queue",
263270
},
264271
],
265272
"consumers": [
@@ -270,7 +277,7 @@
270277
"queue": "thread-queue-staging",
271278
},
272279
{
273-
"queue": "send-email-queue-staging"
280+
"queue": "send-email-queue-staging",
274281
},
275282
],
276283
},
@@ -356,15 +363,15 @@
356363
},
357364
{
358365
"binding": "pending_emails_status",
359-
"id": "e65f8f72441d4eadb9d5ae36269316c9"
366+
"id": "e65f8f72441d4eadb9d5ae36269316c9",
360367
},
361368
{
362369
"binding": "pending_emails_payload",
363-
"id": "e65f8f72441d4eadb9d5ae36269316c9_payload"
370+
"id": "e65f8f72441d4eadb9d5ae36269316c9_payload",
364371
},
365372
{
366373
"binding": "scheduled_emails",
367-
"id": "e65f8f72441d4eadb9d5ae36269316c9_scheduled"
374+
"id": "e65f8f72441d4eadb9d5ae36269316c9_scheduled",
368375
},
369376
{
370377
"binding": "snoozed_emails",
@@ -373,6 +380,13 @@
373380
],
374381
},
375382
"production": {
383+
"rules": [
384+
{
385+
"type": "Text",
386+
"globs": ["**/*.sql"],
387+
"fallthrough": true,
388+
},
389+
],
376390
"triggers": {
377391
"crons": ["0 0 * * *", "0 * * * *"],
378392
},
@@ -445,7 +459,7 @@
445459
},
446460
{
447461
"queue": "send-email-queue-prod",
448-
"binding": "send_email_queue"
462+
"binding": "send_email_queue",
449463
},
450464
],
451465
"consumers": [
@@ -456,7 +470,7 @@
456470
"queue": "thread-queue-prod",
457471
},
458472
{
459-
"queue": "send-email-queue-prod"
473+
"queue": "send-email-queue-prod",
460474
},
461475
],
462476
},
@@ -532,15 +546,15 @@
532546
},
533547
{
534548
"binding": "pending_emails_status",
535-
"id": "e65f8f72441d4eadb9d5ae36269316c9"
549+
"id": "e65f8f72441d4eadb9d5ae36269316c9",
536550
},
537551
{
538552
"binding": "pending_emails_payload",
539-
"id": "e65f8f72441d4eadb9d5ae36269316c9_payload"
553+
"id": "e65f8f72441d4eadb9d5ae36269316c9_payload",
540554
},
541555
{
542556
"binding": "scheduled_emails",
543-
"id": "e65f8f72441d4eadb9d5ae36269316c9_scheduled"
557+
"id": "e65f8f72441d4eadb9d5ae36269316c9_scheduled",
544558
},
545559
{
546560
"binding": "snoozed_emails",

0 commit comments

Comments
 (0)