Quellcode durchsuchen

enhance: display refresh status

Tienson Qin vor 4 Jahren
Ursprung
Commit
c2dbbc77bf

+ 6 - 1
src/main/frontend/components/header.cljs

@@ -171,7 +171,8 @@
         electron-mac? (and util/mac? (util/electron?))
         electron-not-mac? (and (util/electron?) (not electron-mac?))
         show-open-folder? (and (nfs/supported?) (empty? repos)
-                               (not config/publishing?))]
+                               (not config/publishing?))
+        refreshing? (state/sub :nfs/refreshing?)]
     (rum/with-context [[t] i18n/*tongue-context*]
       [:div.cp__header#head
        {:class (when electron-mac? "electron-mac")
@@ -201,6 +202,10 @@
 
        (new-block-mode)
 
+       (when refreshing?
+         [:div {:class "animate-spin-reverse"}
+          svg/refresh])
+
        (when-not (util/electron?)
          (login logged?))
 

+ 1 - 0
src/main/frontend/handler/repo.cljs

@@ -630,6 +630,7 @@
 
 (defn re-index!
   [nfs-rebuild-index! ok-handler]
+  (route-handler/redirect-to-home!)
   (when-let [repo (state/get-current-repo)]
     (let [local? (config/local-db? repo)]
       (if local?

+ 5 - 11
src/main/frontend/handler/web/nfs.cljs

@@ -302,19 +302,13 @@
             _ (ok-handler)]
       (state/set-nfs-refreshing! false))))
 
-(defn refactored-version?
-  []
-  (:block/name (storage/get :db-schema)))
-
 (defn refresh!
   [repo ok-handler]
-  (if (refactored-version?)
-    (when repo
-      (state/set-nfs-refreshing! true)
-      (p/let [_ (reload-dir! repo)
-              _ (ok-handler)]
-        (state/set-nfs-refreshing! false)))
-    (rebuild-index! repo ok-handler)))
+  (when repo
+    (state/set-nfs-refreshing! true)
+    (p/let [_ (reload-dir! repo)
+            _ (ok-handler)]
+      (state/set-nfs-refreshing! false))))
 
 (defn supported?
   []