Explorar o código

Fix lints and fix graph-parser cljs tests

not running due to missing db dep
Gabriel Horner %!s(int64=2) %!d(string=hai) anos
pai
achega
4920b3a98e

+ 4 - 0
.carve/ignore

@@ -85,3 +85,7 @@ frontend.fs.sync/debug-print-sync-events-loop
 frontend.fs.sync/stop-debug-print-sync-events-loop
 ;; Used in macro
 frontend.state/get-current-edit-block-and-position
+;; For debugging
+frontend.db.model/get-all-classes
+;; Repl fn
+frontend.db.sync/export-as-blocks

+ 2 - 1
deps/db/deps.edn

@@ -1,6 +1,7 @@
 {:deps
  ;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
- {datascript/datascript {:mvn/version "1.3.8"}}
+ {datascript/datascript {:mvn/version "1.3.8"}
+  com.cognitect/transit-cljs {:mvn/version "0.8.280"}}
  :aliases
  {:clj-kondo
   {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2023.05.26"}}

+ 2 - 8
src/electron/electron/utils.cljs

@@ -7,9 +7,7 @@
             [electron.configs :as cfgs]
             [electron.logger :as logger]
             [cljs-bean.core :as bean]
-            [promesa.core :as p]
-            [cljs-time.coerce :as tc]
-            [cljs-time.core :as t]))
+            [promesa.core :as p]))
 
 (defonce *win (atom nil)) ;; The main window
 
@@ -275,8 +273,4 @@
     (js/decodeURIComponent uri)
     (catch :default _
       (println "decodeURIComponent failed: " uri)
-      uri)))
-
-(defn time-ms
-  []
-  (tc/to-long (t/now)))
+      uri)))

+ 1 - 3
src/main/frontend/components/page.cljs

@@ -9,7 +9,6 @@
             [frontend.components.plugins :as plugins]
             [frontend.components.reference :as reference]
             [frontend.components.svg :as svg]
-            [frontend.components.property :as property]
             [frontend.components.scheduled-deadlines :as scheduled]
             [frontend.config :as config]
             [frontend.context.i18n :refer [t]]
