feat: move user module out and enable invite for v1 products

config/config.toml

@@ -82,6 +82,7 @@ dev_roles_v2=false
 dev_customer=false
 dev_accept_invite=true
 dev_theme=false
+dev_users=false
 [default.merchant_config]
 [default.merchant_config.allowlist]
 [default.merchant_config.allowlist.dev_recon_engine_v1]

src/entryPoints/FeatureFlagUtils.res

@@ -71,6 +71,7 @@ type featureFlag = {
   devSidebarV2: bool,
   vaultProcessor: bool,
   devTheme: bool,
+  devUsers: bool,
 }
 
 let featureFlagType = (featureFlags: JSON.t) => {
@@ -144,6 +145,7 @@ let featureFlagType = (featureFlags: JSON.t) => {
     devSidebarV2: dict->getBool("dev_sidebar_v2", false),
     vaultProcessor: dict->getBool("vault_processor", false),
     devTheme: dict->getBool("dev_theme", false),
+    devUsers: dict->getBool("dev_users", false),
   }
 }
 

src/entryPoints/HyperSwitchApp.res

@@ -219,6 +219,7 @@ let make = () => {
 
                         | (_, list{"organization-chart"}) => <OrganisationChart />
                         | (_, list{"theme", ...remainingPath}) => <ThemeLanding remainingPath />
+                        | (_, list{"users", ..._}) => <UserManagementContainer />
                         | (_, list{"account-settings", "profile", ...remainingPath}) =>
                           <EntityScaffold
                             entityName="profile setting"

src/entryPoints/SidebarHooks.res

@@ -35,6 +35,7 @@ let useGetHsSidebarValues = (~isReconEnabled: bool) => {
     vaultProcessor,
     devModularityV2,
     devTheme,
+    devUsers,
   } = featureFlagDetails
   let {
     isFeatureEnabledForDenyListMerchant,
@@ -87,6 +88,7 @@ let useGetHsSidebarValues = (~isReconEnabled: bool) => {
       ~complianceCertificate,
       ~devModularityV2Enabled=devModularityV2,
       ~devThemeEnabled=devTheme,
+      ~devUsers,
     ),
   ]
 }
@@ -217,6 +219,13 @@ let useGetSidebarValuesForCurrentActive = (~isReconEnabled) => {
         access: Access,
         selectedIcon: "nd-fill-home",
       }),
