chore: smart retry changes

src/components/DynamicSingleStat.res

@@ -115,7 +115,6 @@ let make = (
   ~startTimeFilterKey,
   ~endTimeFilterKey,
   ~moduleName="",
-  ~setTotalVolume,
   ~showPercentage=true,
   ~chartAlignment=#column,
   ~isHomePage=false,
@@ -304,37 +303,6 @@ let make = (
         let data = dataArr->Array.map(
           item => {
             let (sectionName, json) = item
-            switch entity.totalVolumeCol {
-            | Some(val) => {
-                let totalVolumeKeyVal =
-                  json
-                  ->LogicUtils.getDictFromJsonObject
-                  ->LogicUtils.getJsonObjectFromDict("queryData")
-                  ->LogicUtils.getArrayFromJson([])
-                  ->Belt.Array.get(0)
-                  ->Option.getWithDefault(Js.Json.object_(Dict.make()))
-                  ->LogicUtils.getDictFromJsonObject
-                  ->Dict.toArray
-                  ->Array.find(
-                    item => {
-                      let (key, _) = item
-                      key === val
-                    },
-                  )
-                switch totalVolumeKeyVal {
-                | Some(data) => {
-                    let (_key, value) = data
-                    setTotalVolume(
-                      _ => value->Js.Json.decodeNumber->Option.getWithDefault(0.)->Belt.Float.toInt,
-                    )
-                  }
-
-                | None => ()
-                }
-              }
-
-            | None => ()
-            }
             let data = entity.getObjects(json)
             let deltaTime = deltaItemToObjMapper(json)
 

src/entryPoints/hyperswitch/HyperSwitchApp.res

@@ -322,6 +322,9 @@ let make = () => {
                           <FilterContext key="PaymentsAnalytics" index="PaymentsAnalytics">
                             <PaymentAnalytics />
                           </FilterContext>
+                          <FilterContext key="SmartRetriesAnalytics" index="SmartRetriesAnalytics">
+                            <SmartRetriesAnalytics />
+                          </FilterContext>
                         </AccessControl>
                       | list{"analytics-refunds"} =>
                         <AccessControl permission=userPermissionJson.analytics>

src/screens/HyperSwitch/Analytics/Analytics.res

@@ -516,8 +516,6 @@ let make = (
   let {filterValue, updateExistingKeys, filterValueJson} = React.useContext(
     FilterContext.filterContext,
   )
-
-  let (_totalVolume, setTotalVolume) = React.useState(_ => 0)
   let defaultFilters = [startTimeFilterKey, endTimeFilterKey]
   let (filteredTabKeys, filteredTabVales) = (tabKeys, tabValues)
   let chartEntity1 = chartEntity.default // User Journey - SemiDonut (Payment Metrics), Others - Default Chart Entity
@@ -720,7 +718,6 @@ let make = (
               endTimeFilterKey
               filterKeys=chartEntity.allFilterDimension
               moduleName
-              setTotalVolume
               showPercentage=false
               statSentiment={singleStatEntity.statSentiment->Option.getWithDefault(Dict.make())}
             />

src/screens/HyperSwitch/Analytics/AnalyticsTypes.res

@@ -151,12 +151,22 @@ let allPaymentColumns = [
   PaymentErrorMessage,
   AvgTicketSize,
 ]
+
+type smartRetrySingleState = {
+  retries_count: int,
+  retries_amount_processe: float,
+}
+
+type smartRetrySingleStateSeries = {
+  retries_count: int,
+  retries_amount_processe: float,
+  time_series: string,
+}
+
 type paymentsSingleState = {
   payment_success_rate: float,
   payment_count: int,
   payment_success_count: int,
-  retries_count: int,
-  retries_amount_processe: float,
   connector_success_rate: float,
   payment_processed_amount: float,
   payment_avg_ticket_size: float,
@@ -165,8 +175,6 @@ type paymentsSingleState = {
 type paymentsSingleStateSeries = {
   payment_success_rate: float,
   payment_count: int,
-  retries_count: int,
-  retries_amount_processe: float,
   connector_success_rate: float,
   payment_success_count: int,
   time_series: string,
@@ -215,3 +223,5 @@ type nestedEntityType = {
   userBarChart?: DynamicChart.entity,
   userFunnelChart?: DynamicChart.entity,
 }
+
+type analyticsAPIEndPoints = [#PAYMENTS | #REFUNDS | #API_EVENTS | #SDK_EVENTS]

src/screens/HyperSwitch/Analytics/HomePageOverview/HomePageOverviewComponent.res

@@ -89,8 +89,6 @@ module SystemMetricsInsights = {
   open AnalyticsTypes
   @react.component
   let make = () => {
-    let (_totalVolume, setTotalVolume) = React.useState(_ => 0)
-
     let getStatData = (
       singleStatData: systemMetricsObjectType,
       timeSeriesData: array<systemMetricsSingleStateSeries>,
@@ -186,7 +184,6 @@ module SystemMetricsInsights = {
       moduleName="SystemMetrics"
       defaultStartDate={dateDict.start_time}
       defaultEndDate={dateDict.end_time}
-      setTotalVolume
       showPercentage=false
       isHomePage=true
       wrapperClass="flex flex-wrap w-full h-full"

src/screens/HyperSwitch/Analytics/HomePageOverview/PaymentsOverview/PaymentOverview.res

@@ -1,7 +1,6 @@
 @react.component
 let make = () => {
   open HSAnalyticsUtils
-  let (_totalVolume, setTotalVolume) = React.useState(_ => 0)
 
   let metrics = [
     "payment_success_rate",
@@ -22,7 +21,6 @@ let make = () => {
     moduleName="Payments"
     defaultStartDate={dateDict.start_time}
     defaultEndDate={dateDict.end_time}
-    setTotalVolume
     showPercentage=false
     isHomePage=true
     statSentiment={singleStatEntity.statSentiment->Option.getWithDefault(Dict.make())}

src/screens/HyperSwitch/Analytics/PaymentsAnalytics/PaymentAnalytics.res

@@ -15,7 +15,16 @@ let make = () => {
     try {
       let infoUrl = getURL(~entityName=ANALYTICS_PAYMENTS, ~methodType=Get, ~id=Some(domain), ())
       let infoDetails = await fetchDetails(infoUrl)
-      setMetrics(_ => infoDetails->getDictFromJsonObject->getArrayFromDict("metrics", []))
+      let metrics =
+        infoDetails
+        ->getDictFromJsonObject
+        ->getArrayFromDict("metrics", [])
+        ->Array.filter(item => {
+          let dict = item->getDictFromJsonObject
+          dict->Dict.get("name")->Belt.Option.getWithDefault(""->Js.Json.string) !==
+            "retries_count"->Js.Json.string
+        })
+      setMetrics(_ => metrics)
       setDimensions(_ => infoDetails->getDictFromJsonObject->getArrayFromDict("dimensions", []))
       setScreenState(_ => PageLoaderWrapper.Success)
     } catch {

src/screens/HyperSwitch/Analytics/PaymentsAnalytics/PaymentAnalyticsEntity.res

@@ -5,7 +5,8 @@ open DynamicSingleStat
 
 open HSAnalyticsUtils
 open AnalyticsTypes
-let domain = "payments"
+let apiPath: analyticsAPIEndPoints = #PAYMENTS
+let domain = (apiPath :> string)->String.toLowerCase
 let makeMultiInputFieldInfo = FormRenderer.makeMultiInputFieldInfo
 let makeInputFieldInfo = FormRenderer.makeInputFieldInfo
 
@@ -239,8 +240,6 @@ let paymentTableEntity = EntityType.makeEntity(
 let singleStateInitialValue = {
   payment_success_rate: 0.0,
   payment_count: 0,
-  retries_count: 0,
-  retries_amount_processe: 0.0,
   payment_success_count: 0,
   connector_success_rate: 0.0,
   payment_processed_amount: 0.0,
@@ -250,8 +249,6 @@ let singleStateInitialValue = {
 let singleStateSeriesInitialValue = {
   payment_success_rate: 0.0,
   payment_count: 0,
-  retries_count: 0,
-  retries_amount_processe: 0.0,
   payment_success_count: 0,
   time_series: "",
   payment_processed_amount: 0.0,
@@ -269,8 +266,6 @@ let singleStateItemToObjMapper = json => {
     payment_success_count: dict->getInt("payment_success_count", 0),
     payment_processed_amount: dict->getFloat("payment_processed_amount", 0.0),
     payment_avg_ticket_size: dict->getFloat("avg_ticket_size", 0.0),
-    retries_count: dict->getInt("retries_count", 0),
-    retries_amount_processe: dict->getFloat("retries_amount_processed", 0.0),
     connector_success_rate: dict->getFloat("connector_success_rate", 0.0),
   })
   ->Option.getWithDefault({
@@ -289,8 +284,6 @@ let singleStateSeriesItemToObjMapper = json => {
     time_series: dict->getString("time_bucket", ""),
     payment_processed_amount: dict->getFloat("payment_processed_amount", 0.0)->setPrecision(),
     payment_avg_ticket_size: dict->getFloat("avg_ticket_size", 0.0)->setPrecision(),
-    retries_count: dict->getInt("retries_count", 0),
-    retries_amount_processe: dict->getFloat("retries_amount_processed", 0.0),
     connector_success_rate: dict->getFloat("connector_success_rate", 0.0),
   })
   ->getWithDefault({
@@ -323,25 +316,8 @@ let getColumns: bool => array<DynamicSingleStat.columns<colT>> = connector_succe
   {
     sectionName: "",
     columns: connector_success_rate
-      ? [
-          SuccessRate,
-          Count,
-          SuccessCount,
-          ProcessedAmount,
-          AvgTicketSize,
-          RetriesCount,
-          RetriesAmountProcessed,
-          ConnectorSuccessRate,
-        ]
-      : [
-          SuccessRate,
-          Count,
-          SuccessCount,
-          ProcessedAmount,
-          AvgTicketSize,
-          RetriesCount,
-          RetriesAmountProcessed,
-        ],
+      ? [SuccessRate, Count, SuccessCount, ProcessedAmount, AvgTicketSize, ConnectorSuccessRate]
+      : [SuccessRate, Count, SuccessCount, ProcessedAmount, AvgTicketSize],
   },
 ]
 
@@ -394,17 +370,6 @@ let constructData = (
       ob.payment_avg_ticket_size /. 100.00,
     ))
     ->Js.Array2.sortInPlaceWith(compareLogic)
-  | "retries_count" =>
-    singlestatTimeseriesData->Array.map(ob => (
-      ob.time_series->DateTimeUtils.parseAsFloat,
-      ob.retries_count->Belt.Int.toFloat,
-    ))
-  | "retries_amount_processed" =>
-    singlestatTimeseriesData
-    ->Array.map(ob => (
-      ob.time_series->DateTimeUtils.parseAsFloat,
-      ob.retries_amount_processe /. 100.00,
-    ))
     ->Js.Array2.sortInPlaceWith(compareLogic)
   | "connector_success_rate" =>
     singlestatTimeseriesData
@@ -512,42 +477,8 @@ let getStatData = (
       statType: "Volume",
       showDelta: false,
     }
-  | RetriesCount => {
-      title: "Smart Retries made",
-      tooltipText: "Total number of retries that were attempted after a failed payment attempt (Note: Only date range filters are supoorted currently)",
-      deltaTooltipComponent: AnalyticsUtils.singlestatDeltaTooltipFormat(
-        singleStatData.retries_count->Belt.Int.toFloat,
-        deltaTimestampData.currentSr,
-      ),
-      value: singleStatData.retries_count->Belt.Int.toFloat,
-      delta: {
-        singleStatData.retries_count->Belt.Int.toFloat
-      },
-      data: constructData("retries_count", timeSeriesData),
-      statType: "Volume",
-      showDelta: false,
-    }
-  | RetriesAmountProcessed => {
-      title: `Smart Retries Savings`,
-      tooltipText: "Total savings in amount terms from retrying failed payments again through a second processor (Note: Only date range filters are supoorted currently)",
-      deltaTooltipComponent: AnalyticsUtils.singlestatDeltaTooltipFormat(
-        singleStatData.retries_amount_processe /. 100.00,
-        deltaTimestampData.currentSr,
-      ),
-      value: singleStatData.retries_amount_processe /. 100.00,
-      delta: {
-        Js.Float.fromString(
-          Js.Float.toFixedWithPrecision(
-            singleStatData.retries_amount_processe /. 100.00,
-            ~digits=2,
-          ),
-        )
-      },
-      data: constructData("retries_amount_processe", timeSeriesData),
-      statType: "Amount",
-      showDelta: false,
-    }
-  | ConnectorSuccessRate => {
+
+  | ConnectorSuccessRate | _ => {
       title: "Payment Success Rate",
       tooltipText: "Total successful payments processed out of all user confirmed payments",
       deltaTooltipComponent: AnalyticsUtils.singlestatDeltaTooltipFormat(

src/screens/HyperSwitch/Analytics/PaymentsAnalytics/SmartRetries/SmartRetriesAnalytics.res

@@ -0,0 +1,77 @@
+module SmartRetries = {
+  @react.component
+  let make = (
+    ~pageTitle="",
+    ~startTimeFilterKey: string,
+    ~endTimeFilterKey: string,
+    ~tabKeys: array<string>,
+    ~initialFixedFilters: Js.Json.t => array<EntityType.initialFilters<'t>>,
+    ~singleStatEntity: DynamicSingleStat.entityType<'singleStatColType, 'b, 'b2>,
+    ~moduleName: string,
+  ) => {
+    let {updateExistingKeys, filterValueJson} = React.useContext(FilterContext.filterContext)
+    let defaultFilters = [startTimeFilterKey, endTimeFilterKey]
+
+    let setInitialFilters = HSwitchRemoteFilter.useSetInitialFilters(
+      ~updateExistingKeys,
+      ~startTimeFilterKey,
+      ~endTimeFilterKey,
+    )
+
+    React.useEffect0(() => {
+      setInitialFilters()
+      None
+    })
+
+    let headerTextStyle = HSwitchUtils.getTextClass(~textVariant=H1, ())
+
+    <UIUtils.RenderIf condition={filterValueJson->Js.Dict.entries->Array.length > 0}>
+      <div className="flex flex-col gap-0 mb-10">
+        <div className={`${headerTextStyle} pt-2`}> {pageTitle->React.string} </div>
+        <div className="mt-2 -ml-1">
+          <DynamicFilter
+            initialFilters=[]
+            options=[]
+            popupFilterFields=[]
+            initialFixedFilters={initialFixedFilters(Js.Json.object_(Dict.make()))}
+            defaultFilterKeys=defaultFilters
+            tabNames=tabKeys
+            updateUrlWith=updateExistingKeys //
+            key="1"
+            filtersDisplayOption=false
+            filterFieldsPortalName={HSAnalyticsUtils.filterFieldsPortalName}
+            showCustomFilter=false
+            refreshFilters=false
+          />
+        </div>
+        <DynamicSingleStat
+          entity=singleStatEntity
+          startTimeFilterKey
+          endTimeFilterKey
+          filterKeys=[]
+          moduleName
+          showPercentage=false
+          statSentiment={singleStatEntity.statSentiment->Belt.Option.getWithDefault(Dict.make())}
+        />
+      </div>
+    </UIUtils.RenderIf>
+  }
+}
+
+@react.component
+let make = () => {
+  open SmartRetriesAnalyticsEntity
+
+  let metrics = [[("name", "retries_count"->Js.Json.string)]->LogicUtils.getJsonFromArrayOfJson]
+
+  <SmartRetries
+    pageTitle="Smart Retries"
+    key="PaymentsAnalytics"
+    moduleName="Payments"
+    tabKeys=[]
+    singleStatEntity={getSingleStatEntity(metrics)}
+    startTimeFilterKey
+    endTimeFilterKey
+    initialFixedFilters=HSAnalyticsUtils.initialFixedFilterFields
+  />
+}