Browse Source

Add rtc test group

Tienson Qin 4 months ago
parent
commit
9abe6864c1

+ 1 - 1
src/main/frontend/components/header.cljs

@@ -397,7 +397,7 @@
                   (ldb/get-graph-rtc-uuid (db/get-db))
                   (user-handler/logged-in?)
                   (config/db-based-graph? current-repo)
-                  (user-handler/team-member?))
+                  (user-handler/rtc-group?))
          [:<>
           (recent-slider)
           (rum/with-key (rtc-collaborators)

+ 2 - 3
src/main/frontend/components/repo.cljs

@@ -213,8 +213,7 @@
                 :on-click #(state/pub-event! [:graph/setup-a-repo]))]))])]
 
       (when (and (or (file-sync/enable-sync?)
-                     (state/enable-rtc?)
-                     (user-handler/team-member?))
+                     (user-handler/rtc-group?))
                  login?)
         [:div
          [:hr]
@@ -485,7 +484,7 @@
        :ref input-ref
        :placeholder "your graph name"
        :on-key-down submit!})
-     (when (user-handler/team-member?)
+     (when (user-handler/rtc-group?)
        [:div.flex.flex-row.items-center.gap-1
         (shui/checkbox
          {:id "rtc-sync"

+ 0 - 17
src/main/frontend/components/settings.cljs

@@ -860,19 +860,6 @@
                        [:div (t :settings-page/sync-diff-merge-desc)]
                        [:div (t :settings-page/sync-diff-merge-warn)]])}))
 
-(rum/defc rtc-enabled-switcher
-  [enabled?]
-  (ui/toggle enabled?
-             (fn []
-               (let [value (not enabled?)]
-                 (state/set-rtc-enabled! value)))
-             true))
-
-(defn rtc-switcher-row [enabled?]
-  (row-with-button-action
-   {:left-label "RTC"
-    :action (rtc-enabled-switcher enabled?)}))
-
 (rum/defc whiteboards-enabled-switcher
   [enabled?]
   (ui/toggle enabled?
@@ -1107,10 +1094,6 @@
        (http-server-switcher-row))
      (flashcards-switcher-row enable-flashcards?)
      (when-not db-based? (zotero-settings-row))
-     (when (and (config/db-based-graph? current-repo)
-                (user-handler/team-member?))
-       ;; FIXME: Wire this up again to RTC init calls
-       (rtc-switcher-row (state/enable-rtc?)))
      (when-not web-platform?
        [:div.mt-1.sm:mt-0.sm:col-span-2
         [:hr]

+ 3 - 2
src/main/frontend/handler/user.cljs

@@ -5,6 +5,7 @@
             [cljs-time.coerce :as tc]
             [cljs-time.core :as t]
             [cljs.core.async :as async :refer [<! go]]
+            [clojure.set :as set]
             [clojure.string :as string]
             [frontend.common.missionary :as c.m]
             [frontend.config :as config]
@@ -281,9 +282,9 @@
 
 ;;; user groups
 
-(defn team-member?
+(defn rtc-group?
   []
-  (contains? (state/user-groups) "team"))
+  (set/intersection (state/user-groups) #{"team" "rtc_2025_07_10"}))
 
 (defn alpha-user?
   []

+ 0 - 10
src/main/frontend/state.cljs

@@ -326,7 +326,6 @@
       :ui/cached-key->container-id           (atom {})
       :feature/enable-sync?                  (storage/get :logseq-sync-enabled)
       :feature/enable-sync-diff-merge?       ((fnil identity true) (storage/get :logseq-sync-diff-merge-enabled))
-      :feature/enable-rtc?                   (storage/get :logseq-rtc-enabled)
 
       :file/rename-event-chan                (async/chan 100)
       :ui/find-in-page                       nil
@@ -748,10 +747,6 @@ Similar to re-frame subscriptions"
   ([repo]
    (not (false? (:feature/enable-whiteboards? (sub-config repo))))))
 
-(defn enable-rtc?
-  []
-  (sub :feature/enable-rtc?))
-
 (defn enable-git-auto-push?
   [repo]
   (not (false? (:git-auto-push (sub-config repo)))))
@@ -2362,8 +2357,3 @@ Similar to re-frame subscriptions"
   [days]
   (reset! (:ui/highlight-recent-days @state) days)
   (storage/set :ui/highlight-recent-days days))
-
-(defn set-rtc-enabled!
-  [value]
-  (storage/set :logseq-rtc-enabled value)
-  (set-state! :feature/enable-rtc? value))

+ 1 - 2
src/main/mobile/components/app.cljs

@@ -132,8 +132,7 @@
                     [:div.flex.flex-row.items-center.gap-2.text-muted-foreground
                      (when (and repo
                                 (ldb/get-graph-rtc-uuid (db/get-db))
-                                (user-handler/logged-in?)
-                                (user-handler/team-member?))
+                                (user-handler/logged-in?))
                        (rtc-indicator/indicator))]))))
 
    ;; main content