Merge branch 'main' into multiconnectorapicall

juspay · Jan 20, 2025 · def361c · def361c
2 parents f2352c6 + 4cf2c50
commit def361c
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 27 deletions.
diff --git a/src/components/Graphs/BarGraph/BarGraph.res b/src/components/Graphs/BarGraph/BarGraph.res
@@ -1,4 +1,5 @@
 external barGraphOptionsToJson: BarGraphTypes.barGraphOptions => JSON.t = "%identity"
+
 @react.component
 let make = (~options: BarGraphTypes.barGraphOptions, ~className="") => {
   <div className>

diff --git a/src/components/Graphs/LineGraph/LineGraph.res b/src/components/Graphs/LineGraph/LineGraph.res
@@ -1,11 +1,10 @@
 external lineGraphOptionsToJson: LineGraphTypes.lineGraphOptions => JSON.t = "%identity"
 
 @react.component
-let make = (~entity, ~data: LineGraphTypes.lineGraphPayload, ~className="") => {
-  open NewAnalyticsTypes
-  let options = data->entity.getChatOptions->lineGraphOptionsToJson
-
+let make = (~options: LineGraphTypes.lineGraphOptions, ~className="") => {
   <div className>
-    <Highcharts.Chart options highcharts={Highcharts.highcharts} />
+    <Highcharts.Chart
+      options={options->lineGraphOptionsToJson} highcharts={Highcharts.highcharts}
+    />
   </div>
 }
diff --git a/src/components/Graphs/SankyGraph/SankeyGraph.res b/src/components/Graphs/SankyGraph/SankeyGraph.res
@@ -1,12 +1,12 @@
 external sankeyGraphOptionsToJson: SankeyGraphTypes.sankeyGraphOptions => JSON.t = "%identity"
 
 @react.component
-let make = (~entity, ~data: SankeyGraphTypes.sankeyPayload) => {
-  open NewAnalyticsTypes
+let make = (~options: SankeyGraphTypes.sankeyGraphOptions, ~className="") => {
   Highcharts.sankeyChartModule(Highcharts.highchartsModule)
-  let options = entity.getChatOptions(data)
 
-  <Highcharts.Chart
-    options={options->sankeyGraphOptionsToJson} highcharts={Highcharts.highcharts}
-  />
+  <div className>
+    <Highcharts.Chart
+      options={options->sankeyGraphOptionsToJson} highcharts={Highcharts.highcharts}
+    />
+  </div>
 }
diff --git a/src/screens/NewAnalytics/NewRefundsAnalytics/RefundsProcessed/RefundsProcessed.res b/src/screens/NewAnalytics/NewRefundsAnalytics/RefundsProcessed/RefundsProcessed.res
@@ -270,6 +270,9 @@ let make = (
     comparison,
     currency,
   }
+
+  let options = chartEntity.getObjects(~params)->chartEntity.getChatOptions
+
   <div>
     <ModuleHeader title={entity.title} />
     <Card>
@@ -287,10 +290,7 @@ let make = (
         />
         <div className="mb-5">
           {switch viewType {
-          | Graph =>
-            <LineGraph
-              entity={chartEntity} data={chartEntity.getObjects(~params)} className="mr-3"
-            />
+          | Graph => <LineGraph options className="mr-3" />
           | Table => <TableModule data={refundsProcessedTableData} className="mx-7" />
           }}
         </div>

diff --git a/src/screens/NewAnalytics/NewRefundsAnalytics/RefundsSuccessRate/RefundsSuccessRate.res b/src/screens/NewAnalytics/NewRefundsAnalytics/RefundsSuccessRate/RefundsSuccessRate.res
@@ -167,6 +167,8 @@ let make = (
     comparison,
   }
 
+  let options = chartEntity.getObjects(~params)->chartEntity.getChatOptions
+
   <div>
     <ModuleHeader title={entity.title} />
     <Card>
@@ -179,7 +181,7 @@ let make = (
           setGranularity
         />
         <div className="mb-5">
-          <LineGraph entity={chartEntity} data={chartEntity.getObjects(~params)} className="mr-3" />
+          <LineGraph options className="mr-3" />
         </div>
       </PageLoaderWrapper>
     </Card>

diff --git a/src/screens/NewAnalytics/PaymentAnalytics/PaymentsLifeCycle/PaymentsLifeCycle.res b/src/screens/NewAnalytics/PaymentAnalytics/PaymentsLifeCycle/PaymentsLifeCycle.res
@@ -65,13 +65,15 @@ let make = (
     yKey: "",
   }
 
+  let options = chartEntity.getChatOptions(chartEntity.getObjects(~params))
+
   <div>
     <ModuleHeader title={entity.title} />
     <Card>
       <PageLoaderWrapper
         screenState customLoader={<Shimmer layoutId=entity.title />} customUI={<NoData />}>
-        <div className="mr-3 my-10">
-          <SankeyGraph entity={chartEntity} data={chartEntity.getObjects(~params)} />
+        <div className="my-10">
+          <SankeyGraph options={options} className="mr-3" />
         </div>
       </PageLoaderWrapper>
     </Card>

diff --git a/src/screens/NewAnalytics/PaymentAnalytics/PaymentsProcessed/PaymentsProcessed.res b/src/screens/NewAnalytics/PaymentAnalytics/PaymentsProcessed/PaymentsProcessed.res
@@ -291,6 +291,9 @@ let make = (
     comparison,
     currency,
   }
+
+  let options = chartEntity.getObjects(~params)->chartEntity.getChatOptions
+
   <div>
     <ModuleHeader title={entity.title} />
     <Card>
@@ -308,10 +311,7 @@ let make = (
         />
         <div className="mb-5">
           {switch viewType {
-          | Graph =>
-            <LineGraph
-              entity={chartEntity} data={chartEntity.getObjects(~params)} className="mr-3"
-            />
+          | Graph => <LineGraph options className="mr-3" />
           | Table => <TableModule data={paymentsProcessedTableData} className="mx-7" />
           }}
         </div>

diff --git a/src/screens/NewAnalytics/PaymentAnalytics/PaymentsSuccessRate/PaymentsSuccessRate.res b/src/screens/NewAnalytics/PaymentAnalytics/PaymentsSuccessRate/PaymentsSuccessRate.res
@@ -195,12 +195,16 @@ let make = (
     mockDelay()->ignore
     None
   }, [isSmartRetryEnabled])
+
   let params = {
     data: paymentsSuccessRateData,
     xKey: Payments_Success_Rate->getKeyForModule(~isSmartRetryEnabled),
     yKey: Time_Bucket->getStringFromVariant,
     comparison,
   }
+
+  let options = chartEntity.getObjects(~params)->chartEntity.getChatOptions
+
   <div>
     <ModuleHeader title={entity.title} />
     <Card>
@@ -213,7 +217,7 @@ let make = (
           setGranularity
         />
         <div className="mb-5">
-          <LineGraph entity={chartEntity} data={chartEntity.getObjects(~params)} className="mr-3" />
+          <LineGraph options className="mr-3" />
         </div>
       </PageLoaderWrapper>
     </Card>

diff --git a/...Analytics/SmartRetryAnalytics/SmartRetryPaymentsProcessed/SmartRetryPaymentsProcessed.res b/...Analytics/SmartRetryAnalytics/SmartRetryPaymentsProcessed/SmartRetryPaymentsProcessed.res
@@ -284,6 +284,8 @@ let make = (
     currency,
   }
 
+  let options = chartEntity.getObjects(~params)->chartEntity.getChatOptions
+
   <div>
     <ModuleHeader title={entity.title} />
     <Card>
@@ -300,10 +302,7 @@ let make = (
         />
         <div className="mb-5">
           {switch viewType {
-          | Graph =>
-            <LineGraph
-              entity={chartEntity} data={chartEntity.getObjects(~params)} className="mr-3"
-            />
+          | Graph => <LineGraph options className="mr-3" />
           | Table => <TableModule data={smartRetryPaymentsProcessedTableData} className="mx-7" />
           }}
         </div>