+      Link({
+        name: "Users",
+        icon: "nd-user",
+        link: "/users",
+        access: Access,
+        selectedIcon: "nd-user",
+      }),
       ThemeSidebarValues.themeTopLevelLink(~userHasResourceAccess),
       CustomComponent({
         component: <ProductHeaderComponent />,
@@ -231,6 +240,13 @@ let useGetSidebarValuesForCurrentActive = (~isReconEnabled) => {
         access: Access,
         selectedIcon: "nd-fill-home",
       }),
+      Link({
+        name: "Users",
+        icon: "nd-user",
+        link: "/users",
+        access: Access,
+        selectedIcon: "nd-user",
+      }),
       CustomComponent({
         component: <ProductHeaderComponent />,
       }),

src/entryPoints/SidebarValues.res

@@ -472,6 +472,7 @@ let settings = (
   ~complianceCertificate,
   ~devModularityV2Enabled,
   ~devThemeEnabled,
+  ~devUsers,
 ) => {
   let settingsLinkArray = []
 
@@ -487,8 +488,9 @@ let settings = (
     ->Array.push(ThemeSidebarValues.themeSublevelLinks(~userHasResourceAccess))
     ->ignore
   }
-
-  settingsLinkArray->Array.push(userManagement(userHasResourceAccess))->ignore
+  if !devUsers {
+    settingsLinkArray->Array.push(userManagement(userHasResourceAccess))->ignore
+  }
 
   Section({
     name: "Settings",

src/screens/Sidebar/Sidebar.res

@@ -618,18 +618,21 @@ let make = (
     globalUIConfig: {sidebarColor: {backgroundColor, secondaryTextColor, hoverColor, borderColor}},
   } = React.useContext(ThemeProvider.themeContext)
   let {roleId} = React.useContext(UserInfoProvider.defaultContext).getResolvedUserInfo()
+  let {getCommonSessionDetails} = React.useContext(UserInfoProvider.defaultContext)
+  let {version} = getCommonSessionDetails()
   let {isSidebarExpanded, setIsSidebarExpanded} = React.useContext(SidebarProvider.defaultContext)
   let {showSideBar} = React.useContext(GlobalProvider.defaultContext)
   let {activeProduct, onProductSelectClick} = React.useContext(
     ProductSelectionProvider.defaultContext,
   )
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let handleLogout = APIUtils.useHandleLogout(~eventName="user_signout_manual")
   let isMobileView = MatchMedia.useMobileChecker()
   let sideBarRef = React.useRef(Nullable.null)
   let {email} = useCommonAuthInfo()->Option.getOr(defaultAuthInfo)
   let isInternalUser = roleId->HyperSwitchUtils.checkIsInternalUser
   let (exploredModules, unexploredModules) = useGetSidebarProductModules()
-  let {devModularityV2, devSidebarV2, devTheme} =
+  let {devModularityV2, devSidebarV2, devTheme, devUsers} =
     HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let merchantList = Recoil.useRecoilValueFromAtom(HyperswitchAtom.merchantListAtom)
   let (openItem, setOpenItem) = React.useState(_ => "")
@@ -740,6 +743,7 @@ let make = (
 
   let isHomeSelected = linkSelectionCheck(firstPart, "/v2/home")
   let isThemeSelected = linkSelectionCheck(firstPart, "/theme")
+  let isUsersSelected = linkSelectionCheck(firstPart, "/users")
 
   <div className={`${backgroundColor.sidebarNormal} flex group relative `}>
     <div
@@ -903,6 +907,25 @@ let make = (
                         </div>
                       </Link>
                     </RenderIf>
+                    <RenderIf
+                      condition={devUsers &&
+                      userHasAccess(~groupAccess=UsersView) == Access &&
+                      version == UserInfoTypes.V1}>
+                      <Link to_={GlobalVars.appendDashboardPath(~url="/users")}>
+                        <div
+                          className={`${body.md.medium} ${secondaryTextColor} relative overflow-hidden flex flex-row rounded-lg items-center cursor-pointer hover:transition hover:duration-300 ${isUsersSelected
+                              ? "bg-sidebar-hoverColor"
+                              : ""} ${isSidebarExpanded ? "" : "mx-1"} ${hoverColor}`}>
+                          <SidebarOption
+                            name="Users"
+                            icon="nd-settings"
+                            isSidebarExpanded
+                            isSelected={isUsersSelected}
+                            showIcon=true
+                          />
+                        </div>
+                      </Link>
+                    </RenderIf>
                   </div>
                   <div className={`${body.sm.semibold} px-3 py-2 text-nd_gray-400 tracking-widest`}>
                     {React.string("My Modules"->String.toUpperCase)}

src/screens/UserManagement/UserRevamp/UserManagementHelper.res

@@ -58,6 +58,7 @@ module MerchantSelection = {
     let showToast = ToastState.useShowToast()
     let internalSwitch = OMPSwitchHooks.useInternalSwitch()
     let merchList = Recoil.useRecoilValueFromAtom(HyperswitchAtom.merchantListAtom)
+    let {devUsers} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
     let {userEntity} = React.useContext(UserInfoProvider.defaultContext).getResolvedUserInfo()
     let (showSwitchingMerchant, setShowSwitchingMerchant) = React.useState(_ => false)
     let form = ReactFinalForm.useForm()
@@ -66,12 +67,13 @@ module MerchantSelection = {
     | #Tenant | #Organization => false
     }
 
-    let v1MerchantList = merchList->Array.filter(merchant => {
-      switch merchant.productType {
-      | Some(Orchestration(V1)) => true
-      | _ => false
+    let merchantList = merchList->Array.filter(merchant =>
+      if devUsers {
+        merchant.version == Some(V1)
+      } else {
+        merchant.productType == Some(Orchestration(V1))
       }
-    })
+    )
 
     let handleOnChange = async (event, input: ReactFinalForm.fieldRenderPropsInput) => {
       try {
@@ -96,7 +98,7 @@ module MerchantSelection = {
           ~options=getMerchantSelectBoxOption(
             ~label="All merchants",
             ~value="all_merchants",
-            ~dropdownList=v1MerchantList,
+            ~dropdownList=merchantList,
             ~showAllSelection=true,
           ),
           ~deselectDisable=true,