From 528f0b4f608f061c2ce96d170fa68e07912918ac Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 12 Feb 2024 11:09:30 +0100
Subject: [PATCH] :lipstick: Add cosmetic improvements on static page
 components

---
 frontend/src/app/main/errors.cljs    |  1 -
 frontend/src/app/main/ui.cljs        |  3 +--
 frontend/src/app/main/ui/static.cljs | 30 +++++++++++-----------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/frontend/src/app/main/errors.cljs b/frontend/src/app/main/errors.cljs
index ed0ad6598..0d3576059 100644
--- a/frontend/src/app/main/errors.cljs
+++ b/frontend/src/app/main/errors.cljs
@@ -116,7 +116,6 @@
 
 (defmethod ptk/handle-error :validation
   [{:keys [code] :as error}]
-
   (print-group! "Validation Error"
                 (fn []
                   (print-data! error)
diff --git a/frontend/src/app/main/ui.cljs b/frontend/src/app/main/ui.cljs
index 08f714c3b..68bd5d58a 100644
--- a/frontend/src/app/main/ui.cljs
+++ b/frontend/src/app/main/ui.cljs
@@ -128,12 +128,11 @@
              {:keys [file-id]} path-params]
          [:? {}
           (if (:token query-params)
-            [:> static/static-header {}
+            [:> static/error-container {}
              [:div.image i/unchain]
              [:div.main-message (tr "viewer.breaking-change.message")]
              [:div.desc-message (tr "viewer.breaking-change.description")]]
 
-
             [:& viewer-page
              {:page-id page-id
               :file-id file-id
diff --git a/frontend/src/app/main/ui/static.cljs b/frontend/src/app/main/ui/static.cljs
index e0f9a4581..91c017e46 100644
--- a/frontend/src/app/main/ui/static.cljs
+++ b/frontend/src/app/main/ui/static.cljs
@@ -11,15 +11,13 @@
    [app.main.ui.icons :as i]
    [app.util.globals :as globals]
    [app.util.i18n :refer [tr]]
-   [app.util.object :as obj]
    [app.util.router :as rt]
    [rumext.v2 :as mf]))
 
-(mf/defc static-header
+(mf/defc error-container
   {::mf/wrap-props false}
-  [props]
-  (let [children (obj/get props "children")
-        on-click (mf/use-callback #(set! (.-href globals/location) "/"))]
+  [{:keys [children]}]
+  (let [on-click (mf/use-callback #(set! (.-href globals/location) "/"))]
     [:section {:class (stl/css :exception-layout)}
      [:button
       {:class (stl/css :exception-header)
@@ -34,13 +32,13 @@
 
 (mf/defc invalid-token
   []
-  [:> static-header {}
+  [:> error-container {}
    [:div {:class (stl/css :main-message)} (tr "errors.invite-invalid")]
    [:div {:class (stl/css :desc-message)} (tr "errors.invite-invalid.info")]])
 
 (mf/defc not-found
   []
-  [:> static-header {}
+  [:> error-container {}
    [:div {:class (stl/css :main-message)} (tr "labels.not-found.main-message")]
    [:div {:class (stl/css :desc-message)} (tr "labels.not-found.desc-message")]])
 
@@ -49,7 +47,7 @@
   (let [handle-retry
         (mf/use-callback
          (fn [] (st/emit! (rt/assign-exception nil))))]
-    [:> static-header {}
+    [:> error-container {}
      [:div {:class (stl/css :main-message)} (tr "labels.bad-gateway.main-message")]
      [:div {:class (stl/css :desc-message)} (tr "labels.bad-gateway.desc-message")]
      [:div {:class (stl/css :sign-info)}
@@ -57,25 +55,21 @@
 
 (mf/defc service-unavailable
   []
-  (let [handle-retry
-        (mf/use-callback
-         (fn [] (st/emit! (rt/assign-exception nil))))]
-    [:> static-header {}
+  (let [on-click (mf/use-fn #(st/emit! (rt/assign-exception nil)))]
+    [:> error-container {}
      [:div {:class (stl/css :main-message)} (tr "labels.service-unavailable.main-message")]
      [:div {:class (stl/css :desc-message)} (tr "labels.service-unavailable.desc-message")]
      [:div {:class (stl/css :sign-info)}
-      [:button {:on-click handle-retry} (tr "labels.retry")]]]))
+      [:button {:on-click on-click} (tr "labels.retry")]]]))
 
 (mf/defc internal-error
   []
-  (let [handle-retry
-        (mf/use-callback
-         (fn [] (st/emit! (rt/assign-exception nil))))]
-    [:> static-header {}
+  (let [on-click (mf/use-fn #(st/emit! (rt/assign-exception nil)))]
+    [:> error-container {}
      [:div {:class (stl/css :main-message)} (tr "labels.internal-error.main-message")]
      [:div {:class (stl/css :desc-message)} (tr "labels.internal-error.desc-message")]
      [:div {:class (stl/css :sign-info)}
-      [:button {:on-click handle-retry} (tr "labels.retry")]]]))
+      [:button {:on-click on-click} (tr "labels.retry")]]]))
 
 (mf/defc exception-page
   [{:keys [data] :as props}]