Merge branch 'main' into feat/paypal-onboarding-1

juspay · Dec 20, 2023 · 4689583 · 4689583
2 parents ccb8c93 + af13892
commit 4689583
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 31 deletions.
diff --git a/src/screens/HyperSwitch/APIUtils/APIUtils.res b/src/screens/HyperSwitch/APIUtils/APIUtils.res
@@ -234,7 +234,7 @@ let getURL = (
 let sessionExpired = ref(false)
 
 let handleLogout = async (
-  ~fetchApi: (
+  ~fetchApi as _: (
     Js.String2.t,
     ~bodyStr: string=?,
     ~headers: Js.Dict.t<Js.String2.t>=?,
@@ -248,10 +248,12 @@ let handleLogout = async (
     unit,
   ) => Promise.t<Fetch.Response.t>,
   ~setAuthStatus,
+  ~setIsSidebarExpanded,
 ) => {
-  let logoutUrl = getURL(~entityName=USERS, ~methodType=Post, ~userType=#SIGNOUT, ())
-  let _ = await fetchApi(logoutUrl, ~method_=Fetch.Post, ())
+  // let logoutUrl = getURL(~entityName=USERS, ~methodType=Post, ~userType=#SIGNOUT, ())
+  // let _ = await fetchApi(logoutUrl, ~method_=Fetch.Post, ())
   setAuthStatus(HyperSwitchAuthTypes.LoggedOut)
+  setIsSidebarExpanded(_ => false)
   LocalStorage.clear()
   RescriptReactRouter.push("/register")
 }
@@ -376,6 +378,7 @@ let useGetMethod = (~showErrorToast=true, ()) => {
   let showToast = ToastState.useShowToast()
   let showPopUp = PopUpState.useShowPopUp()
   let (_authStatus, setAuthStatus) = React.useContext(AuthInfoProvider.authStatusContext)
+  let {setIsSidebarExpanded} = React.useContext(SidebarProvider.defaultContext)
   let isPlayground = HSLocalStorage.getIsPlaygroundFromLocalStorage()
   let url = RescriptReactRouter.useUrl()
   let urlPath = url.path->Belt.List.toArray->Js.Array2.joinWith("_")
@@ -393,7 +396,7 @@ let useGetMethod = (~showErrorToast=true, ()) => {
           _ => {
             hyperswitchMixPanel(~eventName=Some(`${urlPath}_tryplayground_register`), ())
             hyperswitchMixPanel(~eventName=Some(`global_tryplayground_register`), ())
-            let _ = handleLogout(~fetchApi, ~setAuthStatus)
+            let _ = handleLogout(~fetchApi, ~setAuthStatus, ~setIsSidebarExpanded)
           }
         },
       },
@@ -440,6 +443,7 @@ let useUpdateMethod = (~showErrorToast=true, ()) => {
   let isPlayground = HSLocalStorage.getIsPlaygroundFromLocalStorage()
   let url = RescriptReactRouter.useUrl()
   let urlPath = url.path->Belt.List.toArray->Js.Array2.joinWith("_")
+  let {setIsSidebarExpanded} = React.useContext(SidebarProvider.defaultContext)
 
   let popUpCallBack = () =>
     showPopUp({
@@ -454,7 +458,7 @@ let useUpdateMethod = (~showErrorToast=true, ()) => {
           _ => {
             hyperswitchMixPanel(~eventName=Some(`${urlPath}_tryplayground_register`), ())
             hyperswitchMixPanel(~eventName=Some(`global_tryplayground_register`), ())
-            let _ = handleLogout(~fetchApi, ~setAuthStatus)
+            let _ = handleLogout(~fetchApi, ~setAuthStatus, ~setIsSidebarExpanded)
           }
         },
       },

diff --git a/src/screens/HyperSwitch/Home/HomeUtils.res b/src/screens/HyperSwitch/Home/HomeUtils.res
@@ -169,6 +169,7 @@ module CheckoutCard = {
     let showPopUp = PopUpState.useShowPopUp()
     let hyperswitchMixPanel = HSMixPanel.useSendEvent()
     let (_authStatus, setAuthStatus) = React.useContext(AuthInfoProvider.authStatusContext)
+    let {setIsSidebarExpanded} = React.useContext(SidebarProvider.defaultContext)
     let isPlayground = HSLocalStorage.getIsPlaygroundFromLocalStorage()
     let isConfigureConnector = ListHooks.useListCount(~entityName=CONNECTOR) > 0
     let urlPath = url.path->Belt.List.toArray->Js.Array2.joinWith("_")
@@ -187,7 +188,7 @@ module CheckoutCard = {
               _ => {
                 hyperswitchMixPanel(~eventName=Some(`${urlPath}_tryplayground_register`), ())
                 hyperswitchMixPanel(~eventName=Some(`global_tryplayground_register`), ())
-                let _ = APIUtils.handleLogout(~fetchApi, ~setAuthStatus)
+                let _ = APIUtils.handleLogout(~fetchApi, ~setAuthStatus, ~setIsSidebarExpanded)
               }
             },
           },

diff --git a/src/screens/HyperSwitch/RoutingRevamp/AdvancedRoutingUIUtils.res b/src/screens/HyperSwitch/RoutingRevamp/AdvancedRoutingUIUtils.res
@@ -283,11 +283,40 @@ let metaInput = (id, keyType) =>
 
 module FieldInp = {
   @react.component
-  let make = (~ops, ~prefix, ~onChangeMethod) => {
+  let make = (~methodKeys, ~prefix, ~onChangeMethod) => {
     let field = ReactFinalForm.useField(`${prefix}.lhs`).input
     let op = ReactFinalForm.useField(`${prefix}.comparison`).input
     let val = ReactFinalForm.useField(`${prefix}.value.value`).input
 
+    let convertedValue = React.useMemo0(() => {
+      let keyDescriptionMapper = Window.getDescriptionCategory()->MapTypes.changeType
+      keyDescriptionMapper->LogicUtils.convertMapObjectToDict
+    })
+
+    let options = React.useMemo0(() =>
+      convertedValue->Js.Dict.keys->Js.Array2.reduce((acc, ele) => {
+        open LogicUtils
+        convertedValue
+        ->getArrayFromDict(ele, [])
+        ->Js.Array2.forEach(
+          value => {
+            let dictValue = value->LogicUtils.getDictFromJsonObject
+            let kindValue = dictValue->getString("kind", "")
+            if methodKeys->Js.Array2.includes(kindValue) {
+              let generatedSelectBoxOptionType: SelectBox.dropdownOption = {
+                label: kindValue,
+                value: kindValue,
+                description: dictValue->getString("description", ""),
+                optGroup: ele,
+              }
+              acc->Js.Array2.push(generatedSelectBoxOptionType)->ignore
+            }
+          },
+        )
+        acc
+      }, [])
+    )
+
     let input: ReactFinalForm.fieldRenderPropsInput = {
       name: "string",
       onBlur: _ev => (),
@@ -303,10 +332,6 @@ module FieldInp = {
       checked: true,
     }
 
-    let options = ops->Js.Array2.map((op): SelectBox.dropdownOption => {
-      {value: op, label: op}
-    })
-
     <SelectBox.BaseDropdown
       allowMultiSelect=false buttonText="Select Field" input options hideMultiSelectButtons=true
     />
@@ -358,7 +383,7 @@ module RuleFieldBase = {
           </UIUtils.RenderIf>
           <div className="-mt-5 p-1">
             <FieldWrapper label="">
-              <FieldInp ops=methodKeys prefix=id onChangeMethod />
+              <FieldInp methodKeys prefix=id onChangeMethod />
             </FieldWrapper>
           </div>
           <div className="-mt-5">

diff --git a/src/screens/HyperSwitch/Sidebar/Sidebar.res b/src/screens/HyperSwitch/Sidebar/Sidebar.res
@@ -524,25 +524,8 @@ let make = (
 
   let transformClass = "transform md:translate-x-0 transition"
 
-  let handleLogout = _ev => {
-    open Promise
-    fetchApi(
-      APIUtils.getURL(~entityName=USERS, ~methodType=Post, ~userType=#SIGNOUT, ()),
-      ~bodyStr=Js.Json.stringify(Js.Json.object_(Js.Dict.empty())),
-      ~method_=Fetch.Post,
-      (),
-    )
-    ->then(Fetch.Response.text)
-    ->then(_ => {
-      setIsSidebarExpanded(_ => false)
-      LocalStorage.clear()
-      setAuthStatus(LoggedOut)
-      resolve()
-    })
-    ->catch(_err => {
-      resolve()
-    })
-    ->ignore
+  let handleLogout = _ => {
+    let _ = APIUtils.handleLogout(~fetchApi, ~setAuthStatus, ~setIsSidebarExpanded)
   }
 
   <div className={`bg-sidebar-blue flex group border-r border-jp-gray-500 relative`}>