@colisweb/rescript-toolkit 1.29.4 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "1.29.4",
+  "version": "2.0.0",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",
@@ -38,7 +38,7 @@
     "@reach/visually-hidden": "0.16.0",
     "@rescript/react": "0.10.3",
     "autoprefixer": "10.3.6",
-    "axios": "0.22.0",
+    "axios": "0.24.0",
     "bs-axios": "0.0.43",
     "bs-css": "13.4.0",
     "bs-css-emotion": "2.4.0",
@@ -71,10 +71,10 @@
     "restorative": "0.4.0-beta.1",
     "string.prototype.matchall": "4.0.5",
     "swr": "1.0.1",
-    "tailwindcss": "2.2.16"
+    "tailwindcss": "2.2.19"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.16.0",
     "@storybook/addon-actions": "6.1.21",
     "@storybook/addon-essentials": "6.1.21",
     "@storybook/addon-knobs": "6.1.21",

package/src/decoders/Toolkit__Decoders.res

@@ -1,4 +1,4 @@
-module Date = {
+module Datetime = {
   type date = Js.Date.t
 
   let encoder: Decco.encoder<date> = value => value->Js.Date.toISOString->Decco.stringToJson
@@ -15,6 +15,24 @@ module Date = {
   type t = @decco.codec(codec) date
 }
 
+module Date = {
+  type date = Js.Date.t
+
+  let encoder: Decco.encoder<date> = date =>
+    date->BsDateFns.formatWithPattern("yyyy-MM-dd")->Decco.stringToJson
+
+  let decoder: Decco.decoder<date> = json =>
+    switch Decco.stringFromJson(json) {
+    | Ok(v) => Js.Date.fromString(v)->Ok
+    | Error(_) as err => err
+    }
+
+  let codec: Decco.codec<date> = (encoder, decoder)
+
+  @decco
+  type t = @decco.codec(codec) date
+}
+
 module Int = {
   let encoder = value => value->Decco.intToJson
 

package/src/sentry/SentryReactNativeLogger.res

@@ -0,0 +1,114 @@
+open BsSentryReactNative
+
+let error = (loc: ReScriptLogger.Location.t, event) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    captureMessage(event)
+  })
+}
+
+let error1 = (loc: ReScriptLogger.Location.t, event, (label, data)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label, data)
+    captureMessage(event)
+  })
+}
+
+let error2 = (loc: ReScriptLogger.Location.t, event, (label1, data1), (label2, data2)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    captureMessage(event)
+  })
+}
+
+let error3 = (
+  loc: ReScriptLogger.Location.t,
+  event,
+  (label1, data1),
+  (label2, data2),
+  (label3, data3),
+) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    scope->Scope.setExtra(label3, data3)
+    captureMessage(event)
+  })
+}
+let error4 = (
+  loc: ReScriptLogger.Location.t,
+  event,
+  (label1, data1),
+  (label2, data2),
+  (label3, data3),
+  (label4, data4),
+) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    scope->Scope.setExtra(label3, data3)
+    scope->Scope.setExtra(label4, data4)
+    captureMessage(event)
+  })
+}
+let error5 = (
+  loc: ReScriptLogger.Location.t,
+  event,
+  (label1, data1),
+  (label2, data2),
+  (label3, data3),
+  (label4, data4),
+  (label5, data5),
+) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    scope->Scope.setExtra(label3, data3)
+    scope->Scope.setExtra(label4, data4)
+    scope->Scope.setExtra(label5, data5)
+    captureMessage(event)
+  })
+}
+
+let errorWithData = (loc: ReScriptLogger.Location.t, event, (label, data)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra(label, data)
+    captureMessage(event)
+  })
+}
+
+let errorWithData2 = (loc: ReScriptLogger.Location.t, event, (label1, data1), (label2, data2)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    captureMessage(event)
+  })
+}

package/src/ui/Toolkit__Ui_Layout.res

@@ -23,6 +23,19 @@ module Footer = {
     </footer>
 }
 
+module NavOpenContext = {
+  let context = React.createContext(false)
+
+  module Provider = {
+    let provider = React.Context.provider(context)
+
+    @react.component
+    let make = (~value, ~children) => {
+      React.createElement(provider, {"value": value, "children": children})
+    }
+  }
+}
+
 module App = {
   let localStorageNavKey = "@colisweb/navOpen"
 
@@ -149,19 +162,21 @@ module App = {
 
     let hideMenu = React.useCallback(_ => setOpen(_ => false))
 
-    <div>
-      <TopNavigationBar username logout logoutLabel toggleMenu onLogoClick />
-      <div className="flex">
-        <LeftNavigationBar isNavOpen ?bottom hideMenu> sideNavRender </LeftNavigationBar>
-        <main
-          className={cx([
-            className,
-            "flex-initial w-full transition-all duration-300 ease-in-out mt-16 z-20",
-            isNavOpen ? "navOpen lg:pl-64" : "lg:pl-16",
-          ])}>
-          children
-        </main>
+    <NavOpenContext.Provider value={isNavOpen}>
+      <div>
+        <TopNavigationBar username logout logoutLabel toggleMenu onLogoClick />
+        <div className="flex">
+          <LeftNavigationBar isNavOpen ?bottom hideMenu> sideNavRender </LeftNavigationBar>
+          <main
+            className={cx([
+              className,
+              "flex-initial w-full transition-all duration-300 ease-in-out mt-16 z-20",
+              isNavOpen ? "navOpen lg:pl-64" : "lg:pl-16",
+            ])}>
+            children
+          </main>
+        </div>
       </div>
-    </div>
+    </NavOpenContext.Provider>
   }
 }

