From aa376d25dfa19479ea9f0f102a038ae00f57d62d Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Sun, 5 Oct 2025 17:39:36 -0700
Subject: [PATCH 1/2] Fix margin on website edit

---
 .../settings/websites/[websiteId]/WebsiteSettingsPage.tsx  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx
index d5c129ee..0dc7bcc1 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx
@@ -2,12 +2,15 @@
 import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';
 import { WebsiteSettings } from '@/app/(main)/websites/[websiteId]/settings/WebsiteSettings';
 import { WebsiteSettingsHeader } from '@/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader';
+import { Column } from '@umami/react-zen';
 
 export function WebsiteSettingsPage({ websiteId }: { websiteId: string }) {
   return (
     <WebsiteProvider websiteId={websiteId}>
-      <WebsiteSettingsHeader />
-      <WebsiteSettings websiteId={websiteId} />
+      <Column margin="2">
+        <WebsiteSettingsHeader />
+        <WebsiteSettings websiteId={websiteId} />
+      </Column>
     </WebsiteProvider>
   );
 }

From e64a01d8f1f27c71dbaa9cf8b5e3040b6c4221f6 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Sun, 5 Oct 2025 22:37:06 -0700
Subject: [PATCH 2/2] fix redis set for resetWebsite cloudMode

---
 src/lib/request.ts            | 4 ++--
 src/queries/prisma/website.ts | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib/request.ts b/src/lib/request.ts
index afd2b130..da247e20 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -1,12 +1,12 @@
-import { z } from 'zod';
 import { checkAuth } from '@/lib/auth';
 import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS } from '@/lib/constants';
 import { getAllowedUnits, getMinimumUnit, maxDate, parseDateRange } from '@/lib/date';
 import { fetchWebsite } from '@/lib/load';
+import { filtersArrayToObject } from '@/lib/params';
 import { badRequest, unauthorized } from '@/lib/response';
 import { QueryFilters } from '@/lib/types';
 import { getWebsiteSegment } from '@/queries/prisma';
-import { filtersArrayToObject } from '@/lib/params';
+import { z } from 'zod';
 
 export async function parseRequest(
   request: Request,
diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.ts
index 315dca03..ade8893c 100644
--- a/src/queries/prisma/website.ts
+++ b/src/queries/prisma/website.ts
@@ -156,7 +156,10 @@ export async function resetWebsite(websiteId: string) {
     }),
   ]).then(async data => {
     if (cloudMode) {
-      await redis.client.set(`website:${websiteId}`, data[3]);
+      await redis.client.set(
+        `website:${websiteId}`,
+        data.find(website => website.id),
+      );
     }
 
     return data;