Skip to content

Commit

Permalink
refactor: name changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Riddhiagrawal001 committed Oct 8, 2024
1 parent fa28abf commit 9197117
Show file tree
Hide file tree
Showing 41 changed files with 170 additions and 180 deletions.
6 changes: 3 additions & 3 deletions src/Recoils/HyperswitchAtom.res
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ let paypalAccountStatusAtom: Recoil.recoilAtom<PayPalFlowTypes.setupAccountStatu
// TODO: remove this after userGroupPermissionsAtom is stable
let userPermissionAtom: Recoil.recoilAtom<UserManagementTypes.permissionJson> = Recoil.atom(
"userPermissionAtom",
PermissionMapper.defaultValueForPermission,
GroupACLMapper.defaultValueForPermission,
)

let userGroupPermissionsAtom: Recoil.recoilAtom<
let userGroupACLAtom: Recoil.recoilAtom<
option<Map.t<UserManagementTypes.permissionType, CommonAuthTypes.authorization>>,
> = Recoil.atom("userGroupPermissionsAtom", None)
> = Recoil.atom("userGroupACLAtom", None)

let switchMerchantListAtom: Recoil.recoilAtom<
array<SwitchMerchantUtils.switchMerchantListResponse>,
Expand Down
10 changes: 5 additions & 5 deletions src/container/AnalyticsContainer.res
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ let make = () => {
open HSwitchUtils
open HyperswitchAtom
let url = RescriptReactRouter.useUrl()
let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
let {userInfo: {analyticsEntity}} = React.useContext(UserInfoProvider.defaultContext)
let {performanceMonitor, disputeAnalytics} = featureFlagAtom->Recoil.useRecoilValueFromAtom
<div key={(analyticsEntity :> string)}>
{switch url.path->urlPath {
| list{"analytics-payments"} =>
<AccessControl permission={userHasAccess(~permission=AnalyticsView)}>
<AccessControl permission={userHasAccess(~groupACL=AnalyticsView)}>
<FilterContext key="PaymentsAnalytics" index="PaymentsAnalytics">
<PaymentAnalytics />
</FilterContext>
</AccessControl>
| list{"analytics-refunds"} =>
<AccessControl permission={userHasAccess(~permission=AnalyticsView)}>
<AccessControl permission={userHasAccess(~groupACL=AnalyticsView)}>
<FilterContext key="PaymentsRefunds" index="PaymentsRefunds">
<RefundsAnalytics />
</FilterContext>
</AccessControl>
| list{"analytics-disputes"} =>
<AccessControl
isEnabled={disputeAnalytics} permission={userHasAccess(~permission=AnalyticsView)}>
isEnabled={disputeAnalytics} permission={userHasAccess(~groupACL=AnalyticsView)}>
<FilterContext key="DisputeAnalytics" index="DisputeAnalytics">
<DisputeAnalytics />
</FilterContext>
</AccessControl>
| list{"performance-monitor"} =>
<AccessControl
permission={userHasAccess(~permission=AnalyticsView)} isEnabled={performanceMonitor}>
permission={userHasAccess(~groupACL=AnalyticsView)} isEnabled={performanceMonitor}>
<FilterContext key="PerformanceMonitor" index="PerformanceMonitor">
<PerformanceMonitor domain="payments" />
</FilterContext>
Expand Down
27 changes: 13 additions & 14 deletions src/container/ConnectorContainer.res
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let make = () => {
open HSwitchUtils
open HyperswitchAtom
let url = RescriptReactRouter.useUrl()
let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
let fetchConnectorListResponse = ConnectorListHook.useFetchConnectorList()
let fetchBusinessProfiles = BusinessProfileHook.useFetchBusinessProfiles()
Expand All @@ -15,9 +15,9 @@ let make = () => {
try {
setScreenState(_ => PageLoaderWrapper.Loading)
if (
userHasAccess(~permission=ConnectorsView) === Access ||
userHasAccess(~permission=WorkflowsView) === Access ||
userHasAccess(~permission=WorkflowsManage) === Access
userHasAccess(~groupACL=ConnectorsView) === Access ||
userHasAccess(~groupACL=WorkflowsView) === Access ||
userHasAccess(~groupACL=WorkflowsManage) === Access
) {
let _ = await fetchConnectorListResponse()
let _ = await fetchBusinessProfiles()
Expand All @@ -37,7 +37,7 @@ let make = () => {
{switch url.path->urlPath {
// Connector Modules
| list{"connectors", ...remainingPath} =>
<AccessControl permission={userHasAccess(~permission=ConnectorsView)}>
<AccessControl permission={userHasAccess(~groupACL=ConnectorsView)}>
<EntityScaffold
entityName="Connectors"
remainingPath
Expand All @@ -48,8 +48,7 @@ let make = () => {
</AccessControl>
| list{"payoutconnectors", ...remainingPath} =>
<AccessControl
isEnabled={featureFlagDetails.payOut}
permission={userHasAccess(~permission=ConnectorsView)}>
isEnabled={featureFlagDetails.payOut} permission={userHasAccess(~groupACL=ConnectorsView)}>
<EntityScaffold
entityName="PayoutConnectors"
remainingPath
Expand All @@ -60,7 +59,7 @@ let make = () => {
</AccessControl>
| list{"3ds-authenticators", ...remainingPath} =>
<AccessControl
permission={userHasAccess(~permission=ConnectorsView)}
permission={userHasAccess(~groupACL=ConnectorsView)}
isEnabled={featureFlagDetails.threedsAuthenticator}>
<EntityScaffold
entityName="3DS Authenticator"
Expand All @@ -73,7 +72,7 @@ let make = () => {

| list{"pm-authentication-processor", ...remainingPath} =>
<AccessControl
permission={userHasAccess(~permission=ConnectorsView)}
permission={userHasAccess(~groupACL=ConnectorsView)}
isEnabled={featureFlagDetails.pmAuthenticationProcessor}>
<EntityScaffold
entityName="PM Authentication Processor"
Expand All @@ -85,7 +84,7 @@ let make = () => {
</AccessControl>
| list{"tax-processor", ...remainingPath} =>
<AccessControl
permission={userHasAccess(~permission=ConnectorsView)}
permission={userHasAccess(~groupACL=ConnectorsView)}
isEnabled={featureFlagDetails.taxProcessor}>
<EntityScaffold
entityName="Tax Processor"
Expand All @@ -97,7 +96,7 @@ let make = () => {
</AccessControl>
| list{"fraud-risk-management", ...remainingPath} =>
<AccessControl
isEnabled={featureFlagDetails.frm} permission={userHasAccess(~permission=ConnectorsView)}>
isEnabled={featureFlagDetails.frm} permission={userHasAccess(~groupACL=ConnectorsView)}>
<EntityScaffold
entityName="risk-management"
remainingPath
Expand All @@ -108,7 +107,7 @@ let make = () => {
</AccessControl>
| list{"configure-pmts", ...remainingPath} =>
<AccessControl
permission={userHasAccess(~permission=ConnectorsView)}
permission={userHasAccess(~groupACL=ConnectorsView)}
isEnabled={featureFlagDetails.configurePmts}>
<FilterContext key="ConfigurePmts" index="ConfigurePmts">
<EntityScaffold
Expand All @@ -121,7 +120,7 @@ let make = () => {
</AccessControl>
// Routing
| list{"routing", ...remainingPath} =>
<AccessControl permission={userHasAccess(~permission=WorkflowsView)}>
<AccessControl permission={userHasAccess(~groupACL=WorkflowsView)}>
<EntityScaffold
entityName="Routing"
remainingPath
Expand All @@ -131,7 +130,7 @@ let make = () => {
</AccessControl>
| list{"payoutrouting", ...remainingPath} =>
<AccessControl
isEnabled={featureFlagDetails.payOut} permission={userHasAccess(~permission=WorkflowsView)}>
isEnabled={featureFlagDetails.payOut} permission={userHasAccess(~groupACL=WorkflowsView)}>
<EntityScaffold
entityName="PayoutRouting"
remainingPath
Expand Down
8 changes: 4 additions & 4 deletions src/container/MerchantAccountContainer.res
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let make = () => {
open HyperswitchAtom
let url = RescriptReactRouter.useUrl()
let (surveyModal, setSurveyModal) = React.useState(_ => false)
let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
let fetchConnectorListResponse = ConnectorListHook.useFetchConnectorList()
let fetchBusinessProfiles = BusinessProfileHook.useFetchBusinessProfiles()
Expand All @@ -20,7 +20,7 @@ let make = () => {
setScreenState(_ => PageLoaderWrapper.Loading)

let _ = await fetchMerchantAccountDetails()
if userHasAccess(~permission=ConnectorsView) === Access {
if userHasAccess(~groupACL=ConnectorsView) === Access {
if !featureFlagDetails.isLiveMode {
let _ = await fetchConnectorListResponse()
let _ = await fetchBusinessProfiles()
Expand Down Expand Up @@ -59,15 +59,15 @@ let make = () => {
| list{"sdk"} =>
<AccessControl
isEnabled={!featureFlagDetails.isLiveMode}
permission={userHasAccess(~permission=ConnectorsView)}>
permission={userHasAccess(~groupACL=ConnectorsView)}>
<SDKPage />
</AccessControl>
| list{"unauthorized"} => <UnauthorizedPage />
| _ => <NotFoundPage />
}}
<RenderIf
condition={!featureFlagDetails.isLiveMode &&
userHasAccess(~permission=MerchantDetailsManage) === Access &&
userHasAccess(~groupACL=MerchantDetailsManage) === Access &&
merchantDetailsTypedValue.merchant_name->Option.isNone}>
<SbxOnboardingSurvey showModal=surveyModal setShowModal=setSurveyModal />
</RenderIf>
Expand Down
10 changes: 5 additions & 5 deletions src/container/TransactionContainer.res
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ let make = () => {
open HyperswitchAtom
let url = RescriptReactRouter.useUrl()

let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
let {userInfo: {transactionEntity}} = React.useContext(UserInfoProvider.defaultContext)
let {payOut} = featureFlagAtom->Recoil.useRecoilValueFromAtom
<div key={(transactionEntity :> string)}>
{switch url.path->urlPath {
| list{"payments", ...remainingPath} =>
<AccessControl permission={userHasAccess(~permission=OperationsView)}>
<AccessControl permission={userHasAccess(~groupACL=OperationsView)}>
<FilterContext key="payments" index="payments">
<EntityScaffold
entityName="Payments"
Expand All @@ -22,7 +22,7 @@ let make = () => {
</FilterContext>
</AccessControl>
| list{"payouts", ...remainingPath} =>
<AccessControl isEnabled={payOut} permission={userHasAccess(~permission=OperationsView)}>
<AccessControl isEnabled={payOut} permission={userHasAccess(~groupACL=OperationsView)}>
<FilterContext key="payouts" index="payouts">
<EntityScaffold
entityName="Payouts"
Expand All @@ -34,7 +34,7 @@ let make = () => {
</FilterContext>
</AccessControl>
| list{"refunds", ...remainingPath} =>
<AccessControl permission={userHasAccess(~permission=OperationsView)}>
<AccessControl permission={userHasAccess(~groupACL=OperationsView)}>
<FilterContext key="refunds" index="refunds">
<EntityScaffold
entityName="Refunds"
Expand All @@ -46,7 +46,7 @@ let make = () => {
</FilterContext>
</AccessControl>
| list{"disputes", ...remainingPath} =>
<AccessControl permission={userHasAccess(~permission=OperationsView)}>
<AccessControl permission={userHasAccess(~groupACL=OperationsView)}>
<FilterContext key="disputes" index="disputes">
<EntityScaffold
entityName="Disputes"
Expand Down
10 changes: 5 additions & 5 deletions src/container/UserManagementContainer.res
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ let make = () => {
let getURL = useGetURL()
let fetchDetails = useGetMethod()
let url = RescriptReactRouter.useUrl()
let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
let setRoleInfo = Recoil.useSetRecoilState(HyperswitchAtom.moduleListRecoil)

let fetchModuleList = async () => {
try {
if userHasAccess(~permission=UsersManage) === Access {
if userHasAccess(~groupACL=UsersManage) === Access {
let url = getURL(
~entityName=USERS,
~userType=#ROLE_INFO,
Expand All @@ -47,15 +47,15 @@ let make = () => {
{switch url.path->urlPath {
// User Management modules
| list{"users", "invite-users"} =>
<AccessControl permission={userHasAccess(~permission=UsersManage)}>
<AccessControl permission={userHasAccess(~groupACL=UsersManage)}>
<InviteMember />
</AccessControl>
| list{"users", "create-custom-role"} =>
<AccessControl permission={userHasAccess(~permission=UsersManage)}>
<AccessControl permission={userHasAccess(~groupACL=UsersManage)}>
<CreateCustomRole baseUrl="users" breadCrumbHeader="Team management" />
</AccessControl>
| list{"users", ...remainingPath} =>
<AccessControl permission={userHasAccess(~permission=UsersView)}>
<AccessControl permission={userHasAccess(~groupACL=UsersView)}>
<EntityScaffold
entityName="UserManagement"
remainingPath
Expand Down
Loading

0 comments on commit 9197117

Please sign in to comment.