Unify workspace dropdowns; Update layouts (#458)

Unified Account and Workspace drop-downs; Layout updates, now header lives within the PageBody component; Sidebars now use floating variant

packages/features/accounts/src/server/personal-accounts-server-actions.ts

@@ -3,7 +3,7 @@
 import { revalidatePath } from 'next/cache';
 import { redirect } from 'next/navigation';
 
-import { enhanceAction } from '@kit/next/actions';
+import { authActionClient } from '@kit/next/safe-action';
 import { createOtpApi } from '@kit/otp';
 import { getLogger } from '@kit/shared/logger';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
@@ -23,25 +23,17 @@ export async function refreshAuthSession() {
   return {};
 }
 
-export const deletePersonalAccountAction = enhanceAction(
-  async (formData: FormData, user) => {
+export const deletePersonalAccountAction = authActionClient
+  .schema(DeletePersonalAccountSchema)
+  .action(async ({ parsedInput: data, ctx: { user } }) => {
     const logger = await getLogger();
 
-    // validate the form data
-    const { success } = DeletePersonalAccountSchema.safeParse(
-      Object.fromEntries(formData.entries()),
-    );
-
-    if (!success) {
-      throw new Error('Invalid form data');
-    }
-
     const ctx = {
       name: 'account.delete',
       userId: user.id,
     };
 
-    const otp = formData.get('otp') as string;
+    const otp = data.otp;
 
     if (!otp) {
       throw new Error('OTP is required');
@@ -101,6 +93,4 @@ export const deletePersonalAccountAction = enhanceAction(
 
     // redirect to the home page
     redirect('/');
-  },
-  {},
-);
+  });

packages/features/accounts/src/server/services/delete-personal-account.service.ts

@@ -2,7 +2,7 @@ import 'server-only';
 
 import { SupabaseClient } from '@supabase/supabase-js';
 
-import { z } from 'zod';
+import * as z from 'zod';
 
 import { getLogger } from '@kit/shared/logger';
 import { Database } from '@kit/supabase/database';
@@ -133,12 +133,12 @@ class DeletePersonalAccountService {
       .object({
         productName: z
           .string({
-            required_error: 'NEXT_PUBLIC_PRODUCT_NAME is required',
+            error: 'NEXT_PUBLIC_PRODUCT_NAME is required',
           })
           .min(1),
         fromEmail: z
           .string({
-            required_error: 'EMAIL_SENDER is required',
+            error: 'EMAIL_SENDER is required',
           })
           .min(1),
       })