Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ branding=false
mixpanel=false
test_live_toggle=false
is_live_mode=false
feedback=false
x_feature_route=false
compliance_certificate=false
force_cookies=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
let mixpanelEvent = MixpanelHook.useSendEvent()
let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
let {showFeedbackModal, setShowFeedbackModal, setShowSideBar} = React.useContext(
GlobalProvider.defaultContext,
)
let {setShowSideBar} = React.useContext(GlobalProvider.defaultContext)
let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
let (configuredConnectors, setConfiguredConnectors) = React.useState(_ => [])
let (previouslyConnectedData, setPreviouslyConnectedData) = React.useState(_ => [])
Expand Down Expand Up @@ -115,14 +113,6 @@
</div>
</RenderIf>
<div className="flex flex-col gap-14">
<RenderIf condition={showFeedbackModal}>
<HSwitchFeedBackModal
showModal={showFeedbackModal}
setShowModal={setShowFeedbackModal}
modalHeading="Tell us about your integration experience"
feedbackVia="connected_a_connector"
/>
</RenderIf>
<RenderIf condition={configuredConnectors->Array.length > 0}>
<LoadedTable
title="Connected Processors"
Expand All @@ -145,7 +135,7 @@
~authorization=userHasAccess(~groupAccess=ConnectorsManage),
~sendMixpanelEvent,
)}
currrentFetchCount={filteredConnectorData->Array.length}

Check warning on line 138 in src/OrchestrationV2/OrchestrationV2Screens/Connectors/PaymentConnectors.res

View workflow job for this annotation

GitHub Actions / Spell check

"currrent" should be "current".
collapseTableRow=false
showAutoScroll=true
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@ let p1MediumTextStyle = HSwitchUtils.getTextClass((P1, Medium))

