chore: split out class components from page

also fix LOG-2881

.clj-kondo/config.edn

@@ -48,6 +48,7 @@
              frontend.components.block.macros block-macros
              frontend.components.query query
              frontend.components.query.result query-result
+             frontend.components.class class-component
              frontend.config config
              frontend.date date
              frontend.db db

src/main/frontend/components/class.cljs

@@ -0,0 +1,101 @@
+(ns frontend.components.class
+  (:require [frontend.config :as config]
+            [frontend.db.model :as model]
+            [frontend.db :as db]
+            [frontend.handler.route :as route-handler]
+            [frontend.state :as state]
+            [frontend.ui :as ui]
+            [frontend.util :as util]
+            [rum.core :as rum]))
+
+(rum/defc class-select
+  [page class on-select]
+  (let [repo (state/get-current-repo)
+        children-pages (model/get-namespace-children repo (:db/id page))
+        ;; Disallows cyclic hierarchies
+        exclude-ids (-> (set (map (fn [id] (:block/uuid (db/entity id))) children-pages))
+                        (conj (:block/uuid page))) ; break cycle
+        classes (->> (model/get-all-classes repo)
+                     (remove (fn [[_name id]] (contains? exclude-ids id))))
+        options (sort-by :label
+                         (map (fn [[name id]] {:label name
+                                               :value id
+                                               :selected (= class id)})
+                              classes))
+        options (cons (if class
+                        {:label "Choose parent class"
+                         :value ""}
+                        {:label "Choose parent class"
+                         :disabled true
+                         :selected true
+                         :value ""})
+                      options)]
+    (ui/select options
+               (fn [_e value]
+                 (on-select value))
+               {:on-mouse-down
+                (fn [e]
+                  (when (util/meta-key? e)
+                    (if-let [page-name (:block/name (db/entity [:block/uuid (some-> (util/evalue e) uuid)]))]
+                      (do
+                        (route-handler/redirect-to-page! page-name)
+                        (.preventDefault e))
+                      (js/console.error "No selected option found to navigate to"))))})))
+
+(rum/defcs page-parent <
+  (rum/local false ::show?)
+  [state page parent]
+  (let [*show? (::show? state)
+        parent-id (:block/uuid parent)]
+    (if (or parent-id @*show?)
+      [:div.w-60
+       (class-select page parent-id (fn [value]
+                                      (if (seq value)
+                                        (db/transact!
+                                         [{:db/id (:db/id page)
+                                           :block/namespace [:block/uuid (uuid value)]}])
+                                        (db/transact!
+                                         [[:db.fn/retractAttribute (:db/id page) :block/namespace]]))))]
+      [:div.opacity-50.pointer.text-sm.cursor-pointer {:on-click #(reset! *show? true)}
+       "Empty"])))
+
+(rum/defcs configure < rum/reactive
+  "Configure a class page"
+  [state page]
+  (let [page-id (:db/id page)
+        page (when page-id (db/sub-block page-id))]
+    (when page
+      [:div.property-configure.grid.gap-2
+       [:h1.title.mb-4 "Configure class"]
+
+       [:div.grid.grid-cols-5.gap-1.items-center.class-parent
+        [:div.col-span-2 "Parent class:"]
+        (if config/publishing?
+          [:div.col-span-3
+           (if-let [parent-class (some-> (:db/id (:block/namespace page))
+                                         db/entity
+                                         :block/original-name)]
+             [:a {:on-click #(route-handler/redirect-to-page! parent-class)}
+              parent-class]
+             "None")]
+          [:div.col-span-3
+           (let [parent (some-> (:db/id (:block/namespace page))
+                                db/entity)]
+             (page-parent page parent))])]
+
+       (when (:block/namespace page)
+         (let [ancestor-pages (loop [namespaces [page]]
+                                (if-let [parent (:block/namespace (last namespaces))]
+                                  (recur (conj namespaces parent))
+                                  namespaces))
+               class-ancestors (map :block/original-name (reverse ancestor-pages))]
+           (when (> (count class-ancestors) 2)
+             [:div.grid.grid-cols-5.gap-1.items-center.class-ancestors
+              [:div.col-span-2 "Ancestor classes:"]
+              [:div.col-span-3
+               (interpose [:span.opacity-50.text-sm " > "]
+                          (map (fn [class-name]
+                                 (if (= class-name (:block/original-name page))
+                                   [:span class-name]
+                                   [:a {:on-click #(route-handler/redirect-to-page! class-name)} class-name]))
+                               class-ancestors))]])))])))

src/main/frontend/components/page.cljs

@@ -11,6 +11,7 @@
             [frontend.components.scheduled-deadlines :as scheduled]
             [frontend.components.property :as property]
             [frontend.components.property.value :as pv]
+            [frontend.components.class :as class-component]
             [frontend.handler.property.util :as pu]
             [frontend.handler.property :as property-handler]
             [frontend.components.svg :as svg]
@@ -334,7 +335,6 @@
                      (reset! *configuring? false)
                      (reset! *hover? false)))})))
 
-(declare configure)
 (declare page-properties)
 
 (rum/defcs page-configure-inner <
@@ -366,7 +366,7 @@
         :else
         [:<>
          (when class?
-           (configure page {}))
+           (class-component/configure page))
          (when class?
            (page-properties page page-opts))
          (when (and property? (not class?))
@@ -551,100 +551,6 @@
                          "control-show cursor-pointer" "control-hide")}
     (ui/rotating-arrow @*all-collapsed?)]])
 
