Skip to content

Commit 3c97f9b

Browse files
committed
enhance: show remote-graphs in All graphs when rtc-enabled
1 parent 8327ad5 commit 3c97f9b

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

src/main/frontend/components/repo.cljs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@
180180
(t :open-a-directory)
181181
:on-click #(state/pub-event! [:graph/setup-a-repo]))]))]]
182182

183-
(when (and (file-sync/enable-sync?) login?)
183+
(when (and (or (file-sync/enable-sync?)
184+
(state/enable-rtc?))
185+
login?)
184186
[:div
185187
[:hr]
186188
[:div.flex.align-items.justify-between

src/main/frontend/components/settings.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@
876876
(ui/toggle enabled?
877877
(fn []
878878
(let [value (not enabled?)]
879-
(config-handler/set-config! :feature/enable-rtc? value)))
879+
(state/set-rtc-enabled! value)))
880880
true))
881881

882882
(defn rtc-switcher-row [enabled?]
@@ -1121,7 +1121,7 @@
11211121
(when (and (config/db-based-graph? current-repo)
11221122
(user-handler/team-member?))
11231123
;; FIXME: Wire this up again to RTC init calls
1124-
(rtc-switcher-row (state/enable-rtc? current-repo)))
1124+
(rtc-switcher-row (state/enable-rtc?)))
11251125
(when-not web-platform?
11261126
[:div.mt-1.sm:mt-0.sm:col-span-2
11271127
[:hr]

src/main/frontend/state.cljs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@
303303
:ui/cached-key->container-id (atom {})
304304
:feature/enable-sync? (storage/get :logseq-sync-enabled)
305305
:feature/enable-sync-diff-merge? ((fnil identity true) (storage/get :logseq-sync-diff-merge-enabled))
306+
:feature/enable-rtc? (storage/get :logseq-rtc-enabled)
306307

307308
:file/rename-event-chan (async/chan 100)
308309
:ui/find-in-page nil
@@ -746,8 +747,8 @@ Similar to re-frame subscriptions"
746747
(not (false? (:feature/enable-whiteboards? (sub-config repo))))))
747748

748749
(defn enable-rtc?
749-
[repo]
750-
(:feature/enable-rtc? (sub-config repo)))
750+
[]
751+
(sub :feature/enable-rtc?))
751752

752753
(defn enable-git-auto-push?
753754
[repo]
@@ -2371,3 +2372,8 @@ Similar to re-frame subscriptions"
23712372
(prn :debug :set :days days)
23722373
(reset! (:ui/highlight-recent-days @state) days)
23732374
(storage/set :ui/highlight-recent-days days))
2375+
2376+
(defn set-rtc-enabled!
2377+
[value]
2378+
(storage/set :logseq-rtc-enabled value)
2379+
(set-state! :feature/enable-rtc? value))

0 commit comments

Comments
 (0)