@@ -1149,12 +1148,11 @@
                      :on-change #(to-page %))]])]))
 
 (rum/defcs configure < rum/reactive
-  [state repo page]
+  [state page]
   (let [page-id (:db/id page)
         page (when page-id (db/sub-block page-id))
         type (:block/type page)
         class? (= "class" type)
-        property? (= "property" type)
         journal? (:block/journal? page)]
     (when page
       [:div.page-configure

+ 9 - 21
src/main/frontend/components/property.cljs

@@ -5,14 +5,12 @@
             [frontend.handler.property :as property-handler]
             [frontend.handler.editor :as editor-handler]
             [frontend.handler.page :as page-handler]
-            [frontend.handler.ui :as ui-handler]
             [frontend.db :as db]
             [frontend.db.model :as model]
             [frontend.config :as config]
             [rum.core :as rum]
             [frontend.state :as state]
             [frontend.mixins :as mixins]
-            [clojure.edn :as edn]
             [clojure.string :as string]
             [goog.dom :as gdom]
             [frontend.search :as search]
@@ -21,22 +19,20 @@
             [frontend.modules.shortcut.core :as shortcut]
             [frontend.components.select :as select]
             [medley.core :as medley]
-            [cljs-time.coerce :as tc]
-            [frontend.date :as date]))
+            [cljs-time.coerce :as tc]))
 
 (rum/defcs property-config <
   rum/static
   (rum/local nil ::property-name)
   (rum/local nil ::property-schema)
   {:will-mount (fn [state]
-                 (let [[repo property] (:rum/args state)]
+                 (let [[_repo property] (:rum/args state)]
                    (reset! (::property-name state) (:block/original-name property))
                    (reset! (::property-schema state) (:block/schema property))
                    state))}
   [state repo property ]
   (let [*property-name (::property-name state)
-        *property-schema (::property-schema state)
-        type (:type @*property-schema)]
+        *property-schema (::property-schema state)]
     [:div.property-configure
      [:h1.title "Configure property"]
 
@@ -213,8 +209,7 @@
 
 (defn- select
   [block property]
-  (let [repo (state/get-current-repo)
-        items (->> (model/get-block-property-values (:block/uuid property))
+  (let [items (->> (model/get-block-property-values (:block/uuid property))
                    (mapcat (fn [[_id value]]
                              (if (coll? value)
                                (map (fn [v] {:value v}) value)
@@ -411,7 +406,7 @@
                  (property-handler/set-editing-new-property! nil))
       :node (js/document.getElementById "edit-new-property")
       :outside? false)))
-  [state repo block edit-input-id properties new-property? opts]
+  [state block edit-input-id properties new-property? opts]
   (let [*property-key (::property-key state)
         *property-value (::property-value state)]
     (cond
@@ -443,14 +438,9 @@
      (:block/original-name property)]))
 
 (rum/defcs multiple-value-item < (rum/local false ::show-close?)
-  [state entity property items item {:keys [dom-id editor-id
-                                            page-cp inline-text
-                                            new-item?
-                                            parsed-value]
+  [state entity property items item {:keys [editor-id new-item?]
                                      :as opts}]
   (let [*show-close? (::show-close? state)
-        object? (= :object (:type (:block/schema property)))
-        block (when object? (db/pull [:block/uuid item]))
         editing? (state/sub [:editor/editing? editor-id])]
     [:div.flex.flex-1.flex-row {:on-mouse-over #(reset! *show-close? true)
                                 :on-mouse-out  #(reset! *show-close? false)}
@@ -476,7 +466,6 @@
         editor-id (str "ls-property-" (:blocks-container-id opts) "-" (:db/id block) "-" (:db/id property))
         schema (:block/schema property)
         multiple-values? (= :many (:cardinality schema))
-        type (:type schema)
         editor-args {:block property
                      :parent-block block
                      :format :markdown}]
@@ -485,7 +474,7 @@
       (let [items (if (coll? v) v (when v [v]))
             v' (if (seq items) items [""])
             v' (conj v' ::new-value-placeholder) ; new one
-            editor-id' (str editor-id (count v'))]
+            ]
         [:div.grid.gap-1
          (for [[idx item] (medley/indexed v')]
            (let [dom-id' (str dom-id "-" idx)
@@ -539,8 +528,7 @@
 
 (rum/defcs properties-area < rum/reactive
   [state target-block edit-input-id opts]
-  (let [repo (state/get-current-repo)
-        block (resolve-instance-page-if-exists target-block)
+  (let [block (resolve-instance-page-if-exists target-block)
         properties (if (and (:class-schema? opts) (:block/schema block))
                      (let [properties (:properties (:block/schema block))]
                        (map (fn [k] [k nil]) properties))
@@ -578,4 +566,4 @@
              [:div
               [:a.mr-2 (str prop-uuid-or-built-in-prop)]
               [:span v]])))
-       (new-property repo block edit-input-id properties new-property? opts)])))
+       (new-property block edit-input-id properties new-property? opts)])))

+ 0 - 1
src/main/frontend/db/restore.cljs

@@ -11,7 +11,6 @@
             [frontend.db.utils :as db-utils]
             [frontend.state :as state]
             [goog.object :as gobj]
-            [logseq.db.default :as default-db]
             [logseq.db.schema :as db-schema]
             [logseq.db.sqlite.restore :as sqlite-restore]
             [promesa.core :as p]

+ 3 - 5
src/main/frontend/db/sync.cljs

@@ -1,11 +1,9 @@
-(ns frontend.db.sync
+(ns ^:no-doc frontend.db.sync
   (:require [datascript.core :as d]
-            [frontend.db.conn :as conn]
-            [frontend.state :as state]))
+            [frontend.db.conn :as conn]))
 
 
-
-(defn- export-as-blocks
+(defn export-as-blocks
   [repo]
   (let [db (conn/get-db repo)
         datoms (d/datoms db :eavt)]

+ 0 - 2
src/main/frontend/handler/editor/lifecycle.cljs

@@ -6,8 +6,6 @@
             [frontend.util :as util]
             [goog.dom :as gdom]
             [dommy.core :as d]
-            [goog.object :as gobj]
-            [clojure.string :as string]
             [frontend.db :as db]))
 
 (defn did-mount!

+ 1 - 2
src/main/frontend/handler/events.cljs

@@ -980,8 +980,7 @@
     (editor-handler/toggle-blocks-as-own-order-list! blocks)))
 
 (defmethod handle :page/configure [[_ page]]
-  (when-let [repo (state/get-current-repo)]
-    (state/set-modal! #(page/configure repo page))))
+  (state/set-modal! #(page/configure page)))
 
 (defn run!
   []

+ 3 - 8
src/main/frontend/handler/property.cljs

@@ -5,18 +5,12 @@
             [clojure.set :as set]
             [frontend.db :as db]
             [frontend.db.model :as model]
-            [frontend.format.block :as block]
             [frontend.handler.notification :as notification]
             [frontend.modules.outliner.core :as outliner-core]
-            [frontend.modules.outliner.transaction :as outliner-tx]
             [frontend.state :as state]
             [frontend.util :as util]
-            [logseq.graph-parser.block :as gp-block]
-            [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.util :as gp-util]
-            [logseq.graph-parser.util.page-ref :as page-ref]
             [malli.util :as mu]
-            [malli.core :as m]
             [malli.error :as me]))
 
 ;; TODO:
@@ -68,8 +62,9 @@
 ;; schema -> type, cardinality, object's class
 ;;           min, max -> string length, number range, cardinality size limit
 
-(def builtin-schema->type
-  (set/map-invert builtin-schema-types))
+;; TODO: Enable or delete if unused
+#_(def builtin-schema->type
+    (set/map-invert builtin-schema-types))
 
 (defn- infer-schema-from-input-string
   [v-str]

+ 1 - 1
src/main/frontend/ui.cljs

@@ -152,7 +152,7 @@
                (reset! (:open? state) true)))
            state)}
   [state content-fn modal-content-fn
-   & [{:keys [modal-class z-index trigger-class initial-open?]
+   & [{:keys [modal-class z-index trigger-class]
        :or   {z-index 999}}]]
   (let [{:keys [open?]} state
         modal-content (modal-content-fn state)