Преглед изворни кода

fix: reduce page-history err when page doesn't have file-id yet

rcmerci пре 2 година
родитељ
комит
04d7224ff1
2 измењених фајлова са 17 додато и 17 уклоњено
  1. 1 1
      src/main/frontend/components/file_sync.cljs
  2. 16 16
      src/main/frontend/handler/file_sync.cljs

+ 1 - 1
src/main/frontend/components/file_sync.cljs

@@ -588,7 +588,7 @@
          (async/go
            (set-loading? true)
            (try
-             (let [files (async/<! (file-sync-handler/fetch-page-file-versions graph-uuid page-entity))]
+             (let [files (async/<! (file-sync-handler/<fetch-page-file-versions graph-uuid page-entity))]
                (set-version-files files)
                (set-page-fn (first files))
                (set-list-ready? true))

+ 16 - 16
src/main/frontend/handler/file_sync.cljs

@@ -163,24 +163,24 @@
               version-file-paths)
              (remove nil?))))))))
 
-(defn fetch-page-file-versions [graph-uuid page]
+(defn <fetch-page-file-versions [graph-uuid page]
   []
   (let [file-id (:db/id (:block/file page))]
-    (when-let [path (:file/path (db/entity file-id))]
-      (let [base-path (config/get-repo-dir (state/get-current-repo))
-            base-path (if (string/starts-with? base-path "file://")
-                        (gp-util/safe-decode-uri-component base-path)
-                        base-path)
-            path*     (string/replace-first (string/replace-first path base-path "") #"^/" "")]
-        (go
-          (let [version-list       (:VersionList
-                                    (<! (sync/<get-remote-file-versions sync/remoteapi graph-uuid path*)))
-                local-version-list (<! (<list-file-local-versions page))
-                all-version-list   (->> (concat version-list local-version-list)
-                                        (sort-by #(or (:CreateTime %)
-                                                      (:create-time %))
-                                                 >))]
-            all-version-list))))))
+    (go
+      (when-let [path (:file/path (db/entity file-id))]
+        (let [base-path (config/get-repo-dir (state/get-current-repo))
+              base-path (if (string/starts-with? base-path "file://")
+                          (gp-util/safe-decode-uri-component base-path)
+                          base-path)
+              path*     (string/replace-first (string/replace-first path base-path "") #"^/" "")
+              version-list       (:VersionList
+                                  (<! (sync/<get-remote-file-versions sync/remoteapi graph-uuid path*)))
+              local-version-list (<! (<list-file-local-versions page))
+              all-version-list   (->> (concat version-list local-version-list)
+                                      (sort-by #(or (:CreateTime %)
+                                                    (:create-time %))
+                                               >))]
+          all-version-list)))))
 
 
 (defn init-remote-graph