@colisweb/rescript-toolkit 4.14.14 → 4.15.0

package/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 include:
-  - "https://colisweb-idl.gitlab.io/colisweb-open-source/ci-common/v17.1.1/templates/front.yml"
+  - "https://colisweb-idl.gitlab.io/colisweb-open-source/ci-common/v17.7.0/templates/front.yml"
 
 variables:
   GIT_COMMIT_FILES: ""

package/.secure_files/{ci-functions-v17.6.0 → ci-functions-v17.7.2}

@@ -577,7 +577,7 @@ psql_on_k8() {
   CONNECTION=$3
   shift 3
 
-  kubectl -n $NAMESPACE run ${SERVICE}-database-init \
+  kubectl -n $NAMESPACE run ${SERVICE}-postgres-init \
     --image jbergknoff/postgresql-client \
     --restart=Never \
     --attach --rm \
@@ -588,13 +588,14 @@ psql_on_k8() {
 
 mysql_on_k8() {
   local namespace=$1
-  local db_host=$2
-  local db_port=$3
-  local db_init_username=$4
-  local db_init_password=$5
-  local query=$6
-
-  kubectl -n ${namespace} run datadog-database-init \
+  local service=$2
+  local db_host=$3
+  local db_port=$4
+  local db_init_username=$5
+  local db_init_password=$6
+  local query=$7
+
+  kubectl -n ${namespace} run ${service}-mysql-init \
     --image widdpim/mysql-client \
     --restart=Never \
     --attach --rm \
@@ -679,8 +680,10 @@ kube_init_datadog_in_database() {
   echo "======================="
 
   echo "Checking if User  '$db_datadog_username' exists"
+  local service="datadog"
+  found_db_users=$(mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'SELECT user FROM mysql.user;')
   set +e
-  mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'SELECT user FROM mysql.user;' | grep "^$db_datadog_username$"
+  echo $found_db_users | grep "^$db_datadog_username$"
   return_code=$?
   set -e
 
@@ -691,29 +694,29 @@ kube_init_datadog_in_database() {
 
     # All the query come from this docs : https://docs.datadoghq.com/fr/database_monitoring/setup_mysql/selfhosted/?tab=mysql56
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'CREATE USER '"$db_datadog_username"'@"%" IDENTIFIED BY '"'$db_datadog_password'"';'
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'CREATE USER '"$db_datadog_username"'@"%" IDENTIFIED BY '"'$db_datadog_password'"';'
     echo "USER created $db_datadog_username"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'GRANT REPLICATION CLIENT ON *.* TO datadog@"%" WITH MAX_USER_CONNECTIONS 5;'
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'GRANT REPLICATION CLIENT ON *.* TO datadog@"%" WITH MAX_USER_CONNECTIONS 5;'
     echo "ALTER USER $db_datadog_username"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'GRANT PROCESS ON *.* TO '"$db_datadog_username"'@"%";'
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'GRANT PROCESS ON *.* TO '"$db_datadog_username"'@"%";'
     echo "Granted PROCESS for $db_datadog_username"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'GRANT SELECT ON performance_schema.* TO '"$db_datadog_username"'@"%";'
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'GRANT SELECT ON performance_schema.* TO '"$db_datadog_username"'@"%";'
     echo "Granted SELECT on performance_schema for $db_datadog_username"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'CREATE SCHEMA IF NOT EXISTS datadog;'
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'CREATE SCHEMA IF NOT EXISTS datadog;'
     echo "CREATE SCHEMA datadog"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'GRANT EXECUTE ON datadog.* to '"$db_datadog_username"'@"%";'
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'GRANT EXECUTE ON datadog.* to '"$db_datadog_username"'@"%";'
     echo "Granted 'GRANT EXECUTE for $db_datadog_username on datadog"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'GRANT CREATE TEMPORARY TABLES ON datadog.* TO '"$db_datadog_username"'@"%";'
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'GRANT CREATE TEMPORARY TABLES ON datadog.* TO '"$db_datadog_username"'@"%";'
     echo "Granted  CREATE TEMPORARY TABLES for $db_datadog_username"
 
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'DROP PROCEDURE IF EXISTS datadog.explain_statement;
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'DROP PROCEDURE IF EXISTS datadog.explain_statement;
                   DELIMITER $$
                   CREATE PROCEDURE datadog.explain_statement(IN query TEXT)
                       SQL SECURITY DEFINER
@@ -726,7 +729,7 @@ kube_init_datadog_in_database() {
                   DELIMITER ;'
    echo "CREATE PROCEDURE PROCEDURE datadog.explain_statement"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'DROP PROCEDURE IF EXISTS '"$db_datadog_username"'.explain_statement;
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'DROP PROCEDURE IF EXISTS '"$db_datadog_username"'.explain_statement;
                     DELIMITER $$
                     CREATE PROCEDURE '"$db_datadog_username"'.explain_statement(IN query TEXT)
                         SQL SECURITY DEFINER
@@ -740,7 +743,7 @@ kube_init_datadog_in_database() {
                     GRANT EXECUTE ON PROCEDURE '"$db_datadog_username"'.explain_statement TO datadog@"%";'
     echo "CREATE PROCEDURE on SCHEMA $db_datadog_schema for $db_datadog_username"
 
-    mysql_on_k8 $namespace $db_host $db_port $db_init_username $db_init_password 'DROP PROCEDURE IF EXISTS datadog.enable_events_statements_consumers;
+    mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'DROP PROCEDURE IF EXISTS datadog.enable_events_statements_consumers;
                   DELIMITER $$
                   CREATE PROCEDURE datadog.enable_events_statements_consumers()
                       SQL SECURITY DEFINER
@@ -818,7 +821,7 @@ kube_init_datadog_in_postgres_database() {
       RETURNS NULL ON NULL INPUT
       SECURITY DEFINER;"
 
-    kubectl -n $namespace run $service-database-init \
+    kubectl -n $namespace run $service-postgres-init \
       --image jbergknoff/postgresql-client \
       --restart=Never \
       --attach --rm \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "4.14.14",
+  "version": "4.15.0",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/ui/Toolkit__Ui_Dropdown.res

@@ -82,9 +82,9 @@ let make = (
       onClick={event => {
         switch dropDownRef.current->Js.Nullable.toOption {
         | None => toggle()
-        | Some(dropDownRef) => {
-            let isInDropdown = ReactEvent.Mouse.currentTarget(event)["contains"](. dropDownRef)
-            if !isInDropdown {
+        | Some(_dropDownRef) => {
+            let isButton = ReactEvent.Mouse.target(event)["tagName"] === "BUTTON"
+            if isButton {
               toggle()
             }
           }

package/src/ui/Toolkit__Ui_PortalDropdown.res

@@ -26,7 +26,12 @@ let make = (
 
   Toolkit__Hooks.useOnClickOutside(dropDownRef, _ => {
     onClickOutside->Option.forEach(fn => fn())
-    hide()
+
+    Js.Global.setTimeout(() => {
+      if isOpen {
+        hide()
+      }
+    }, 100)->ignore
   })
 
   let (adjustmentStyle, setAdjustmentStyle) = React.useState(() => None)

package/src/ui/Toolkit__Ui_SelectWithValidation.res

@@ -91,6 +91,9 @@ let make = (
   ~validateButtonClassName="",
   ~cancelButtonClassName="",
   ~itemClassName="",
+  ~buttonColor=?,
+  ~buttonSize=?,
+  ~buttonVariant=?,
   ~searchPlaceholder: option<string>=?,
   ~allowFilter=true,
   ~defaultValue: option<item>=?,
@@ -116,6 +119,9 @@ let make = (
 
   <Toolkit__Ui_Dropdown
     ?disabled
+    ?buttonColor
+    ?buttonSize
+    ?buttonVariant
     buttonClassName
     onClose={_ => setSelectedOption(_ => defaultValue)}
     dropdownClassName

package/src/ui/Toolkit__Ui_SelectWithValidation.resi

@@ -10,6 +10,9 @@ let make: (
   ~validateButtonClassName: string=?,
   ~cancelButtonClassName: string=?,
   ~itemClassName: string=?,
+  ~buttonColor: Toolkit__Ui_Button.color=?,
+  ~buttonSize: Toolkit__Ui_Button.size=?,
+  ~buttonVariant: Toolkit__Ui_Button.variant=?,
   ~searchPlaceholder: string=?,
   ~allowFilter: bool=?,
   ~defaultValue: item=?,