From e577797ef4bffed3a2cbf738ef4e7ccdc4caf00c Mon Sep 17 00:00:00 2001
From: Andelf <andelf@gmail.com>
Date: Fri, 3 Dec 2021 18:21:03 +0800
Subject: [PATCH] enhance(ui): handle encryption errors

---
 src/main/frontend/components/encryption.cljs | 27 ++++++++++++--------
 src/main/frontend/ui.cljs                    | 10 ++++----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/main/frontend/components/encryption.cljs b/src/main/frontend/components/encryption.cljs
index 599b44da76..6db26702de 100644
--- a/src/main/frontend/components/encryption.cljs
+++ b/src/main/frontend/components/encryption.cljs
@@ -31,12 +31,12 @@
                        (when (not @reveal-secret-phrase?)
                          (reset! reveal-secret-phrase? true)))}
           [:div.font-medium "Public Key:"]
-          [:div public-key]
+          [:div.font-mono.select-all.break-all public-key]
           (if @reveal-secret-phrase?
             [:div
              [:div.mt-1.font-medium "Private Key:"]
-             [:div private-key]]
-            [:div "click to view the private key"])]]]
+             [:div.font-mono.select-all.break-all private-key]]
+            [:div.underline "click to view the private key"])]]]
 
        [:div.mt-5.sm:mt-4.sm:flex.sm:flex-row-reverse
         [:span.mt-3.flex.w-full.rounded-md.shadow-sm.sm:mt-0.sm:w-auto
@@ -136,9 +136,11 @@
 
 (rum/defcs encryption-input-secret-inner <
   (rum/local "" ::secret)
+  (rum/local false ::loading)
   [state repo-url db-encrypted-secret close-fn]
   (rum/with-context [[t] i18n/*tongue-context*]
-    (let [secret (get state ::secret)]
+    (let [secret (::secret state)
+          loading (::loading state)]
       [:div
        [:div.sm:flex.sm:items-start
         [:div.mt-3.text-center.sm:mt-0.sm:text-left
@@ -156,14 +158,19 @@
          [:button.inline-flex.justify-center.w-full.rounded-md.border.border-transparent.px-4.py-2.bg-indigo-600.text-base.leading-6.font-medium.text-white.shadow-sm.hover:bg-indigo-500.focus:outline-none.focus:border-indigo-700.focus:shadow-outline-indigo.transition.ease-in-out.duration-150.sm:text-sm.sm:leading-5
           {:type "button"
            :on-click (fn []
+                       (reset! loading true)
                        (let [value @secret]
                          (when-not (string/blank? value) ; TODO: length or other checks
-                           (p/let [repo (state/get-current-repo)
-                                   keys (e/decrypt-with-passphrase value db-encrypted-secret)]
-                             (e/save-key-pair! repo keys)
-                             (close-fn true)
-                             (state/set-state! :encryption/graph-parsing? false)))))}
-          "Submit"]]]])))
+                           (let [repo (state/get-current-repo)]
+                             (p/do!
+                              (-> (e/decrypt-with-passphrase value db-encrypted-secret)
+                                  (p/then (fn [keys]
+                                            (e/save-key-pair! repo keys)
+                                            (close-fn true)
+                                            (state/set-state! :encryption/graph-parsing? false)))
+                                  (p/catch #(notification/show! "The password is not matched." :warning true))
+                                  (p/finally #(reset! loading false))))))))}
+          (if @loading (ui/loading "Decrypting") "Decrypt")]]]])))
 
 (defn encryption-input-secret-dialog
   [repo-url db-encrypted-secret close-fn]
diff --git a/src/main/frontend/ui.cljs b/src/main/frontend/ui.cljs
index 5eba40871a..f99042458d 100644
--- a/src/main/frontend/ui.cljs
+++ b/src/main/frontend/ui.cljs
@@ -189,10 +189,10 @@
                 "M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7 4a1 1 0 11-2 0 1 1 0 012 0zm-1-9a1 1 0 00-1 1v4a1 1 0 102 0V6a1 1 0 00-1-1z"
                 :fill-rule "evenodd"}]]])]
       [:div.ui__notifications-content
-       {:style {:z-index (if (or (= state "exiting")
-                                 (= state "exited"))
-                           -1
-                           99)}}
+       {:style
+        (when (or (= state "exiting")
+                  (= state "exited"))
+                  {:z-index -1})}
        [:div.max-w-sm.w-full.shadow-lg.rounded-lg.pointer-events-auto.notification-area
         {:class (case state
                   "entering" "transition ease-out duration-300 transform opacity-0 translate-y-2 sm:translate-x-0"
@@ -537,7 +537,7 @@
                    (state/close-settings!))
         modal-panel-content (or modal-panel-content (fn [close] [:div]))]
     [:div.ui__modal
-     {:style {:z-index (if show? 9999 -1)}}
+     {:style {:z-index (if show? 999 -1)}}
      (css-transition
       {:in show? :timeout 0}
       (fn [state]