fix release

AXN-Informatique · Aug 5, 2022 · 42072f2 · 42072f2
1 parent 3b58de3
commit 42072f2
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 38 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+4.0.1 (2022-08-05)
+------------------
+
+- Fix stacks management
+- Removed buggy `$errorsCount` in favor of `$flashErrorsCount` and `$nowErrorsCount`
+
+
 4.0.0 (2022-08-04)
 ------------------
 
@@ -9,7 +16,7 @@ Changelog
 - Added the ability to group messages of the same type in the same notification when viewing
 - Added ability to group messages notifications based on their types when viewing
 - Added the ability to set the display order of messages types
-- Added `<x-notify />` Blade component
+- Added `<x-notify />` Blade component with many attributs
 - Added predefined views:
   - `bootstrap-5`
   - `bootstrap-5-toast`

diff --git a/readme.md b/readme.md
@@ -518,7 +518,8 @@ Dans votre nouvelle vue, vous aurez alors accès aux variables publiques du comp
 
 - `$flashMessages` : la collection des messages flash
 - `$nowMessages` : la collection des messages instantanés
-- `$errorsCount` : le nombre d'erreurs (généralement celles liées à la validation)
+- `$flashErrorsCount` : le nombre d'erreurs dans les messages flash
+- `$nowErrorsCount` : le nombre d'erreurs dans les messages instantanés
 
 Il conviendra alors de boucler sur les messages :
 
@@ -557,7 +558,7 @@ Et donc dans la vue du component :
             'type' => $flashMessage['type'],
             'message' => $flashMessage['message'],
             'title' => $flashMessage['title'],
-            'errorsCount' => $errorsCount,
+            'errorsCount' => $flashErrorsCount,
         ])
     @endforeach
     @foreach ($nowMessages as $nowMessage)
@@ -566,7 +567,7 @@ Et donc dans la vue du component :
             'type' => $nowMessage['type'],
             'message' => $nowMessage['message'],
             'title' => $nowMessage['title'],
-            'errorsCount' => $errorsCount,
+            'errorsCount' => $nowErrorsCount,
         ])
     @endforeach
 </div>
