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/billing/stripe/src/components/stripe-embedded-checkout.tsx

@@ -50,6 +50,7 @@ function EmbeddedCheckoutPopup({
     <Dialog
       defaultOpen
       open={open}
+      disablePointerDismissal
       onOpenChange={(open) => {
         if (!open && onClose) {
           onClose();
@@ -63,9 +64,6 @@ function EmbeddedCheckoutPopup({
           maxHeight: '98vh',
         }}
         className={className}
-        onOpenAutoFocus={(e) => e.preventDefault()}
-        onInteractOutside={(e) => e.preventDefault()}
-        onEscapeKeyDown={(e) => e.preventDefault()}
       >
         <DialogTitle className={'hidden'}>Checkout</DialogTitle>
         <div>{children}</div>

packages/billing/stripe/src/schema/stripe-client-env.schema.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import * as z from 'zod';
 
 export const StripeClientEnvSchema = z
   .object({

packages/billing/stripe/src/schema/stripe-server-env.schema.ts

@@ -1,15 +1,15 @@
-import { z } from 'zod';
+import * as z from 'zod';
 
 export const StripeServerEnvSchema = z
   .object({
     secretKey: z
       .string({
-        required_error: `Please provide the variable STRIPE_SECRET_KEY`,
+        error: `Please provide the variable STRIPE_SECRET_KEY`,
       })
       .min(1),
     webhooksSecret: z
       .string({
-        required_error: `Please provide the variable STRIPE_WEBHOOK_SECRET`,
+        error: `Please provide the variable STRIPE_WEBHOOK_SECRET`,
       })
       .min(1),
   })

packages/billing/stripe/src/services/create-stripe-billing-portal-session.ts

@@ -1,5 +1,5 @@
 import type { Stripe } from 'stripe';
-import { z } from 'zod';
+import * as z from 'zod';
 
 import type { CreateBillingPortalSessionSchema } from '@kit/billing/schema';
 
@@ -9,7 +9,7 @@ import type { CreateBillingPortalSessionSchema } from '@kit/billing/schema';
  */
 export async function createStripeBillingPortalSession(
   stripe: Stripe,
-  params: z.infer<typeof CreateBillingPortalSessionSchema>,
+  params: z.output<typeof CreateBillingPortalSessionSchema>,
 ) {
   return stripe.billingPortal.sessions.create({
     customer: params.customerId,

packages/billing/stripe/src/services/create-stripe-checkout.ts

@@ -1,5 +1,5 @@
 import type { Stripe } from 'stripe';
-import { z } from 'zod';
+import * as z from 'zod';
 
 import type { CreateBillingCheckoutSchema } from '@kit/billing/schema';
 
@@ -17,7 +17,7 @@ const enableTrialWithoutCreditCard =
  */
 export async function createStripeCheckout(
   stripe: Stripe,
-  params: z.infer<typeof CreateBillingCheckoutSchema>,
+  params: z.output<typeof CreateBillingCheckoutSchema>,
 ) {
   // in MakerKit, a subscription belongs to an organization,
   // rather than to a user

packages/billing/stripe/src/services/stripe-billing-strategy.service.ts

@@ -1,7 +1,7 @@
 import 'server-only';
 
 import type { Stripe } from 'stripe';
-import { z } from 'zod';
+import * as z from 'zod';
 
 import { BillingStrategyProviderService } from '@kit/billing';
 import type {
@@ -35,7 +35,7 @@ export class StripeBillingStrategyService implements BillingStrategyProviderServ
    * @param params
    */
   async createCheckoutSession(
-    params: z.infer<typeof CreateBillingCheckoutSchema>,
+    params: z.output<typeof CreateBillingCheckoutSchema>,
   ) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
@@ -67,7 +67,7 @@ export class StripeBillingStrategyService implements BillingStrategyProviderServ
    * @param params
    */
   async createBillingPortalSession(
-    params: z.infer<typeof CreateBillingPortalSessionSchema>,
+    params: z.output<typeof CreateBillingPortalSessionSchema>,
   ) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
@@ -96,7 +96,7 @@ export class StripeBillingStrategyService implements BillingStrategyProviderServ
    * @param params
    */
   async cancelSubscription(
-    params: z.infer<typeof CancelSubscriptionParamsSchema>,
+    params: z.output<typeof CancelSubscriptionParamsSchema>,
   ) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
@@ -139,7 +139,7 @@ export class StripeBillingStrategyService implements BillingStrategyProviderServ
    * @param params
    */
   async retrieveCheckoutSession(
-    params: z.infer<typeof RetrieveCheckoutSessionSchema>,
+    params: z.output<typeof RetrieveCheckoutSessionSchema>,
   ) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
@@ -183,7 +183,7 @@ export class StripeBillingStrategyService implements BillingStrategyProviderServ
    * @description Reports usage for a subscription with the Metrics API
    * @param params
    */
-  async reportUsage(params: z.infer<typeof ReportBillingUsageSchema>) {
+  async reportUsage(params: z.output<typeof ReportBillingUsageSchema>) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
 
@@ -230,7 +230,7 @@ export class StripeBillingStrategyService implements BillingStrategyProviderServ
    * @name queryUsage
    * @description Reports the total usage for a subscription with the Metrics API
    */
-  async queryUsage(params: z.infer<typeof QueryBillingUsageSchema>) {
+  async queryUsage(params: z.output<typeof QueryBillingUsageSchema>) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
 
@@ -287,7 +287,7 @@ export class StripeBillingStrategyService implements BillingStrategyProviderServ
    * @param params
    */
   async updateSubscriptionItem(
-    params: z.infer<typeof UpdateSubscriptionParamsSchema>,
+    params: z.output<typeof UpdateSubscriptionParamsSchema>,
   ) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();