module RequestConnector = {
@react.component
let make = (~connectorList, ~setShowModal) => {
let mixpanelEvent = MixpanelHook.useSendEvent()

let handleClick = () => {
mixpanelEvent(~eventName="orchestration_v2_request_processor")
setShowModal(_ => true)
}
let make = (~connectorList) => {
<RenderIf condition={connectorList->Array.length === 0}>
<div
className="flex flex-col gap-6 items-center justify-center w-full bg-white rounded-lg border p-8">
Expand All @@ -18,42 +12,11 @@ module RequestConnector = {
<p className="jp-grey-700 opacity-50">
{"Uh-oh! Looks like we couldn't find the processor you were searching for."->React.string}
</p>
<Button text={"Request a processor"} buttonType=Primary onClick={_ => handleClick()} />
</div>
</RenderIf>
}
}

module CantFindProcessor = {
@react.component
let make = (~showRequestConnectorBtn, ~setShowModal) => {
let {userHasAccess, hasAnyGroupAccess} = GroupACLHooks.useUserGroupACLHook()

<RenderIf condition={showRequestConnectorBtn}>
<ACLButton
// TODO: Remove `MerchantDetailsManage` permission in future
authorization={hasAnyGroupAccess(
userHasAccess(~groupAccess=MerchantDetailsManage),
userHasAccess(~groupAccess=AccountManage),
)}
text="Request a Processor"
buttonType={NonFilled}
buttonSize={Large}
textStyle="text-nd_gray-600 font-semibold !py-2.5 pr-4 pl-2"
onClick={_ => setShowModal(_ => true)}
leftIcon={CustomIcon(
<Icon
name="nd-plus"
size=16
className="text-nd_gray-600 fill-opacity-50 dark:jp-gray-text_darktheme"
/>,
)}
customIconMargin="ml-4"
/>
</RenderIf>
}
}

@react.component
let make = (
~connectorsAvailableForIntegration: array<ConnectorTypes.connectorTypes>,
Expand All @@ -72,7 +35,6 @@ let make = (
let {setShowSideBar} = React.useContext(GlobalProvider.defaultContext)
let searchRef = React.useRef(Nullable.null)
let (searchedConnector, setSearchedConnector) = React.useState(_ => "")
let (showModal, setShowModal) = React.useState(_ => false)

let unConfiguredConnectors =
connectorsAvailableForIntegration->Array.filter(total =>
Expand All @@ -95,7 +57,6 @@ let make = (
let descriptedConnectors = (
connectorList: array<ConnectorTypes.connectorTypes>,
~heading: string,
~showRequestConnectorBtn,
~showSearch=true,
~showDummyConnectorButton=false,
(),
Expand Down Expand Up @@ -147,7 +108,6 @@ let make = (
onClick={_ => setProcessorModal(_ => true)}
/>
</RenderIf>
<CantFindProcessor showRequestConnectorBtn setShowModal />
</div>
</div>
<div className={`grid gap-x-5 gap-y-6 ${customStyleClass} md:grid-cols-2 grid-cols-1 mb-5`}>
Expand Down Expand Up @@ -196,27 +156,15 @@ let make = (
<div className="flex flex-col gap-4">
{connectorListFiltered->descriptedConnectors(
~heading="Connect a new processor",
~showRequestConnectorBtn=true,
~showDummyConnectorButton=true,
(),
)}
</div>
</RenderIf>
<RenderIf condition={showModal}>
<HSwitchFeedBackModal
modalHeading="Request a processor" setShowModal showModal modalType={RequestConnectorModal}
/>
</RenderIf>
<RenderIf condition={showTestProcessor}>
{showTestProcessor
->dummyConnectorList
->descriptedConnectors(
~heading="",
~showRequestConnectorBtn=false,
~showSearch=false,
~showDummyConnectorButton=false,
(),
)}
->descriptedConnectors(~heading="", ~showSearch=false, ~showDummyConnectorButton=false, ())}
</RenderIf>
</RenderIf>
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ let p1MediumTextStyle = HSwitchUtils.getTextClass((P1, Medium))

module RequestConnector = {
@react.component
let make = (~connectorList, ~setShowModal) => {
let make = (~connectorList) => {
<RenderIf condition={connectorList->Array.length === 0}>
<div
className="flex flex-col gap-6 items-center justify-center w-full bg-white rounded-lg border p-8">
Expand All @@ -12,23 +12,6 @@ module RequestConnector = {
<p className="jp-grey-700 opacity-50">
{"Uh-oh! Looks like we couldn't find the processor you were searching for."->React.string}
</p>
<Button
text={"Request a processor"} buttonType=Primary onClick={_ => setShowModal(_ => true)}
/>
</div>
</RenderIf>
}
}

module CantFindProcessor = {
@react.component
let make = (~showRequestConnectorBtn, ~setShowModal) => {
<RenderIf condition={showRequestConnectorBtn}>
<div
className="flex flex-row items-center gap-2 text-primary cursor-pointer"
onClick={_ => setShowModal(_ => true)}>
<ToolTip />
{"Request a processor"->React.string}
</div>
</RenderIf>
}
Expand All @@ -55,7 +38,6 @@ let make = (
configuredConnectors->Array.find(item => item === total)->Option.isNone
)

let (showModal, setShowModal) = React.useState(_ => false)
let (searchedConnector, setSearchedConnector) = React.useState(_ => "")
let searchRef = React.useRef(Nullable.null)

Expand All @@ -81,7 +63,6 @@ let make = (
let descriptedConnectors = (
connectorList: array<ConnectorTypes.connectorTypes>,
~heading: string,
~showRequestConnectorBtn,
~showSearch=true,
~showDummyConnectorButton=false,
(),
Expand Down Expand Up @@ -135,7 +116,6 @@ let make = (
onClick={_ => setProcessorModal(_ => true)}
/>
</RenderIf>
<CantFindProcessor showRequestConnectorBtn setShowModal />
</div>
<RenderIf condition={connectorList->Array.length > 0}>
<div
Expand Down Expand Up @@ -167,7 +147,7 @@ let make = (
->React.array}
</div>
</RenderIf>
<RequestConnector connectorList setShowModal />
<RequestConnector connectorList />
</>
}

Expand All @@ -186,30 +166,15 @@ let make = (
<div className="flex flex-col gap-4">
{connectorListFiltered->descriptedConnectors(
~heading="Connect a new processor",
~showRequestConnectorBtn=true,
~showDummyConnectorButton=false,
(),
)}
</div>
<RenderIf condition={showModal}>
<HSwitchFeedBackModal
modalHeading="Request a processor"
setShowModal
showModal
modalType={RequestConnectorModal}
/>
</RenderIf>
</RenderIf>
<RenderIf condition={showTestProcessor}>
{showTestProcessor
->dummyConnectorList
->descriptedConnectors(
~heading="",
~showRequestConnectorBtn=false,
~showSearch=false,
~showDummyConnectorButton=false,
(),
)}
->descriptedConnectors(~heading="", ~showSearch=false, ~showDummyConnectorButton=false, ())}
</RenderIf>
</RenderIf>
</div>
Expand Down
94 changes: 0 additions & 94 deletions src/components/HSwitchFeedBackModal.res

This file was deleted.

Loading
Loading