Small fixes

enso-org · Aug 19, 2024 · 0553109 · 0553109
1 parent f388bec
commit 0553109
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/app/dashboard/src/pages/authentication/Setup/Setup.tsx b/app/dashboard/src/pages/authentication/Setup/Setup.tsx
@@ -128,7 +128,14 @@ const BASE_STEPS: Step[] = [
   {
     title: 'setOrgNameTitle',
     text: 'setOrgNameDescription',
-    ignore: (context) => context.plan === Plan.free || context.plan === Plan.solo,
+    ignore: (context) => {
+      const isOrganizationAdmin =
+        context.session && 'user' in context.session ?
+          context.session.user.isOrganizationAdmin
+        : false
+
+      return (context.plan === Plan.free || context.plan === Plan.solo) && !isOrganizationAdmin
+    },
     hideNext: true,
     hidePrevious: true,
     /**
@@ -187,7 +194,14 @@ const BASE_STEPS: Step[] = [
   {
     title: 'inviteUsers',
     text: 'inviteUsersDescription',
-    ignore: (context) => context.plan === Plan.free || context.plan === Plan.solo,
+    ignore: (context) => {
+      const isOrganizationAdmin =
+        context.session && 'user' in context.session ?
+          context.session.user.isOrganizationAdmin
+        : false
+
+      return (context.plan === Plan.free || context.plan === Plan.solo) && !isOrganizationAdmin
+    },
     hideNext: true,
     hidePrevious: true,
     /**
@@ -220,7 +234,14 @@ const BASE_STEPS: Step[] = [
   {
     title: 'setDefaultUserGroup',
     text: 'setDefaultUserGroupDescription',
-    ignore: (context) => context.plan === Plan.free || context.plan === Plan.solo,
+    ignore: (context) => {
+      const isOrganizationAdmin =
+        context.session && 'user' in context.session ?
+          context.session.user.isOrganizationAdmin
+        : false
+
+      return (context.plan === Plan.free || context.plan === Plan.solo) && !isOrganizationAdmin
+    },
     hideNext: true,
     hidePrevious: true,
     /**