-(rum/defc class-select
-  [page class on-select]
-  (let [repo (state/get-current-repo)
-        children-pages (model/get-namespace-children repo (:db/id page))
-        ;; Disallows cyclic hierarchies
-        exclude-ids (-> (set (map (fn [id] (:block/uuid (db/entity id))) children-pages))
-                        (conj (:block/uuid page))) ; break cycle
-        classes (->> (model/get-all-classes repo)
-                     (remove (fn [[_name id]] (contains? exclude-ids id))))
-        options (sort-by :label
-                         (map (fn [[name id]] {:label name
-                                               :value id
-                                               :selected (= class id)})
-                              classes))
-        options (cons (if class
-                        {:label "Choose parent class"
-                         :value ""}
-                        {:label "Choose parent class"
-                         :disabled true
-                         :selected true
-                         :value ""})
-                      options)]
-    (ui/select options
-               (fn [_e value]
-                 (on-select value))
-               {:on-mouse-down
-                (fn [e]
-                  (when (util/meta-key? e)
-                    (if-let [page-name (:block/name (db/entity [:block/uuid (some-> (util/evalue e) uuid)]))]
-                      (do
-                        (route-handler/redirect-to-page! page-name)
-                        (.preventDefault e))
-                      (js/console.error "No selected option found to navigate to"))))})))
-
-(rum/defcs page-parent <
-  (rum/local false ::show?)
-  [state page parent]
-  (let [*show? (::show? state)
-        parent-id (:block/uuid parent)]
-    (if (or parent-id @*show?)
-      [:div.w-60
-       (class-select page parent-id (fn [value]
-                                      (if (seq value)
-                                        (db/transact!
-                                         [{:db/id (:db/id page)
-                                           :block/namespace [:block/uuid (uuid value)]}])
-                                        (db/transact!
-                                         [[:db.fn/retractAttribute (:db/id page) :block/namespace]]))))]
-      [:div.opacity-50.pointer.text-sm.cursor-pointer {:on-click #(reset! *show? true)}
-       "Empty"])))
-
-(rum/defcs configure < rum/reactive
-  [state page _opts]
-  (let [page-id (:db/id page)
-        page (when page-id (db/sub-block page-id))
-        types (:block/type page)
-        class? (contains? types "class")]
-    (when page
-      [:div.property-configure.grid.gap-2
-       [:h1.title.mb-4 "Configure page"]
-
-       (when class?
-         [:div.grid.grid-cols-5.gap-1.items-center.class-parent
-          [:div.col-span-2 "Parent class:"]
-          (if config/publishing?
-            [:div.col-span-3
-             (if-let [parent-class (some-> (:db/id (:block/namespace page))
-                                           db/entity
-                                           :block/original-name)]
-               [:a {:on-click #(route-handler/redirect-to-page! parent-class)}
-                parent-class]
-               "None")]
-            [:div.col-span-3
-             (let [parent (some-> (:db/id (:block/namespace page))
-                                  db/entity)]
-               (page-parent page parent))])])
-
-       (when (and class? (:block/namespace page))
-         (let [ancestor-pages (loop [namespaces [page]]
-                                (if-let [parent (:block/namespace (last namespaces))]
-                                  (recur (conj namespaces parent))
-                                  namespaces))
-               class-ancestors (map :block/original-name (reverse ancestor-pages))]
-           (when (> (count class-ancestors) 2)
-             [:div.grid.grid-cols-5.gap-1.items-center.class-ancestors
-              [:div.col-span-2 "Ancestor classes:"]
-              [:div.col-span-3
-               (interpose [:span.opacity-50.text-sm " > "]
-                          (map (fn [class-name]
-                                 (if (= class-name (:block/original-name page))
-                                   [:span class-name]
-                                   [:a {:on-click #(route-handler/redirect-to-page! class-name)} class-name]))
-                               class-ancestors))]])))])))
-
 (rum/defc page-properties < rum/reactive
   [page {:keys [configure? show-page-properties?]}]
   (let [types (:block/type page)

src/main/frontend/components/search.cljs

@@ -122,7 +122,7 @@
     (let [search-q' (subs search-q 1)]
       (page-handler/create! search-q' {:class? true
                                        :redirect? false})
-      (state/pub-event! [:class/configure (db/entity [:block/name (util/page-name-sanity-lc search-q')]) {}]))
+      (state/pub-event! [:class/configure (db/entity [:block/name (util/page-name-sanity-lc search-q')])]))
 
     :new-whiteboard
     (whiteboard-handler/create-new-whiteboard-and-redirect! search-q)

src/main/frontend/handler/events.cljs

@@ -11,6 +11,7 @@
             [clojure.set :as set]
             [clojure.string :as string]
             [frontend.commands :as commands]
+            [frontend.components.class :as class-component]
             [frontend.components.command-palette :as command-palette]
             [frontend.components.conversion :as conversion-component]
             [frontend.components.diff :as diff]
@@ -893,10 +894,10 @@
    {:id :new-db-graph
     :label "graph-setup"}))
 
-(defmethod handle :class/configure [[_ page opts]]
+(defmethod handle :class/configure [[_ page]]
   (state/set-modal!
    #(vector :<>
-            (page/configure page opts)
+            (class-component/configure page)
             (page/page-properties page {:configure? true}))
    {:id :page-configure
     :label "page-configure"