package/src/ui/Toolkit__Ui_Snackbar.res

@@ -3,7 +3,7 @@ and options = {
   id: id,
   isVisible: bool,
   title: string,
-  description: option<React.element>,
+  content: option<React.element>,
   closable: bool,
   variant: variant,
   timeout: int,
@@ -32,14 +32,14 @@ let store = Restorative.createStore({list: []}, (state, action) =>
   }
 )
 
-let show = (~title, ~description=?, ~closable=true, ~variant, ~timeout=5000, ()) => {
+let show = (~title, ~content=?, ~closable=true, ~variant, ~timeout=5000, ()) => {
   let id: id = Js.Math.random()->Js.Float.toString->Obj.magic
   store.dispatch(
     Show({
       id: id,
       isVisible: true,
       title: title,
-      description: description,
+      content: content,
       closable: closable,
       variant: variant,
       timeout: timeout,
@@ -58,12 +58,13 @@ let hide = id => {
 module Item = {
   @react.component
   let make = (~options) => {
-    let {id, isVisible, variant, title, description, closable, timeout} = options
+    let {id, isVisible, variant, title, content, closable, timeout} = options
 
     let (mounted, setMounted) = React.useState(() => false)
 
     React.useEffect0(() => {
       setMounted(_ => true)
+
       let timeoutId = Js.Global.setTimeout(() => {
         hide(id)
       }, timeout)
@@ -71,51 +72,58 @@ module Item = {
     })
 
     <div
+      style={ReactDOM.Style.make(~pointerEvents="all", ())}
       className={cx([
-        "bg-white p-3 rounded shadow transition duration-500 ease-in-out mt-3 transform ",
-        {
-          open Css
-          style(list{bottom(40->px), unsafe("pointer-events", "all")})
-        },
+        "rounded shadow transition duration-500 ease-in-out mt-3 p-3 pl-3 pr-10 transform",
         mounted ? "-translate-y-14" : "!opacity-0",
         isVisible ? "opacity-100" : "opacity-0  translate-x-[200px]",
         {
           switch variant {
-          | #success => "bg-success-500 text-white"
-          | #warning => "bg-warning-500 text-white"
-          | #danger => "bg-danger-500 text-white"
+          | #success => "bg-success-100"
+          | #warning => "bg-warning-100"
+          | #danger => "bg-danger-100 "
           }
         },
       ])}>
-      <div className="flex flex-gap-3">
+      {closable
+        ? <button className="absolute right-1" onClick={_ => hide(id)}>
+            <BsReactIcons.MdClose
+              size={24}
+              className={cx([
+                {
+                  switch variant {
+                  | #success => "text-neutral-700"
+                  | #warning => "text-warning-700"
+                  | #danger => "text-danger-700"
+                  }
+                },
+              ])}
+            />
+          </button>
+        : React.null}
+      <div className="flex flex-row gap-3 relative">
         <div>
           {switch variant {
-          | #success => <BsReactIcons.MdCheckCircle size=28 />
-          | #warning => <BsReactIcons.MdWarning size=28 />
-          | #danger => <BsReactIcons.MdError size=28 />
+          | #success => <BsReactIcons.MdCheckCircle size=28 className="text-success-600" />
+          | #warning => <BsReactIcons.MdWarning size=28 className="text-warning-600" />
+          | #danger => <BsReactIcons.MdError size=28 className="text-danger-600" />
           }}
         </div>
         <div>
-          <strong> {title->React.string} </strong>
-          {description->Option.mapWithDefault(React.null, description =>
-            <p
-              className={cx([
-                "text-sm",
-                {
-                  open Css
-                  style(list{maxWidth(250->px)})
-                },
-              ])}>
-              description
-            </p>
-          )}
+          <p
+            className={cx([
+              "text-lg",
+              switch variant {
+              | #success => "text-neutral-700"
+              | #warning => "text-warning-700"
+              | #danger => "text-danger-700"
+              },
+            ])}>
+            {title->React.string}
+          </p>
         </div>
-        {closable
-          ? <button className="self-start" onClick={_ => hide(id)}>
-              <BsReactIcons.MdClose />
-            </button>
-          : React.null}
       </div>
+      {content->Option.getWithDefault(React.null)}
     </div>
   }
 }

package/src/ui/Toolkit__Ui_Snackbar.resi

@@ -3,7 +3,7 @@ type id
 
 let show: (
   ~title: string,
-  ~description: React.element=?, // default: None
+  ~content: React.element=?, // default: None
   ~closable: bool=?, // default: true
   ~variant: variant,
   ~timeout: int=?, // default: 5000

package/src/vendors/BsSentryReactNative.res

@@ -2,21 +2,23 @@ module Sentry = {
   module Scope = {
     type t
 
-    @bs.send external setExtra: (t, string, 'a) => unit = "setExtra"
+    @send external setExtra: (t, string, 'a) => unit = "setExtra"
   }
 
-  @module("@sentry/react-native")
-  external init: Js.t<'a> => unit = "init"
+  @module("sentry-expo") external init: 'a => unit = "init"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
   external setTag: (string, string) => unit = "setTag"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
+  external setUser: 'a => unit = "setUser"
+
+  @module("sentry-expo") @scope("Native")
   external captureException: Js.Promise.error => unit = "captureException"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
   external captureMessage: string => unit = "captureMessage"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
   external withScope: (Scope.t => unit) => unit = "withScope"
 }