Admin package summary sheet

resources/js/admin/mobile/lib/onboardingGuard.ts

@@ -1,16 +1,13 @@
 import {
   ADMIN_EVENT_CREATE_PATH,
-  ADMIN_WELCOME_BASE_PATH,
-  ADMIN_WELCOME_EVENT_PATH,
-  ADMIN_WELCOME_SUMMARY_PATH,
+  ADMIN_BILLING_PATH,
 } from '../../constants';
 
 type OnboardingRedirectInput = {
   hasEvents: boolean;
   hasActivePackage: boolean;
-  selectedPackageId?: number | null;
+  remainingEvents?: number | null;
   pathname: string;
-  isWelcomePath: boolean;
   isBillingPath: boolean;
   isOnboardingDismissed?: boolean;
   isOnboardingCompleted?: boolean;
@@ -19,22 +16,17 @@ type OnboardingRedirectInput = {
 export function resolveOnboardingRedirect({
   hasEvents,
   hasActivePackage,
-  selectedPackageId,
+  remainingEvents,
   pathname,
-  isWelcomePath,
   isBillingPath,
   isOnboardingDismissed,
   isOnboardingCompleted,
 }: OnboardingRedirectInput): string | null {
-  if (hasEvents) {
-    return null;
-  }
-
   if (isOnboardingDismissed || isOnboardingCompleted) {
     return null;
   }
 
-  if (isWelcomePath || isBillingPath) {
+  if (isBillingPath) {
     return null;
   }
 
@@ -42,16 +34,9 @@ export function resolveOnboardingRedirect({
     return null;
   }
 
-  const shouldContinueSummary = Boolean(selectedPackageId && selectedPackageId > 0);
-  const target = hasActivePackage
-    ? ADMIN_WELCOME_EVENT_PATH
-    : shouldContinueSummary
-      ? ADMIN_WELCOME_SUMMARY_PATH
-      : ADMIN_WELCOME_BASE_PATH;
-
-  if (pathname === target) {
-    return null;
+  if (!hasEvents && (!hasActivePackage || (remainingEvents !== null && remainingEvents <= 0))) {
+    return ADMIN_BILLING_PATH;
   }
 
-  return target;
+  return null;
 }