From e41adc6399afecb6cf6ff37c6f15f8f1ef435759 Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Thu, 17 Aug 2023 09:41:27 -0400 Subject: [PATCH] Disable more property editing for publishing app Also fix some minor lints --- deps/db/src/logseq/db/sqlite/restore.cljs | 5 ++--- scripts/src/logseq/tasks/dev/publishing.cljs | 2 -- src/main/frontend/components/property.cljs | 9 +++++---- src/main/frontend/components/property/value.cljs | 7 ++++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/deps/db/src/logseq/db/sqlite/restore.cljs b/deps/db/src/logseq/db/sqlite/restore.cljs index 812f6a20f..4b8f0cbd5 100644 --- a/deps/db/src/logseq/db/sqlite/restore.cljs +++ b/deps/db/src/logseq/db/sqlite/restore.cljs @@ -104,9 +104,8 @@ blocks-eav-colls (->> (concat all-blocks' journal-blocks' init-data') (apply concat)) all-eav-coll (doall (concat pages-eav-coll blocks-eav-colls)) - datoms (map - (partial eav->datom uuid->db-id-map) - all-eav-coll) + datoms (map (partial eav->datom uuid->db-id-map) + all-eav-coll) db-conn (conn-from-datoms-fn datoms db-schema/schema-for-db-based-graph)] {:conn db-conn :uuid->db-id-map uuid->db-id-map diff --git a/scripts/src/logseq/tasks/dev/publishing.cljs b/scripts/src/logseq/tasks/dev/publishing.cljs index a240a0fdb..c29130662 100644 --- a/scripts/src/logseq/tasks/dev/publishing.cljs +++ b/scripts/src/logseq/tasks/dev/publishing.cljs @@ -3,11 +3,9 @@ (:require [logseq.graph-parser.cli :as gp-cli] [logseq.publishing :as publishing] [logseq.db.sqlite.db :as sqlite-db] - [logseq.db.sqlite.restore :as sqlite-restore] [logseq.db.sqlite.cli :as sqlite-cli] ["fs" :as fs] ["path" :as node-path] - [cljs-bean.core :as bean] [clojure.edn :as edn] [datascript.core :as d])) diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs index 4dd1dc62d..28477d482 100644 --- a/src/main/frontend/components/property.cljs +++ b/src/main/frontend/components/property.cljs @@ -255,10 +255,11 @@ [:div#edit-new-property (property-input block *property-key *property-value opts)] - (or (:page-configure? opts) - (seq properties) - (seq (:block/alias block)) - (seq (:block/tags block))) + (and (or (:page-configure? opts) + (seq properties) + (seq (:block/alias block)) + (seq (:block/tags block))) + (not config/publishing?)) [:div [:a.add-button-link {:title "Add another property" diff --git a/src/main/frontend/components/property/value.cljs b/src/main/frontend/components/property/value.cljs index 2a4fd4077..ba686d68a 100644 --- a/src/main/frontend/components/property/value.cljs +++ b/src/main/frontend/components/property/value.cljs @@ -2,6 +2,7 @@ (:require [cljs-time.coerce :as tc] [clojure.string :as string] [frontend.components.select :as select] + [frontend.config :as config] [frontend.date :as date] [frontend.db :as db] [frontend.db-mixins :as db-mixins] @@ -398,7 +399,7 @@ (rum/defc delete-value-button < rum/reactive [entity property item] (let [editing? (state/sub :editor/editing?)] - (when-not editing? + (when-not (or editing? config/publishing?) [:a.close.fade-in {:class "absolute top-0 right-0" :title "Delete this value" @@ -483,12 +484,12 @@ [:div.rounded-sm {:on-click (fn [] (reset! *add-new-item? true))} [:div.opacity-50.text-sm "Input something"]] - (and @*show-add? row?) + (and @*show-add? row? (not config/publishing?)) [:a.add-button-link.flex {:on-click (fn [] (reset! *add-new-item? true))} (ui/icon "circle-plus")] - (and @*show-add? block?) + (and @*show-add? block? (not config/publishing?)) (multiple-blocks-add-button block property opts))])) (rum/defc property-value < rum/reactive