add notification tests and refactor

Author: sprocketc

.clj-kondo/metosin/malli-types-cljs/config.edn

@@ -4758,8 +4758,7 @@
                                                                                                                           :label :string,
                                                                                                                           :id :any,
                                                                                                                           :attrs :map,
-                                                                                                                          :visible :boolean,
-                                                                                                                          :cached-attrs :map},
+                                                                                                                          :visible :boolean},
                                                                                                                     :req {:tag :any}},
                                                                                                      :focused :boolean,
                                                                                                      :filter :keyword},
@@ -4870,8 +4869,7 @@
                                                                                                                                 :label :string,
                                                                                                                                 :id :any,
                                                                                                                                 :attrs :map,
-                                                                                                                                :visible :boolean,
-                                                                                                                                :cached-attrs :map},
+                                                                                                                                :visible :boolean},
                                                                                                                           :req {:tag :any}},
                                                                                                            :focused :boolean,
                                                                                                            :filter :keyword},

src/renderer/notification/db.cljs

@@ -4,5 +4,5 @@
 
 (def Notification
   [:map {:closed true}
-   [:count {:optional true} int?]
+   [:count pos-int?]
    [:content Hiccup]])

src/renderer/notification/handlers.cljs

@@ -11,4 +11,5 @@
     (if (= notification (-> notifications peek :content))
       (assoc db :notifications
              (conj (pop notifications) (update (peek notifications) :count inc)))
-      (update db :notifications conj {:content notification}))))
+      (update db :notifications conj {:content notification
+                                      :count 1}))))

src/renderer/notification/views.cljs

@@ -9,7 +9,7 @@
 (defn unavailable-feature
   [feature compatibility-url]
   [:div
-   [:h2.font-bold.text-error feature " is unavailable"]
+   [:h2.font-bold.text-error (str feature " is unavailable")]
    [:div.mt-4
     "Your browser does not support this API."
     "You can check the "
@@ -50,10 +50,10 @@
           {:aria-label "Close"
            :class "icon-button absolute top-3 right-3 small"
            :on-click #(rf/dispatch [::notification.e/remove-nth index])}]
-         (when-let [n (:count notification)]
+         (when (> (:count notification) 1)
            [:div.absolute.bg-error.left-0.top-0.px-1.py-0.5.rounded
             {:class "-translate-x-1/2 -translate-y-1/2"}
-            (inc n)])])
+            (:count notification)])])
       notifications)
 
      (when (second notifications)

test/notification_test.cljs

@@ -0,0 +1,57 @@
+(ns notification-test
+  (:require
+   [cljs.test :refer-macros [deftest is testing]]
+   [day8.re-frame.test :as rf-test]
+   [re-frame.core :as rf]
+   [renderer.app.events :as app.e]
+   [renderer.notification.events :as e]
+   [renderer.notification.subs :as s]))
+
+(deftest add-and-remove
+  (rf-test/run-test-sync
+   (rf/dispatch [::app.e/initialize-db])
+
+   (let [notifications (rf/subscribe [::s/entities])]
+     (testing "intial"
+       (is (= @notifications [])))
+
+     (testing "add"
+       (rf/dispatch [::e/add [:div "test"]])
+       (is (= (count @notifications) 1))
+       (is (= (first @notifications) {:content [:div "test"]
+                                      :count 1})))
+
+     (testing "merge identical"
+       (rf/dispatch [::e/add [:div "test"]])
+       (is (= (count @notifications) 1))
+       (is (= (first @notifications) {:content [:div "test"]
+                                      :count 2})))
+
+     (testing "add different"
+       (rf/dispatch [::e/add [:div "test 2"]])
+       (is (= (count @notifications) 2))
+       (is (= (second @notifications) {:content [:div "test 2"]
+                                       :count 1})))
+
+     (testing "remove nth"
+       (rf/dispatch [::e/remove-nth 1])
+       (is (= (count @notifications) 1)))
+
+     (testing "clear all"
+       (rf/dispatch [::e/clear-all])
+       (is (= (count @notifications) 0))))))
+
+(deftest exception
+  (rf-test/run-test-sync
+   (rf/dispatch [::app.e/initialize-db])
+
+   (let [notifications (rf/subscribe [::s/entities])]
+     (testing "string exception"
+       (try
+         (throw (js/Error. "Error message"))
+         (catch js/Error e
+           (rf/dispatch [::e/exception e])
+           (is (= (:content (first @notifications))
+                  [:div
+                   [:h2.font-bold.text-error "Error"]
+                   [:div.mt-4 "Error message"]]))))))))