chore: Option Core changes

juspay · Jan 18, 2024 · fe03e31 · fe03e31
1 parent 1b75528
commit fe03e31
Show file tree

Hide file tree

Showing 186 changed files with 951 additions and 1,116 deletions.
diff --git a/src/components/AdvancedSearchComponent.res b/src/components/AdvancedSearchComponent.res
@@ -30,14 +30,14 @@ let make = (
     fetchApi(url, ~bodyStr=Js.Json.stringify(values), ~method_=Fetch.Post, ())
     ->then(Fetch.Response.json)
     ->then(json => {
-      let jsonData = json->Js.Json.decodeObject->Belt.Option.flatMap(dict => dict->Dict.get("rows"))
+      let jsonData = json->Js.Json.decodeObject->Option.flatMap(dict => dict->Dict.get("rows"))
       let newData = switch jsonData {
       | Some(actualJson) => actualJson->getObjects->Array.map(obj => obj->Js.Nullable.return)
       | None => []
       }
 
       let summaryData =
-        json->Js.Json.decodeObject->Belt.Option.flatMap(dict => dict->Dict.get("summary"))
+        json->Js.Json.decodeObject->Option.flatMap(dict => dict->Dict.get("summary"))
 
       let summary = switch summaryData {
       | Some(x) => x->getSummary

diff --git a/src/components/AdvancedSearchModal.res b/src/components/AdvancedSearchModal.res
@@ -49,8 +49,7 @@ module AdvanceSearch = {
             let statusStr = getString(jsonDict, "status", "FAILURE")
 
             if statusStr === "SUCCESS" {
-              let payloadDict =
-                jsonDict->Dict.get(detailsKey)->Belt.Option.flatMap(Js.Json.decodeObject)
+              let payloadDict = jsonDict->Dict.get(detailsKey)->Option.flatMap(Js.Json.decodeObject)
 
               switch payloadDict {
               | Some(dict) => {
@@ -90,12 +89,12 @@ module AdvanceSearch = {
       }
       let errors = Dict.make()
       requiredSearchFieldsList->Array.forEach(key => {
-        if Dict.get(valuesDict, key)->Js.Option.isNone {
+        if Dict.get(valuesDict, key)->Option.isNone {
           Dict.set(errors, key, "Required"->Js.Json.string)
         }
       })
       let isSubmitEnabled = optionalSearchFieldsList->Array.some(key => {
-        Dict.get(valuesDict, key)->Js.Option.isSome
+        Dict.get(valuesDict, key)->Option.isSome
       })
 
       if !isSubmitEnabled {

diff --git a/src/components/AuthWrapperUtils.res b/src/components/AuthWrapperUtils.res
@@ -17,9 +17,9 @@ let useLocalStorageToken = tokenType => {
   let lcToken = LocalStorage.useStorageValue("login")->getValidToken
   let switchToken = LocalStorage.useStorageValue("switchToken")->getValidToken
 
-  if switchToken->Js.Option.isSome && switchToken !== Some("__failed") && tokenType !== Original {
+  if switchToken->Option.isSome && switchToken !== Some("__failed") && tokenType !== Original {
     switchToken
-  } else if lcToken->Js.Option.isSome && lcToken !== Some("__failed") && tokenType !== SwitchOnly {
+  } else if lcToken->Option.isSome && lcToken !== Some("__failed") && tokenType !== SwitchOnly {
     lcToken
   } else {
     None

diff --git a/src/components/Button.res b/src/components/Button.res
@@ -382,7 +382,7 @@ let make = (
   }
 
   let buttonSize: buttonSize =
-    buttonSize->Belt.Option.getWithDefault(
+    buttonSize->Option.getWithDefault(
       MatchMedia.useMatchMedia("(max-width: 800px)") ? Small : Medium,
     )
 
@@ -419,7 +419,7 @@ let make = (
     }
   }
 
-  let heightClass = customHeightClass->Belt.Option.getWithDefault({
+  let heightClass = customHeightClass->Option.getWithDefault({
     switch buttonSize {
     | XSmall => "h-fit"
     | Small => "h-fit"
@@ -433,7 +433,7 @@ let make = (
   | _ => "cursor-pointer"
   }
 
-  let paddingClass = customPaddingClass->Belt.Option.getWithDefault(
+  let paddingClass = customPaddingClass->Option.getWithDefault(
     switch buttonSize {
     | XSmall => "py-3 px-4"
     | Small =>
@@ -447,7 +447,7 @@ let make = (
     },
   )
 
-  let textPaddingClass = customTextPaddingClass->Belt.Option.getWithDefault(
+  let textPaddingClass = customTextPaddingClass->Option.getWithDefault(
     switch buttonSize {
     | XSmall => "px-1"
     | Small => "px-1"
@@ -456,7 +456,7 @@ let make = (
     },
   )
 
-  let textSize = customTextSize->Belt.Option.getWithDefault(
+  let textSize = customTextSize->Option.getWithDefault(
     switch buttonSize {
     | XSmall => "text-fs-11"
     | Small => "text-fs-13"
@@ -468,7 +468,7 @@ let make = (
   let ellipsisClass = ellipsisOnly ? "truncate" : ""
   let ellipsisParentClass = ellipsisOnly ? "max-w-[250px] md:max-w-xs" : ""
 
-  let iconSize = customIconSize->Belt.Option.getWithDefault(
+  let iconSize = customIconSize->Option.getWithDefault(
     switch buttonSize {
     | XSmall => 12
     | Small => 14
@@ -493,7 +493,7 @@ let make = (
   | Large => ""
   }
 
-  let iconMargin = customIconMargin->Belt.Option.getWithDefault(
+  let iconMargin = customIconMargin->Option.getWithDefault(
     switch buttonSize {
     | XSmall
     | Small => "ml-1"
@@ -670,7 +670,7 @@ let make = (
   | _ => "text-sm font-medium leading-5"
   }
 
-  let textId = text->Belt.Option.getWithDefault("")
+  let textId = text->Option.getWithDefault("")
   let iconId = switch leftIcon {
   | FontAwesome(iconName)
   | Euler(iconName) => iconName
@@ -692,9 +692,9 @@ let make = (
   let relativeClass = isRelative ? "relative" : ""
   let conditionalButtonStyles = `${allowButtonTextMinWidth
       ? "min-w-min"
-      : ""} ${customBackColor->Belt.Option.getWithDefault(
+      : ""} ${customBackColor->Option.getWithDefault(
       backColor,
-    )} ${customRoundedClass->Belt.Option.getWithDefault(roundedClass)}`
+    )} ${customRoundedClass->Option.getWithDefault(roundedClass)}`
 
   let newThemeGap = ""
 

diff --git a/src/components/Calendar.res b/src/components/Calendar.res
@@ -21,7 +21,7 @@ module TableRow = {
     switch obj {
     | Some(a) => {
         let day = String.split(a, "-")
-        React.string(day[2]->Belt.Option.getWithDefault(""))
+        React.string(day[2]->Option.getWithDefault(""))
       }
 
     | None => React.string("")
@@ -149,11 +149,11 @@ module TableRow = {
             }
             let getDate = date => {
               let datevalue = Js.Date.makeWithYMD(
-                ~year=Js.Float.fromString(date[0]->Belt.Option.getWithDefault("")),
+                ~year=Js.Float.fromString(date[0]->Option.getWithDefault("")),
                 ~month=Js.Float.fromString(
-                  String.make(Js.Float.fromString(date[1]->Belt.Option.getWithDefault("")) -. 1.0),
+                  String.make(Js.Float.fromString(date[1]->Option.getWithDefault("")) -. 1.0),
                 ),
-                ~date=Js.Float.fromString(date[2]->Belt.Option.getWithDefault("")),
+                ~date=Js.Float.fromString(date[2]->Option.getWithDefault("")),
                 (),
               )
               datevalue

diff --git a/src/components/CalendarList.res b/src/components/CalendarList.res
@@ -30,7 +30,7 @@ let make = (
   // check whether month and date has value
   let getMonthFromFloat = value => {
     let valueInt = value->Belt.Float.toInt
-    months[valueInt]->Belt.Option.getWithDefault(Jan)
+    months[valueInt]->Option.getWithDefault(Jan)
   }
   let getMonthInFloat = mon => {
     Array.indexOf(months, mon)->Belt.Float.fromInt

diff --git a/src/components/CollapsableTableRow.res b/src/components/CollapsableTableRow.res
@@ -81,7 +81,7 @@ let make = (
       <div className="px-3 py-4 bg-white dark:bg-jp-gray-lightgray_background">
         {item
         ->Array.mapWithIndex((obj, index) => {
-          let heading = headingArray->Belt.Array.get(index)->Belt.Option.getWithDefault("")
+          let heading = headingArray->Belt.Array.get(index)->Option.getWithDefault("")
           <UIUtils.RenderIf condition={index !== 0} key={index->string_of_int}>
             <div className="flex mb-5 justify-between">
               <div className="text-jp-gray-900 opacity-50 font-medium">

diff --git a/src/components/CustomCharts/FunnelChart.res b/src/components/CustomCharts/FunnelChart.res
@@ -13,10 +13,7 @@ let make = (
     isMobileView ? (0.16, "w-full", "flex-col") : (size, "w-1/2", "flex-row")
   }, [isMobileView])
   let funnelData =
-    data
-    ->Belt.Array.get(0)
-    ->Belt.Option.getWithDefault(Js.Json.null)
-    ->LogicUtils.getDictFromJsonObject
+    data->Belt.Array.get(0)->Option.getWithDefault(Js.Json.null)->LogicUtils.getDictFromJsonObject
   let (hoverIndex, setHoverIndex) = React.useState(_ => -1.)
   let (selectedMetric, setSelectedMetric) = React.useState(_ => Volume)
   let length = metrics->Array.length->Belt.Float.fromInt
@@ -92,7 +89,7 @@ let make = (
               let nextWidthRatio = switch widths->Belt.Array.get(i->Belt.Float.toInt + 1) {
               | Some(width) => width
               | None =>
-                widths->Belt.Array.get(i->Belt.Float.toInt)->Belt.Option.getWithDefault(size *. 70.)
+                widths->Belt.Array.get(i->Belt.Float.toInt)->Option.getWithDefault(size *. 70.)
               }
 
               fixedWidth := currentWidthRatio *. fixedWidth.contents

diff --git a/src/components/CustomCharts/HighchartHorizontalBarChart.res b/src/components/CustomCharts/HighchartHorizontalBarChart.res
@@ -44,7 +44,7 @@ let xLabelFormatter: Js_OO.Callback.arity1<xAxisRecord => string> = {
     | Some(series) => {
         let options = series.options
         switch options {
-        | Some(options) => options.data->Belt.Array.get(index)->Belt.Option.getWithDefault(0)
+        | Some(options) => options.data->Belt.Array.get(index)->Option.getWithDefault(0)
         | None => 0
         }
       }
@@ -74,7 +74,7 @@ let make = (
       selectedMetrics.metric_name_db,
     )
   }, (rawData, groupKey, selectedMetrics.metric_name_db))
-  let titleKey = titleKey->Belt.Option.getWithDefault(groupKey)
+  let titleKey = titleKey->Option.getWithDefault(groupKey)
 
   let barOption: Js.Json.t = React.useMemo2(() => {
     let colors = {

diff --git a/src/components/CustomCharts/HighchartPieChart.res b/src/components/CustomCharts/HighchartPieChart.res
@@ -43,7 +43,7 @@ let make = (
   let color = theme === Dark ? "white" : "black"
   let borderColor = theme === Dark ? "black" : "white"
   let opacity = theme === Dark ? "0.5" : "1"
-  let titleKey = titleKey->Belt.Option.getWithDefault(groupKey)
+  let titleKey = titleKey->Option.getWithDefault(groupKey)
 
   let barOption: Js.Json.t = React.useMemo2(() => {
     let colors = {

diff --git a/src/components/CustomCharts/HighchartTimeSeriesChart.res b/src/components/CustomCharts/HighchartTimeSeriesChart.res
@@ -169,12 +169,12 @@ module LineChart1D = {
             let (x, y, secondryMetrics) = axes
             xAxisMapInfo->LineChartUtils.appendToDictValue(
               ["run_date", "run_month", "run_week"]->Array.includes(groupKey)
-                ? x->Js.Json.decodeString->Belt.Option.getWithDefault("")
+                ? x->Js.Json.decodeString->Option.getWithDefault("")
                 : x->Js.Json.stringify,
               (
                 item.name,
                 {
-                  item.color->Belt.Option.getWithDefault("#000000")
+                  item.color->Option.getWithDefault("#000000")
                 },
                 y,
                 secondryMetrics,
@@ -299,7 +299,7 @@ module LineChart1D = {
           }
         })
         ->Belt.Array.get(0)
-        ->Belt.Option.getWithDefault("")
+        ->Option.getWithDefault("")
       let color =
         chartData
         ->Belt.Array.keepMap(item => {
@@ -309,7 +309,7 @@ module LineChart1D = {
           }
         })
         ->Belt.Array.get(0)
-        ->Belt.Option.getWithDefault(`${colorOrig}`)
+        ->Option.getWithDefault(`${colorOrig}`)
 
       let transformValue = num => {
         num->HSAnalyticsUtils.setPrecision()
@@ -611,12 +611,12 @@ module LineChart1D = {
 
                   let upper_bound =
                     upper_bound <= threshold
-                      ? threshold +. stepUpFromThreshold->Belt.Option.getWithDefault(0.)
+                      ? threshold +. stepUpFromThreshold->Option.getWithDefault(0.)
                       : upper_bound
 
                   let lower_bound =
                     lower_bound >= threshold
-                      ? threshold -. stepUpFromThreshold->Belt.Option.getWithDefault(0.)
+                      ? threshold -. stepUpFromThreshold->Option.getWithDefault(0.)
                       : lower_bound
 
                   let positions = NumericUtils.pretty([lower_bound, upper_bound], 5)
@@ -661,8 +661,7 @@ module LineChart1D = {
             let labelsValue = {
               "formatter": Some(
                 @this
-                param =>
-                  formatLabels(selectedMetrics, param.value->Belt.Option.getWithDefault(0.0)),
+                param => formatLabels(selectedMetrics, param.value->Option.getWithDefault(0.0)),
               ),
               "enabled": true,
               "style": {
@@ -778,7 +777,7 @@ module LegendItem = {
         <AddDataAttributes attributes=[("data-chart-legend", legendItem.name)]>
           <div
             className={`flex flex-row gap-2 justify-center items-center cursor-pointer ${opacity} select-none`}
-            onDoubleClick={_ => selectedRow->Belt.Option.isSome ? setSelectedRow(_ => None) : ()}
+            onDoubleClick={_ => selectedRow->Option.isSome ? setSelectedRow(_ => None) : ()}
             onClick={_ =>
               setSelectedRow(prev => {
                 switch prev {
@@ -837,7 +836,7 @@ module RenderMultiDimensionalChart = {
             ),
             legendIndex: i.legendIndex,
             name: i.name,
-            color: i.color->Belt.Option.getWithDefault("#000000"),
+            color: i.color->Option.getWithDefault("#000000"),
           })
         )
         ->ignore
@@ -895,8 +894,8 @@ module LineChart2D = {
   ) => {
     let (groupBy1, groupBy2) = switch groupBy {
     | Some(value) => (
-        value->Belt.Array.get(0)->Belt.Option.getWithDefault(""),
-        value->Belt.Array.get(1)->Belt.Option.getWithDefault(""),
+        value->Belt.Array.get(0)->Option.getWithDefault(""),
+        value->Belt.Array.get(1)->Option.getWithDefault(""),
       )
     | None => ("", "")
     }
@@ -940,9 +939,9 @@ module LineChart3D = {
   ) => {
     let (groupBy1, groupBy2, groupby3) = switch groupBy {
     | Some(value) => (
-        value->Belt.Array.get(0)->Belt.Option.getWithDefault(""),
-        value->Belt.Array.get(1)->Belt.Option.getWithDefault(""),
-        value->Belt.Array.get(2)->Belt.Option.getWithDefault(""),
+        value->Belt.Array.get(0)->Option.getWithDefault(""),
+        value->Belt.Array.get(1)->Option.getWithDefault(""),
+        value->Belt.Array.get(2)->Option.getWithDefault(""),
       )
     | None => ("", "", "")
     }