Merge remote-tracking branch 'origin/dev' into dev

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 />
+      <Column margin="2">
-      <WebsiteSettings websiteId={websiteId} />
+        <WebsiteSettingsHeader />
+        <WebsiteSettings websiteId={websiteId} />
+      </Column>
     </WebsiteProvider>
   );
 }

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,

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;