chore: added required tenant user checks (#2008)

Co-authored-by: Gitanjli Chopra <[email protected]>
juspay · Jan 3, 2025 · 8144ae1 · 8144ae1
1 parent c009366
commit 8144ae1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/entryPoints/HyperSwitchApp.res b/src/entryPoints/HyperSwitchApp.res
@@ -203,7 +203,7 @@ let make = () => {
                         | list{"customers", ...remainingPath} =>
                           <AccessControl
                             authorization={userHasAccess(~groupAccess=OperationsView)}
-                            isEnabled={[#Organization, #Merchant]->checkUserEntity}>
+                            isEnabled={[#Tenant, #Organization, #Merchant]->checkUserEntity}>
                             <EntityScaffold
                               entityName="Customers"
                               remainingPath
@@ -216,7 +216,7 @@ let make = () => {
                         | list{"analytics-user-journey"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.userJourneyAnalytics &&
-                            [#Organization, #Merchant]->checkUserEntity}
+                            [#Tenant, #Organization, #Merchant]->checkUserEntity}
                             authorization={userHasAccess(~groupAccess=AnalyticsView)}>
                             <FilterContext key="UserJourneyAnalytics" index="UserJourneyAnalytics">
                               <UserJourneyAnalytics />
@@ -225,7 +225,7 @@ let make = () => {
                         | list{"analytics-authentication"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.authenticationAnalytics &&
-                            [#Organization, #Merchant]->checkUserEntity}
+                            [#Tenant, #Organization, #Merchant]->checkUserEntity}
                             authorization={userHasAccess(~groupAccess=AnalyticsView)}>
                             <FilterContext
                               key="AuthenticationAnalytics" index="AuthenticationAnalytics">

diff --git a/src/entryPoints/SidebarValues.res b/src/entryPoints/SidebarValues.res
@@ -611,7 +611,7 @@ let reconConfigurator = {
 // }
 
 let reconAndSettlement = (recon, isReconEnabled, checkUserEntity, userHasResourceAccess) => {
-  switch (recon, isReconEnabled, checkUserEntity([#Merchant, #Organization])) {
+  switch (recon, isReconEnabled, checkUserEntity([#Merchant, #Organization, #Tenant])) {
   | (true, true, true) => {
       let links = []
       if userHasResourceAccess(~resourceAccess=ReconFiles) == CommonAuthTypes.Access {

diff --git a/src/screens/OMPSwitch/OMPSwitchUtils.res b/src/screens/OMPSwitch/OMPSwitchUtils.res
@@ -63,15 +63,15 @@ let profile = {
 }
 
 let transactionViewList = (~checkUserEntity): ompViews => {
-  if checkUserEntity([#Merchant, #Organization]) {
+  if checkUserEntity([#Tenant, #Merchant, #Organization]) {
     [merchant, profile]
   } else {
     []
   }
 }
 
 let analyticsViewList = (~checkUserEntity): ompViews => {
-  if checkUserEntity([#Organization]) {
+  if checkUserEntity([#Tenant, #Organization]) {
     [org, merchant, profile]
   } else if checkUserEntity([#Merchant]) {
     [merchant, profile]

diff --git a/src/screens/UserManagement/UserRevamp/InviteMember.res b/src/screens/UserManagement/UserRevamp/InviteMember.res
@@ -24,8 +24,12 @@ let make = (~isInviteUserFlow=true, ~setNewRoleSelected=_ => ()) => {
 
     let initialvalue = [("org_value", orgId->JSON.Encode.string)]
 
-    if userEntity == #Organization {
-      // TODO : Change this condition when user org level user_invite is enabled
+    if userEntity == #Tenant {
+      initialvalue->Array.pushMany([
+        ("merchant_value", merchantId->JSON.Encode.string),
+        ("profile_value", profileId->JSON.Encode.string),
+      ])
+    } else if userEntity == #Organization {
       initialvalue->Array.pushMany([
         ("merchant_value", merchantId->JSON.Encode.string),
         ("profile_value", profileId->JSON.Encode.string),