refactor: mv import to appropriate ns and reuse import fns

src/main/frontend/components/imports.cljs

@@ -114,7 +114,7 @@
             (state/set-state! :graph/importing :logseq)
             (let [reader (js/FileReader.)
                   import-f (if db-edn?
-                             db-import-handler/import-from-edn!
+                             db-import-handler/import-from-edn-file!
                              db-import-handler/import-from-debug-transit!)]
               (set! (.-onload reader)
                     (fn [e]

src/main/frontend/handler/db_based/export.cljs

@@ -1,19 +1,14 @@
 (ns frontend.handler.db-based.export
   "Handles DB graph exports and imports across graphs"
   (:require [cljs.pprint :as pprint]
-            [clojure.edn :as edn]
             [clojure.string :as string]
             [frontend.config :as config]
-            [frontend.db :as db]
             [frontend.handler.notification :as notification]
-            [frontend.handler.ui :as ui-handler]
             [frontend.state :as state]
             [frontend.util :as util]
             [frontend.util.page :as page-util]
             [goog.dom :as gdom]
             [logseq.db :as ldb]
-            [logseq.db.sqlite.export :as sqlite-export]
-            [logseq.shui.ui :as shui]
             [promesa.core :as p]))
 
 (defn ^:export export-block-data []
@@ -92,61 +87,4 @@
         (when-let [anchor (gdom/getElement "download-as-db-edn")]
           (.setAttribute anchor "href" data-str)
           (.setAttribute anchor "download" filename)
-          (.click anchor))))))
-
-(defn- import-submit [import-inputs _e]
-  (let [export-map (try (edn/read-string (:import-data @import-inputs)) (catch :default _err ::invalid-import))
-        import-block? (::sqlite-export/block export-map)
-        block (when import-block?
-                (if-let [eid (:block-id (first (state/get-editor-args)))]
-                  (db/entity [:block/uuid eid])
-                  (notification/show! "No block found" :warning)))]
-    (if (= ::invalid-import export-map)
-      (notification/show! "The submitted EDN data is invalid! Fix and try again." :warning)
-      (let [{:keys [init-tx block-props-tx misc-tx error] :as txs}
-            (try
-              (sqlite-export/build-import export-map
-                                          (db/get-db)
-                                          (when block {:current-block block}))
-              (catch :default e
-                (js/console.error "Import EDN error: " e)
-                {:error "An unexpected error occurred during import. See the javascript console for details."}))]
-        (pprint/pprint txs)
-        (if error
-          (notification/show! error :error)
-          ;; TODO: When not import-block, use metadata that supports undo
-          (let [tx-meta (if import-block? {:outliner-op :save-block} {::sqlite-export/imported-data? true})
-                repo (state/get-current-repo)]
-            (-> (p/do
-                  (db/transact! repo init-tx tx-meta)
-                  (when (seq block-props-tx)
-                    (db/transact! repo block-props-tx tx-meta))
-                  (when (seq misc-tx)
-                    (db/transact! repo misc-tx tx-meta))
-                  (when-not import-block?
-                    (state/clear-async-query-state!)
-                    (ui-handler/re-render-root!)
-                    (notification/show! "Import successful!" :success)))
-                (p/catch (fn [e]
-                           (js/console.error "Import EDN error: " e)
-                           (notification/show! "An unexpected error occurred during import. See the javascript console for details." :error))))))
-        ;; Also close cmd-k
-        (shui/dialog-close-all!)))))
-
-(defn ^:export import-edn-data
-  []
-  (let [import-inputs (atom {:import-data "" :import-block? false})]
-    (shui/dialog-open!
-     [:div
-      [:label.flex.my-2.text-lg "Import EDN Data"]
-      #_[:label.block.flex.items-center.py-3
-         (shui/checkbox {:on-checked-change #(swap! import-inputs update :import-block? not)})
-         [:small.pl-2 (str "Import into current block")]]
-      (shui/textarea {:placeholder "{}"
-                      :class "overflow-y-auto"
-                      :rows 10
-                      :auto-focus true
-                      :on-change (fn [^js e] (swap! import-inputs assoc :import-data (util/evalue e)))})
-      (shui/button {:class "mt-3"
-                    :on-click (partial import-submit import-inputs)}
-                   "Import")])))
+          (.click anchor))))))

src/main/frontend/handler/db_based/import.cljs

@@ -5,8 +5,10 @@
             [frontend.db :as db]
             [frontend.handler.notification :as notification]
             [frontend.handler.repo :as repo-handler]
+            [frontend.handler.ui :as ui-handler]
             [frontend.persist-db :as persist-db]
             [frontend.state :as state]
+            [frontend.util :as util]
             [logseq.db :as ldb]
             [logseq.db.sqlite.export :as sqlite-export]
             [logseq.db.sqlite.util :as sqlite-util]
@@ -45,31 +47,30 @@
      (state/set-current-repo! graph)
      (finished-ok-handler))))
 
