Skip to content

fix(publishing): exclude desktop restart calls from publishing builds #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soizo wants to merge 1 commit into
base: version/file
Choose a base branch
from
Open

fix(publishing): exclude desktop restart calls from publishing builds #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/frontend/components/assets.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
(rum/defc restart-button
[]
(ui/button (t :plugin/restart)
:on-click #(js/logseq.api.relaunch)
:on-click #(when-not config/publishing?
(js/logseq.api.relaunch))
:small? true :intent "logseq"))

(rum/defcs ^:large-vars/data-var alias-directories
Expand Down Expand Up @@ -215,7 +216,8 @@
#(state/set-assets-alias-enabled! (not alias-enabled?))
true)]
[:span
(when alias-enabled-changed? (restart-button))]]
(when (and (not config/publishing?) alias-enabled-changed?)
(restart-button))]]

(when alias-enabled?
[:div.pt-4
Expand Down
30 changes: 18 additions & 12 deletions src/main/frontend/components/settings.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,9 @@
(fn []
(state/set-state! [:electron/user-cfgs :spell-check] (not enabled?))
(p/then (ipc/ipc :userAppCfgs :spell-check (not enabled?))
#(when (js/confirm (t :relaunch-confirm-to-work))
(js/logseq.api.relaunch))))
#(when-not config/publishing?
(when (js/confirm (t :relaunch-confirm-to-work))
(js/logseq.api.relaunch)))))
true)]]]))

(rum/defcs switch-git-auto-commit-row < rum/reactive
Expand Down Expand Up @@ -608,7 +609,8 @@
(ui/toggle on? on-toggle true)
(when (not= (boolean value) on?)
(ui/button (t :plugin/restart)
:on-click #(js/logseq.api.relaunch)
:on-click #(when-not config/publishing?
(js/logseq.api.relaunch))
:small? true :intent "logseq"))]))

(rum/defc http-server-enabled-switcher
Expand All @@ -622,7 +624,8 @@
(ui/toggle on? on-toggle true)
(when (not= (boolean value) on?)
(ui/button (t :plugin/restart)
:on-click #(js/logseq.api.relaunch)
:on-click #(when-not config/publishing?
(js/logseq.api.relaunch))
:small? true :intent "logseq"))]))

(rum/defc flashcards-enabled-switcher
Expand Down Expand Up @@ -696,10 +699,11 @@
"native-titlebar"
(t :settings-page/native-titlebar)
enabled?
#(when (js/confirm (t :relaunch-confirm-to-work))
(state/set-state! [:electron/user-cfgs :window/native-titlebar?] (not enabled?))
(ipc/ipc :userAppCfgs :window/native-titlebar? (not enabled?))
(js/logseq.api.relaunch))
#(when-not config/publishing?
(when (js/confirm (t :relaunch-confirm-to-work))
(state/set-state! [:electron/user-cfgs :window/native-titlebar?] (not enabled?))
(ipc/ipc :userAppCfgs :window/native-titlebar? (not enabled?))
(js/logseq.api.relaunch)))
[:span.text-sm.opacity-50 (t :settings-page/native-titlebar-desc)])))

(rum/defcs settings-general < rum/reactive
Expand All @@ -714,7 +718,8 @@
(version-row t version)
(language-row t preferred-language)
(theme-modes-row t switch-theme system-theme? dark?)
(when (and (util/electron?) (not util/mac?)) (native-titlebar-row t))
(when (and (not config/publishing?) (util/electron?) (not util/mac?))
(native-titlebar-row t))
(when show-radix-themes? (accent-color-row false))
(when (config/global-config-enabled?) (edit-global-config-edn))
(when current-repo (edit-config-edn))
Expand Down Expand Up @@ -744,7 +749,8 @@
;; (enable-block-timestamps-row t enable-block-timestamps?)
(show-brackets-row t show-brackets?)

(when (util/electron?) (switch-spell-check-row t))
(when (and (not config/publishing?) (util/electron?))
(switch-spell-check-row t))
(outdenting-row t logical-outdenting?)
(showing-full-blocks t show-full-blocks?)
(preferred-pasting-file t preferred-pasting-file?)
Expand Down Expand Up @@ -1055,9 +1061,9 @@
(when (= "Enter" (util/ekey e))
(update-home-page e)))}]]]])
(whiteboards-switcher-row enable-whiteboards?)
(when (and (util/electron?) config/feature-plugin-system-on?)
(when (and (not config/publishing?) (util/electron?) config/feature-plugin-system-on?)
(plugin-system-switcher-row))
(when (util/electron?)
(when (and (not config/publishing?) (util/electron?))
(http-server-switcher-row))
(flashcards-switcher-row enable-flashcards?)
(zotero-settings-row)
Expand Down
Loading