@@ -580,15 +581,15 @@ Si vous n'avez pas besoin de modifier le code ci-dessus vous pouvez utiliser la
 ])
 ```
 
-Maintenant il ne vous reste "plus qu'à implémenter" la vue du message `components/partials/custom-notify-message.blade.php`.
+Maintenant il ne vous reste "plus qu'à" implémenter la vue du message `components/partials/custom-notify-message.blade.php`.
 
 Dans celle-ci vous aurez accès aux variables suivantes :
 
 - `$id` : l'identifiant unique du message
 - `$type` : le type du message ('info', 'success', 'warning' ou 'error')
 - `$message` : le contenu du message
 - `$title` : l'éventuel titre du message
-- `$errorsCount` : le nombre d'erreurs (généralement celles liées à la validation)
+- `$errorsCount` : le nombre de messages d'erreurs
 
 Et là c'est à vous de jouer :)
 

diff --git a/resources/views/bootstrap-4-toast.blade.php b/resources/views/bootstrap-4-toast.blade.php
@@ -6,7 +6,7 @@
                 'type' => $flashMessage['type'],
                 'message' => $flashMessage['message'],
                 'title' => $flashMessage['title'],
-                'errorsCount' => $errorsCount,
+                'errorsCount' => $flashErrorsCount,
             ])
         @endforeach
         @foreach ($nowMessages as $nowMessage)
@@ -15,7 +15,7 @@
                 'type' => $nowMessage['type'],
                 'message' => $nowMessage['message'],
                 'title' => $nowMessage['title'],
-                'errorsCount' => $errorsCount,
+                'errorsCount' => $nowErrorsCount,
             ])
         @endforeach
     </div>

diff --git a/resources/views/bootstrap-5-toast.blade.php b/resources/views/bootstrap-5-toast.blade.php
@@ -6,7 +6,7 @@
                 'type' => $flashMessage['type'],
                 'message' => $flashMessage['message'],
                 'title' => $flashMessage['title'],
-                'errorsCount' => $errorsCount,
+                'errorsCount' => $flashErrorsCount,
             ])
         @endforeach
         @foreach ($nowMessages as $nowMessage)
@@ -15,7 +15,7 @@
                 'type' => $nowMessage['type'],
                 'message' => $nowMessage['message'],
                 'title' => $nowMessage['title'],
-                'errorsCount' => $errorsCount,
+                'errorsCount' => $nowErrorsCount,
             ])
         @endforeach
     </div>

diff --git a/resources/views/partials/a-generic-component.blade.php b/resources/views/partials/a-generic-component.blade.php
@@ -5,7 +5,7 @@
             'type' => $flashMessage['type'],
             'message' => $flashMessage['message'],
             'title' => $flashMessage['title'],
-            'errorsCount' => $errorsCount,
+            'errorsCount' => $flashErrorsCount,
         ])
     @endforeach
     @foreach ($nowMessages as $nowMessage)
@@ -14,7 +14,7 @@
             'type' => $nowMessage['type'],
             'message' => $nowMessage['message'],
             'title' => $nowMessage['title'],
-            'errorsCount' => $errorsCount,
+            'errorsCount' => $nowErrorsCount,
         ])
     @endforeach
-</div>
+</div>
diff --git a/resources/views/partials/bootstrap-4-toast-message.blade.php b/resources/views/partials/bootstrap-4-toast-message.blade.php
@@ -15,7 +15,7 @@
             $aria = 'role="alert" aria-live="assertive" aria-atomic="true"';
             break;
         case 'error':
-            $delay = 15000;
+            $delay = $errorsCount ? 7500 * $errorsCount : 15000;
             $aria = 'role="alert" aria-live="assertive" aria-atomic="true"';
             break;
     }

diff --git a/resources/views/partials/bootstrap-5-toast-message.blade.php b/resources/views/partials/bootstrap-5-toast-message.blade.php
@@ -15,7 +15,7 @@
             $aria = 'role="alert" aria-live="assertive" aria-atomic="true"';
             break;
         case 'error':
-            $delay = 15000;
+            $delay = $errorsCount ? 7500 * $errorsCount : 15000;
             $aria = 'role="alert" aria-live="assertive" aria-atomic="true"';
             break;
     }

diff --git a/resources/views/partials/sweetalert2-message.blade.php b/resources/views/partials/sweetalert2-message.blade.php
@@ -71,7 +71,7 @@
 
         @case ('error')
             Toast.fire({
-                timer: {!! 10000 * $errors->count() !!}
+                timer: {!! $errorsCount ? 7500 * $errorsCount : 15000 !!}
             })
         @break
     @endswitch

diff --git a/src/Concerns/HasFlashMessages.php b/src/Concerns/HasFlashMessages.php
@@ -59,12 +59,11 @@ public function error(string $message, ?string $title = null): Notify
     /**
      * Retourne les messages pour la prochaine requête HTTP.
      *
-     * @param string $stack
      * @return Collection
      */
-    public function flashMessages(string $stack = Notify::DEFAULT_STACK): Collection
+    public function flashMessages(): Collection
     {
-        return $this->stackMessages("notify_flash_$stack");
+        return $this->stackMessages("notify_flash_$this->stack");
     }
 
     /**

diff --git a/src/Concerns/HasNowMessages.php b/src/Concerns/HasNowMessages.php
@@ -59,12 +59,11 @@ public function nowError(string $message, ?string $title = null): Notify
     /**
      * Retourne les messages pour la requête HTTP courante.
      *
-     * @param string $stack
      * @return Collection
      */
-    public function nowMessages(string $stack = Notify::DEFAULT_STACK): Collection
+    public function nowMessages(): Collection
     {
-        return $this->stackMessages("notify_now_$stack");
+        return $this->stackMessages("notify_now_$this->stack");
     }
 
     /**

diff --git a/src/Notify.php b/src/Notify.php
@@ -36,9 +36,9 @@ class Notify
     /**
      * Le nom de la stack à utiliser.
      *
-     * @var string
+     * @var string|null
      */
-    protected string $stack;
+    protected ?string $stack;
 
     /**
      * Constructeur.
@@ -57,9 +57,9 @@ public function __construct(Session $session)
      * @param string|null $stack
      * @return self
      */
-    public function stack(?string $stack): self
+    public function stack(?string $stack = null): self
     {
-        $this->stack = $stack ?? self::DEFAULT_STACK;
+        $this->stack = $stack ?? Notify::DEFAULT_STACK;
 
         return $this;
     }

diff --git a/src/View/Components/NotifyComponent.php b/src/View/Components/NotifyComponent.php
@@ -12,11 +12,13 @@ class NotifyComponent extends Component
 
     public Collection $nowMessages;
 
-    public int $errorsCount;
+    public int $flashErrorsCount;
+
+    public int $nowErrorsCount;
 
     private Notify $notify;
 
-    private ?string $stack;
+    private string $stack;
 
     private string $viewName;
 
@@ -29,18 +31,17 @@ class NotifyComponent extends Component
     private bool $withoutNowMessages;
 
     public function __construct(
-        Notify $notify,
-        ?string $stack = null,
+        string $stack = null,
         ?string $viewName = null,
-        ?bool $sortByType = true,
-        ?bool $groupByType = false,
-        ?bool $withoutFlashMessages = false,
-        ?bool $withoutNowMessages = false,
+        bool $sortByType = true,
+        bool $groupByType = false,
+        bool $withoutFlashMessages = false,
+        bool $withoutNowMessages = false,
     ) {
-        $this->notify = $notify;
-
         $this->stack = $stack ?? Notify::DEFAULT_STACK;
 
+        $this->notify = notify($this->stack);
+
         $config = config('notifier');
 
         $this->viewName = $viewName ?? $config['default_view'];
@@ -73,6 +74,8 @@ private function setParticularViewParams(): void
             $this->groupByType = true;
         }
 
+        // les vue 'notifier::bootstrap-5' et 'notifier::bootstrap-4'
+        // ne peuvent êtres groupées par type car cela casse leur affichage
         if (in_array($this->viewName, ['notifier::bootstrap-5', 'notifier::bootstrap-4'])) {
             $this->groupByType = false;
         }
@@ -89,6 +92,12 @@ private function flashMessages(): Collection
             return collect();
         }
 
+        $this->flashErrorsCount = $this->notify->flashMessages($this->stack)
+            ->filter(function ($value) {
+                return $value['type'] === Notify::ERROR;
+            })
+            ->count();
+
         return $this->notify->flashMessages($this->stack)
             ->when($this->groupByType, function ($messages) {
                 return $messages->groupMessagesByType();
@@ -111,6 +120,12 @@ private function nowMessages(): Collection
             return collect();
         }
 
+        $this->nowErrorsCount = $this->notify->nowMessages($this->stack)
+            ->filter(function ($value) {
+                return $value['type'] === Notify::ERROR;
+            })
+            ->count();
+
         return $this->notify->nowMessages($this->stack)
             ->when($this->groupByType, function ($messages) {
                 return $messages->groupMessagesByType();
@@ -129,8 +144,6 @@ private function addErrorsToNowMessage(): void
     {
         $errors = app('view')->shared('errors');
 
-        $this->errorsCount = $errors->count();
-
         if ($errors->any()) {
             foreach ($errors->all() as $error) {
                 $this->notify->nowError($error);