-(defn- build-and-transact-import-edn
-  "Similar to db-based.export/import-submit"
+(defn- safe-build-edn-import [export-map import-options]
+  (try
+    (sqlite-export/build-import export-map (db/get-db) import-options)
+    (catch :default e
+      (js/console.error "Import EDN error: " e)
+      {:error "An unexpected error occurred building the import. See the javascript console for details."})))
+
+(defn- import-edn-data-from-file
+  "Similar to import-submit"
   [export-map]
-  (let [{:keys [init-tx block-props-tx misc-tx error] :as _txs}
-        (try
-          (sqlite-export/build-import export-map (db/get-db) {})
-          (catch :default e
-            (js/console.error "Import EDN error: " e)
-            {:error "An unexpected error occurred during import. See the javascript console for details."}))]
+  (let [{:keys [init-tx block-props-tx misc-tx error] :as _txs} (safe-build-edn-import export-map {})]
     ;; (cljs.pprint/pprint _txs)
     (if error
       (notification/show! error :error)
       (let [tx-meta {::sqlite-export/imported-data? true}
             repo (state/get-current-repo)]
-        (-> (p/do
-              (db/transact! repo init-tx tx-meta)
-              (when (seq block-props-tx)
-                (db/transact! repo block-props-tx tx-meta))
-              (when (seq misc-tx)
-                (db/transact! repo misc-tx tx-meta)))
-            (p/catch (fn [e]
-                       (js/console.error "Import EDN error: " e)
-                       (notification/show! "An unexpected error occurred during import. See the javascript console for details." :error))))))))
+        (p/do
+          (db/transact! repo init-tx tx-meta)
+          (when (seq block-props-tx)
+            (db/transact! repo block-props-tx tx-meta))
+          (when (seq misc-tx)
+            (db/transact! repo misc-tx tx-meta)))))))
 
-(defn import-from-edn!
+(defn import-from-edn-file!
   "Creates a new DB graph and imports sqlite.build EDN file"
   [bare-graph-name file-body finished-ok-handler]
   (let [graph (str config/db-version-prefix bare-graph-name)
@@ -91,11 +92,63 @@
            (state/add-repo! {:url graph})
            (repo-handler/restore-and-setup-repo! graph {:import-type :edn})
            (state/set-current-repo! graph)
-           (build-and-transact-import-edn edn-data)
+           (import-edn-data-from-file edn-data)
            (finished-ok-handler))
           (p/catch
            (fn [e]
              (js/console.error e)
              (notification/show! (str "Unexpected error: " (.-message e))
                                  :error)
-             (finished-error-handler)))))))
+             (finished-error-handler)))))))
+
+(defn- import-edn-data-from-form [import-inputs _e]
+  (let [export-map (try (edn/read-string (:import-data @import-inputs)) (catch :default _err ::invalid-import))
+        import-block? (::sqlite-export/block export-map)
+        block (when import-block?
+                (if-let [eid (:block-id (first (state/get-editor-args)))]
+                  (db/entity [:block/uuid eid])
+                  (notification/show! "No block found" :warning)))]
+    (if (= ::invalid-import export-map)
+      (notification/show! "The submitted EDN data is invalid! Please fix and try again." :warning)
+      (let [{:keys [init-tx block-props-tx misc-tx error] :as _txs}
+            (safe-build-edn-import export-map (when block {:current-block block}))]
+        ;; (cljs.pprint/pprint _txs)
+        (if error
+          (notification/show! error :error)
+          ;; TODO: When not import-block, use metadata that supports undo
+          (let [tx-meta (if import-block? {:outliner-op :save-block} {::sqlite-export/imported-data? true})
+                repo (state/get-current-repo)]
+            (-> (p/do
+                  (db/transact! repo init-tx tx-meta)
+                  (when (seq block-props-tx)
+                    (db/transact! repo block-props-tx tx-meta))
+                  (when (seq misc-tx)
+                    (db/transact! repo misc-tx tx-meta))
+                  (when-not import-block?
+                    (state/clear-async-query-state!)
+                    (ui-handler/re-render-root!)
+                    (notification/show! "Import successful!" :success)))
+                (p/catch (fn [e]
+                           (js/console.error "Import EDN error: " e)
+                           (notification/show! "An unexpected error occurred during import. See the javascript console for details." :error))))))
+        ;; Also close cmd-k
+        (shui/dialog-close-all!)))))
+
+(defn ^:export import-edn-data-dialog
+  "Displays dialog which allows users to paste and import sqlite.build EDN Data"
+  []
+  (let [import-inputs (atom {:import-data "" :import-block? false})]
+    (shui/dialog-open!
+     [:div
+      [:label.flex.my-2.text-lg "Import EDN Data"]
+      #_[:label.block.flex.items-center.py-3
+         (shui/checkbox {:on-checked-change #(swap! import-inputs update :import-block? not)})
+         [:small.pl-2 (str "Import into current block")]]
+      (shui/textarea {:placeholder "{}"
+                      :class "overflow-y-auto"
+                      :rows 10
+                      :auto-focus true
+                      :on-change (fn [^js e] (swap! import-inputs assoc :import-data (util/evalue e)))})
+      (shui/button {:class "mt-3"
+                    :on-click (partial import-edn-data-from-form import-inputs)}
+                   "Import")])))

src/main/frontend/modules/shortcut/config.cljs

@@ -627,7 +627,7 @@
 
    :misc/import-edn-data {:binding []
                           :db-graph? true
-                          :fn :frontend.handler.db-based.export/import-edn-data}
+                          :fn :frontend.handler.db-based.import/import-edn-data-dialog}
 
    :dev/validate-db   {:binding []
                        :db-graph? true