fix: added new feature flag for recon-v2

juspay · Jul 10, 2024 · df26eef · df26eef
1 parent 37f5228
commit df26eef
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 43 deletions.
diff --git a/config/config.toml b/config/config.toml
@@ -39,4 +39,5 @@ configure_pmts=false
 branding=false
 totp=false
 live_users_counter=false
-granularity=false
+granularity=false
+recon_v2=false
diff --git a/src/entryPoints/FeatureFlagUtils.res b/src/entryPoints/FeatureFlagUtils.res
@@ -28,6 +28,7 @@ type featureFlag = {
   totp: bool,
   liveUsersCounter: bool,
   granularity: bool,
+  reconV2: bool,
 }
 
 let featureFlagType = (featureFlags: JSON.t) => {
@@ -63,6 +64,7 @@ let featureFlagType = (featureFlags: JSON.t) => {
     totp: dict->getBool("totp", false),
     liveUsersCounter: dict->getBool("live_users_counter", false),
     granularity: dict->getBool("granularity", false),
+    reconV2: dict->getBool("recon_v2", false),
   }
   typedFeatureFlag
 }
diff --git a/src/entryPoints/HyperSwitchApp.res b/src/entryPoints/HyperSwitchApp.res
@@ -468,7 +468,7 @@ let make = () => {
                         | list{"reports"}
                         | list{"config-settings"}
                         | list{"file-processor"} =>
-                          <AccessControl isEnabled=featureFlagDetails.recon permission=Access>
+                          <AccessControl isEnabled=featureFlagDetails.reconV2 permission=Access>
                             <ReconModule urlList={url.path->urlPath} />
                           </AccessControl>
 

diff --git a/src/entryPoints/SidebarValues.res b/src/entryPoints/SidebarValues.res
@@ -466,7 +466,7 @@ let developers = (isDevelopersEnabled, userRole, systemMetrics, ~permissionJson)
     : emptyComponent
 }
 
-let uploadReconFiles = () => {
+let uploadReconFiles = {
   SubLevelLink({
     name: "Upload Recon Files",
     link: `/upload-files`,
@@ -475,7 +475,7 @@ let uploadReconFiles = () => {
   })
 }
 
-let runRecon = () => {
+let runRecon = {
   SubLevelLink({
     name: "Run Recon",
     link: `/run-recon`,
@@ -484,15 +484,15 @@ let runRecon = () => {
   })
 }
 
-let reconAnalytics = () => {
+let reconAnalytics = {
   SubLevelLink({
     name: "Analytics",
     link: `/recon-analytics`,
     access: Access,
     searchOptions: [("Recon analytics", "")],
   })
 }
-let reconReports = () => {
+let reconReports = {
   SubLevelLink({
     name: "Reports",
     link: `reports`,
@@ -501,15 +501,15 @@ let reconReports = () => {
   })
 }
 
-let reconConfigurator = () => {
+let reconConfigurator = {
   SubLevelLink({
     name: "Configurator",
     link: `config-settings`,
     access: Access,
     searchOptions: [("Recon configurator", "")],
   })
 }
-let reconFileProcessor = () => {
+let reconFileProcessor = {
   SubLevelLink({
     name: "File Processor",
     link: `file-processor`,
@@ -519,39 +519,32 @@ let reconFileProcessor = () => {
 }
 
 let reconTag = (recon, isReconEnabled) => {
-  let uploadReconFiles = uploadReconFiles()
-  let runRecon = runRecon()
-  let reconAnalytics = reconAnalytics()
-  let reconReports = reconReports()
-  let reconConfigurator = reconConfigurator()
-  let reconFileProcessor = reconFileProcessor()
-  // TODO: change later for everyone
-  let reconUrlPresent = Window.env.reconIframeUrl->Option.getOr("")->LogicUtils.isNonEmptyString
-
-  switch (recon, isReconEnabled, reconUrlPresent) {
-  | (true, true, true) =>
-    Section({
-      name: "Recon And Settlement",
-      icon: "recon",
-      showSection: true,
-      links: [
-        uploadReconFiles,
-        runRecon,
-        reconAnalytics,
-        reconReports,
-        reconConfigurator,
-        reconFileProcessor,
-      ],
-    })
-  | (true, _, _) =>
-    Link({
-      name: "Reconcilation",
-      icon: isReconEnabled ? "recon" : "recon-lock",
-      link: `/recon`,
-      access: Access,
-    })
-  | (_, _, _) => emptyComponent
-  }
+  recon
+    ? Link({
+        name: "Reconcilation",
+        icon: isReconEnabled ? "recon" : "recon-lock",
+        link: `/recon`,
+        access: Access,
+      })
+    : emptyComponent
+}
+
+let reconAndSettlement = (recon_v2, isReconEnabled) => {
+  recon_v2 && isReconEnabled
+    ? Section({
+        name: "Recon And Settlement",
+        icon: "recon",
+        showSection: true,
+        links: [
+          uploadReconFiles,
+          runRecon,
+          reconAnalytics,
+          reconReports,
+          reconConfigurator,
+          reconFileProcessor,
+        ],
+      })
+    : emptyComponent
 }
 
 let useGetSidebarValues = (~isReconEnabled: bool) => {
@@ -575,6 +568,7 @@ let useGetSidebarValues = (~isReconEnabled: bool) => {
     quickStart,
     disputeAnalytics,
     configurePmts,
+    reconV2,
   } = featureFlagDetails
 
   let sidebar = [
@@ -596,6 +590,7 @@ let useGetSidebarValues = (~isReconEnabled: bool) => {
     ),
     default->workflow(isSurchargeEnabled, ~permissionJson, ~isPayoutEnabled=payOut),
     recon->reconTag(isReconEnabled),
+    reconV2->reconAndSettlement(isReconEnabled),
     default->developers(userRole, systemMetrics, ~permissionJson),
     settings(
       ~isSampleDataEnabled=sampleData,

diff --git a/src/screens/Recon/ReconModule.res b/src/screens/Recon/ReconModule.res
@@ -5,7 +5,7 @@ let make = (~urlList) => {
 
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
-  let (redirectToken, setRedirecToken) = React.useState(_ => "")
+  let (redirectToken, setRedirectToken) = React.useState(_ => "")
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let (iframeLoaded, setIframeLoaded) = React.useState(_ => false)
   let iframeRef = React.useRef(Js.Nullable.null)
@@ -15,7 +15,7 @@ let make = (~urlList) => {
       let url = getURL(~entityName=RECON, ~reconType=#TOKEN, ~methodType=Get, ())
       let res = await fetchDetails(url)
       let token = res->LogicUtils.getDictFromJsonObject->LogicUtils.getString("token", "")
-      setRedirecToken(_ => token)
+      setRedirectToken(_ => token)
       setScreenState(_ => PageLoaderWrapper.Success)
     } catch {
     | _ => setScreenState(_ => PageLoaderWrapper.Error("Something went wrong!"))