Merge branch 'hotfix/0.24.1'

Robert-2 · May 14, 2024 · 0c659b6 · 0c659b6
2 parents 0f8fcab + 9e9fdf1
commit 0c659b6
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Tous les changements notables sur le projet sont documentés dans ce fichier.
 
 Ce projet adhère au principe du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.24.1 (2024-05-14)
+
+- Corrige le click sur les éléments déroulant sur mobile / tablette.
+- Corrige la recherche dans les listings quand des caractères spéciaux sont utilisés.
+
 ## 0.24.0 (2024-05-09)
 
 - __[CHANGEMENT CRITIQUE]__ Loxya requiert maintenant au minimum PHP 8.1 pour fonctionner.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.24.0
+0.24.1
diff --git a/client/src/themes/default/components/Dropdown/index.tsx b/client/src/themes/default/components/Dropdown/index.tsx
@@ -144,7 +144,12 @@ const Dropdown = defineComponent({
             this.isOpen = !this.isOpen;
         },
 
-        handleClickOutside() {
+        handleClickOutside(e: Event) {
+            // - Si c'est un click dans le dropdown, on ne fait rien.
+            const $dropdown = this.$refs.dropdown as HTMLElement | undefined;
+            if (e.target !== null && $dropdown?.contains(e.target as Node)) {
+                return;
+            }
             this.isOpen = false;
         },
 

diff --git a/server/src/App/Controllers/BeneficiaryController.php b/server/src/App/Controllers/BeneficiaryController.php
@@ -32,7 +32,7 @@ public function getAll(Request $request, Response $response): ResponseInterface
 
         $query = Beneficiary::query()
             ->when(
-                $search !== null && strlen($search) >= 2,
+                $search !== null && mb_strlen($search) >= 2,
                 static fn (Builder $query) => $query->search($search),
             )
             ->when($onlyDeleted, static fn (Builder $builder) => (

diff --git a/server/src/App/Controllers/BookingController.php b/server/src/App/Controllers/BookingController.php
@@ -143,7 +143,7 @@ protected function getAllPaginated(Request $request, Response $response): Respon
         foreach ($queries as $modelClass => $modelQuery) {
             $modelQuery
                 ->when(
-                    $search !== null && strlen($search) >= 2,
+                    $search !== null && mb_strlen($search) >= 2,
                     static fn ($builder) => $builder->search($search),
                 )
                 ->when($period, static fn (Builder $builder) => (

diff --git a/server/src/App/Controllers/EventController.php b/server/src/App/Controllers/EventController.php
@@ -61,7 +61,7 @@ public function getAll(Request $request, Response $response): ResponseInterface
 
         $query = Event::query()
             ->when(
-                $search !== null && strlen($search) >= 2,
+                $search !== null && mb_strlen($search) >= 2,
                 static fn ($builder) => $builder->search($search),
             )
             ->when($exclude !== null, static fn ($builder) => (

diff --git a/server/src/App/Controllers/MaterialController.php b/server/src/App/Controllers/MaterialController.php
@@ -83,7 +83,7 @@ public function getAll(Request $request, Response $response): ResponseInterface
 
         $query = Material::query()
             ->when(
-                $search !== null && strlen($search) >= 2,
+                $search !== null && mb_strlen($search) >= 2,
                 static fn (Builder $subQuery) => $subQuery->search($search),
             )
             ->when($onlyDeleted, static fn (Builder $subQuery) => (

diff --git a/server/src/App/Controllers/ParkController.php b/server/src/App/Controllers/ParkController.php
@@ -32,7 +32,7 @@ public function getAll(Request $request, Response $response): ResponseInterface
 
         $query = Park::query()
             ->when(
-                $search !== null && strlen($search) >= 2,
+                $search !== null && mb_strlen($search) >= 2,
                 static fn (Builder $subQuery) => $subQuery->search($search),
             )
             ->when($onlyDeleted, static fn (Builder $subQuery) => (

diff --git a/server/src/App/Controllers/TechnicianController.php b/server/src/App/Controllers/TechnicianController.php
@@ -49,7 +49,7 @@ public function getAll(Request $request, Response $response): ResponseInterface
 
         $query = Technician::query()
             ->when(
-                $search !== null && strlen($search) >= 2,
+                $search !== null && mb_strlen($search) >= 2,
                 static fn (Builder $subQuery) => $subQuery->search($search),
             )
             ->when(

diff --git a/server/src/App/Controllers/Traits/Crud/GetAll.php b/server/src/App/Controllers/Traits/Crud/GetAll.php
@@ -25,7 +25,7 @@ public function getAll(Request $request, Response $response): ResponseInterface
         // @phpstan-ignore-next-line
         $query = $this->getModelClass()::query()
             ->when(
-                $search !== null && strlen($search) >= 2,
+                $search !== null && mb_strlen($search) >= 2,
                 static fn (Builder $subQuery) => $subQuery->search($search),
             )
             ->when($onlyDeleted, static fn (Builder $subQuery) => (

diff --git a/server/src/App/Controllers/UserController.php b/server/src/App/Controllers/UserController.php
@@ -35,7 +35,7 @@ public function getAll(Request $request, Response $response): ResponseInterface
 
         $query = User::query()
             ->when(
-                $search !== null && strlen($search) >= 2,
+                $search !== null && mb_strlen($search) >= 2,
                 static fn (Builder $subQuery) => $subQuery->search($search),
             )
             ->when($group !== null, static fn (Builder $subQuery) => (

diff --git a/server/src/App/Services/I18n.php b/server/src/App/Services/I18n.php
@@ -252,7 +252,7 @@ private static function getLanguageParts(string $language): array
         $code = $language;
         $region = null;
 
-        if (strlen($language) > 2) {
+        if (mb_strlen($language) > 2) {
             if (str_contains($language, '-')) {
                 [$code, $region] = explode('-', $language, 2);
             } elseif (str_contains($language, '_')) {

diff --git a/server/src/views/entries/default.twig b/server/src/views/entries/default.twig
@@ -7,7 +7,6 @@
     {% endif -%}
 
     <link href="{{ client_asset('/js/chunk-vendors.js') }}" rel="preload" as="script">
-    <link href="{{ client_asset('/js/chunk-common.js') }}" rel="preload" as="script">
     <link href="{{ client_asset('/js/default.js') }}" rel="preload" as="script">
 
     {% if env is not same as('development') -%}
@@ -38,6 +37,5 @@
         //]]>
     </script>
     <script src="{{ client_asset('/js/chunk-vendors.js') }}"></script>
-    <script src="{{ client_asset('/js/chunk-common.js') }}"></script>
     <script src="{{ client_asset('/js/default.js') }}"></script>
 {% endblock %}