Merge branch 'main' into recon-order-data-screen

CHANGELOG.md

@@ -3,6 +3,56 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 2025.01.20.1
+
+### Features
+
+- New analytics filters feature flag ([#2084](https://github.com/juspay/hyperswitch-control-center/pull/2084)) ([`b60da23`](https://github.com/juspay/hyperswitch-control-center/commit/b60da231df1ad01e073e9f2d6334e7a0724ab739))
+
+**Full Changelog:** [`2025.01.20.0...2025.01.20.1`](https://github.com/juspay/hyperswitch-control-center/compare/2025.01.20.0...2025.01.20.1)
+
+- - -
+
+## 2025.01.20.0
+
+### Features
+
+- Sidebar changes for modularity ([#2063](https://github.com/juspay/hyperswitch-control-center/pull/2063)) ([`5073b70`](https://github.com/juspay/hyperswitch-control-center/commit/5073b70bd0515f5ea0d78411845fd10b0142fee2))
+
+### Bug Fixes
+
+- Invitation error message ([#2076](https://github.com/juspay/hyperswitch-control-center/pull/2076)) ([`08cfdf9`](https://github.com/juspay/hyperswitch-control-center/commit/08cfdf9f5c43e9d6bdf436390e2de18e4fc275a3))
+
+### Refactors
+
+- Moved Graphs folder to components ([#2079](https://github.com/juspay/hyperswitch-control-center/pull/2079)) ([`6dda7ad`](https://github.com/juspay/hyperswitch-control-center/commit/6dda7ad09b17b1c3d2710f9732c485efaa8b3f56))
+
+### Miscellaneous Tasks
+
+- Change Bar graph component ([#2081](https://github.com/juspay/hyperswitch-control-center/pull/2081)) ([`280bb72`](https://github.com/juspay/hyperswitch-control-center/commit/280bb72fc88d2f53c0a90dd8923f877efa25e964))
+
+**Full Changelog:** [`2025.01.17.0...2025.01.20.0`](https://github.com/juspay/hyperswitch-control-center/compare/2025.01.17.0...2025.01.20.0)
+
+- - -
+
+## 2025.01.17.0
+
+### Features
+
+- Customer table pagination ([#2071](https://github.com/juspay/hyperswitch-control-center/pull/2071)) ([`4c84206`](https://github.com/juspay/hyperswitch-control-center/commit/4c842068bf9820c5ed1d4744163475f891639d1d))
+
+### Bug Fixes
+
+- Success toast in routing ([#2074](https://github.com/juspay/hyperswitch-control-center/pull/2074)) ([`af6bc6b`](https://github.com/juspay/hyperswitch-control-center/commit/af6bc6b0d8f64991677b1d3fad02fe37fd15d21f))
+
+### Refactors
+
+- Connector_type type added ([#2069](https://github.com/juspay/hyperswitch-control-center/pull/2069)) ([`80ba2f5`](https://github.com/juspay/hyperswitch-control-center/commit/80ba2f5bdebcad0171963723ff09267241d82841))
+
+**Full Changelog:** [`2025.01.16.0...2025.01.17.0`](https://github.com/juspay/hyperswitch-control-center/compare/2025.01.16.0...2025.01.17.0)
+
+- - -
+
 ## 2025.01.16.0
 
 ### Features

config/config.toml

@@ -47,6 +47,7 @@ performance_monitor=false
 new_analytics=false
 new_analytics_smart_retries=false
 new_analytics_refunds=false
+new_analytics_filters=false
 down_time=false
 dev_theme_feature=false
 tax_processor=true

public/hyperswitch/module.js

@@ -262,6 +262,8 @@ function appendStyle(themesConfig) {
   let cssVariables = `:root{
   /* Colors */
   ${generateVariablesForSection(settings.colors, "colors")}
+   /* sidebar */
+  ${generateVariablesForSection(settings.sidebar, "sidebar")}
   /* Typography */
   ${generateVariablesForSection(settings.typography, "base")}
  /* Buttons */

src/UIConifg/UIConfig.res

@@ -80,8 +80,13 @@ module BorderConfig = {
 }
 
 module SidebarConfig = {
-  type backgroundColor = {sidebarNormal: string}
-  type t = {backgroundColor: backgroundColor}
+  type backgroundColor = {sidebarNormal: string, sidebarSecondary: string}
+  type t = {
+    backgroundColor: backgroundColor,
+    primaryTextColor: string,
+    secondaryTextColor: string,
+    hoverColor: string,
+  }
 }
 
 type t = {
@@ -174,7 +179,11 @@ let defaultUIConfig: t = {
   secondaryColor: "bg-secondary",
   sidebarColor: {
     backgroundColor: {
-      sidebarNormal: "bg-sidebar",
+      sidebarNormal: "bg-sidebar-primary",
+      sidebarSecondary: "bg-sidebar-secondary md:bg-sidebar-secondary ",
     },
+    primaryTextColor: "text-sidebar-primaryTextColor",
+    secondaryTextColor: "text-sidebar-secondaryTextColor/80",
+    hoverColor: "hover:bg-sidebar-hoverColor/10",
   },
 }

src/components/CardTable.res

@@ -1,9 +1,11 @@
 module TextCard = {
   @react.component
   let make = (~text) => {
-    if String.length(String.trim(text)) > 0 {
+    if text->LogicUtils.isNonEmptyString {
       <p className="break-words font-semibold">
-        {React.string(String.length(String.trim(text)) > 0 ? text : "N/A")}
+        <HelperComponents.EllipsisText
+          endValue=10 displayValue={text->LogicUtils.isNonEmptyString ? text : "N/A"} showCopy=false
+        />
       </p>
     } else {
       React.string("-")

src/components/Graphs/BarGraph/BarGraph.res

@@ -0,0 +1,8 @@
+external barGraphOptionsToJson: BarGraphTypes.barGraphOptions => JSON.t = "%identity"
+
+@react.component
+let make = (~options: BarGraphTypes.barGraphOptions, ~className="") => {
+  <div className>
+    <Highcharts.Chart options={options->barGraphOptionsToJson} highcharts={Highcharts.highcharts} />
+  </div>
+}

src/screens/NewAnalytics/Graphs/BarGraph/BarGraphUtils.res → src/components/Graphs/BarGraph/BarGraphUtils.res

@@ -2,7 +2,6 @@
 let fontFamily = "Arial, sans-serif"
 let darkGray = "#666666"
 let gridLineColor = "#e6e6e6"
-
 open BarGraphTypes
 let getBarGraphOptions = (barGraphOptions: barGraphPayload) => {
   let {categories, data, title, tooltipFormatter} = barGraphOptions

src/components/Graphs/LineGraph/LineGraph.res

@@ -0,0 +1,10 @@
+external lineGraphOptionsToJson: LineGraphTypes.lineGraphOptions => JSON.t = "%identity"
+
+@react.component
+let make = (~options: LineGraphTypes.lineGraphOptions, ~className="") => {
+  <div className>
+    <Highcharts.Chart
+      options={options->lineGraphOptionsToJson} highcharts={Highcharts.highcharts}
+    />
+  </div>
+}

src/components/Graphs/SankyGraph/SankeyGraph.res

@@ -0,0 +1,12 @@
+external sankeyGraphOptionsToJson: SankeyGraphTypes.sankeyGraphOptions => JSON.t = "%identity"
+
+@react.component
+let make = (~options: SankeyGraphTypes.sankeyGraphOptions, ~className="") => {
+  Highcharts.sankeyChartModule(Highcharts.highchartsModule)
+
+  <div className>
+    <Highcharts.Chart
+      options={options->sankeyGraphOptionsToJson} highcharts={Highcharts.highcharts}
+    />
+  </div>
+}

src/components/LoadedTable.res

@@ -896,15 +896,13 @@ let make = (
           <AdvancedSearchModal searchFields url=searchUrl entity />
         </RenderIf>
       }}
-      <DesktopView>
-        {switch tableActions {
-        | Some(actions) =>
-          <LoadedTableContext value={actualData->LoadedTableContext.toInfoData}>
-            <div className=filterBottomPadding> actions </div>
-          </LoadedTableContext>
-        | None => React.null
-        }}
-      </DesktopView>
+      {switch tableActions {
+      | Some(actions) =>
+        <LoadedTableContext value={actualData->LoadedTableContext.toInfoData}>
+          <div className=filterBottomPadding> actions </div>
+        </LoadedTableContext>
+      | None => React.null
+      }}
     </div>
 
   let addDataAttributesClass = if isHighchartLegend {
@@ -988,10 +986,10 @@ let make = (
             : tableDataBackgroundClass}`}>
         paginationUI
         {
-          let topBottomActions = if bottomActions->Option.isSome || !isMobileView {
+          let topBottomActions = if bottomActions->Option.isSome{
             bottomActions
           } else {
-            tableActions
+            None
           }
 
           switch topBottomActions {