Browse Source

fix: unlink graph

Tienson Qin 1 year ago
parent
commit
f86f3a58c7
2 changed files with 2 additions and 22 deletions
  1. 1 1
      src/main/frontend/db/conn.cljs
  2. 1 21
      src/main/frontend/handler.cljs

+ 1 - 1
src/main/frontend/db/conn.cljs

@@ -25,7 +25,7 @@
      (get-db (state/get-current-repo) repo-or-deref?)
      (get-db repo-or-deref? true)))
   ([repo deref?]
-   (let [repo (if repo repo (state/get-current-repo))]
+   (when-let [repo (or repo (state/get-current-repo))]
      (when-let [conn (db-conn-state/get-conn repo)]
        (if deref?
          @conn

+ 1 - 21
src/main/frontend/handler.cljs

@@ -1,8 +1,7 @@
 (ns frontend.handler
   "Main ns that handles application startup. Closest ns that we have to a
   system. Contains a couple of small system components"
-  (:require [cljs.reader :refer [read-string]]
-            [electron.ipc :as ipc]
+  (:require [electron.ipc :as ipc]
             [electron.listener :as el]
             [frontend.components.block :as block]
             [frontend.components.editor :as editor]
@@ -12,7 +11,6 @@
             [frontend.config :as config]
             [frontend.context.i18n :as i18n]
             [frontend.db.restore :as db-restore]
-            [frontend.db.conn :as conn]
             [frontend.db.react :as react]
             [frontend.error :as error]
             [frontend.handler.command-palette :as command-palette]
@@ -112,22 +110,6 @@
   (js/window.addEventListener "online" handle-connection-change)
   (js/window.addEventListener "offline" handle-connection-change))
 
-(defn enable-datalog-console
-  "Enables datalog console in browser provided by https://github.com/homebaseio/datalog-console"
-  []
-  (js/document.documentElement.setAttribute "__datalog-console-remote-installed__" true)
-  (.addEventListener js/window "message"
-                     (fn [event]
-                       (let [db (conn/get-db)]
-                         (when-let [devtool-message (gobj/getValueByKeys event "data" ":datalog-console.client/devtool-message")]
-                           (let [msg-type (:type (read-string devtool-message))]
-                             (case msg-type
-
-                               :datalog-console.client/request-whole-database-as-string
-                               (.postMessage js/window #js {":datalog-console.remote/remote-message" (pr-str db)} "*")
-
-                               nil)))))))
-
 (defn- register-components-fns!
   []
   (state/set-page-blocks-cp! page/page-cp)
@@ -200,8 +182,6 @@
 
    (util/<app-wake-up-from-sleep-loop (atom false))
 
-   (when config/dev?
-     (enable-datalog-console))
    (persist-var/load-vars)))
 
 (defn stop! []