✨ Simplify users loading on dashboard and workspace.

And fix some issues on teams settings page.

backend/src/app/services/queries/files.clj

@@ -185,39 +185,6 @@
     (let [file (retrieve-file conn file-id)]
       (get-in file [:data :pages-index id]))))
 
-;; --- Query: File users
-
-(def ^:private sql:file-users
-  "select pf.id, pf.fullname, pf.photo
-     from profile as pf
-    inner join file_profile_rel as fpr on (fpr.profile_id = pf.id)
-    where fpr.file_id = ?
-    union
-   select pf.id, pf.fullname, pf.photo
-     from profile as pf
-    inner join project_profile_rel as ppr on (ppr.profile_id = pf.id)
-    inner join file as f on (f.project_id = ppr.project_id)
-    where f.id = ?
-    union
-   select pf.id, pf.fullname, pf.photo
-     from profile as pf
-    inner join team_profile_rel as tpr on (tpr.profile_id = pf.id)
-    inner join project as p on (tpr.team_id = p.team_id)
-    inner join file as f on (p.id = f.project_id)
-    where f.id = ?")
-
-(defn retrieve-file-users
-  [conn id]
-  (db/exec! conn [sql:file-users id id id]))
-
-(s/def ::file-users
-  (s/keys :req-un [::profile-id ::id]))
-
-(sq/defquery ::file-users
-  [{:keys [profile-id id] :as params}]
-  (db/with-atomic [conn db/pool]
-    (check-edition-permissions! conn profile-id id)
-    (retrieve-file-users conn id)))
 
 ;; --- Query: Shared Library Files
 

backend/src/app/services/queries/teams.clj

@@ -131,8 +131,29 @@
   [conn team-id]
   (db/exec! conn [sql:team-members team-id]))
 
+
 ;; --- Query: Team Users
 
+(declare retrieve-users)
+(declare retrieve-team-for-file)
+
+(s/def ::file-id ::us/uuid)
+(s/def ::team-users
+  (s/and (s/keys :req-un [::profile-id]
+                 :opt-un [::team-id ::file-id])
+         #(or (:team-id %) (:file-id %))))
+
+(sq/defquery ::team-users
+  [{:keys [profile-id team-id file-id]}]
+  (with-open [conn (db/open)]
+    (if team-id
+      (do
+        (check-edition-permissions! conn profile-id team-id)
+        (retrieve-users conn team-id))
+      (let [{team-id :id} (retrieve-team-for-file conn file-id)]
+        (check-edition-permissions! conn profile-id team-id)
+        (retrieve-users conn team-id)))))
+
 ;; This is a similar query to team members but can contain more data
 ;; because some user can be explicitly added to project or file (not
 ;; implemented in UI)
@@ -156,12 +177,38 @@
     inner join project as p on (f.project_id = p.id)
     where p.team_id = ?")
 
-(s/def ::team-users
+(def sql:team-by-file
+  "select p.team_id as id
+     from project as p
+     join file as f on (p.id = f.project_id)
+    where f.id = ?")
+
+(defn retrieve-users
+  [conn team-id]
+  (db/exec! conn [sql:team-users team-id team-id team-id]))
+
+(defn retrieve-team-for-file
+  [conn file-id]
+  (->> [sql:team-by-file file-id]
+       (db/exec-one! conn)))
+
+;; --- Query: Team Stats
+
+(declare retrieve-team-stats)
+
+(s/def ::team-stats
   (s/keys :req-un [::profile-id ::team-id]))
 
-(sq/defquery ::team-users
+(sq/defquery ::team-stats
   [{:keys [profile-id team-id]}]
   (with-open [conn (db/open)]
-    (check-edition-permissions! conn profile-id team-id)
-    (db/exec! conn [sql:team-users team-id team-id team-id])))
+    (check-read-permissions! conn profile-id team-id)
+    (retrieve-team-stats conn team-id)))
 
+(def sql:team-stats
+  "select (select count(*) from project where team_id = ?) as projects,
+          (select count(*) from file as f join project as p on (p.id = f.project_id) where p.team_id = ?) as files")
+
+(defn retrieve-team-stats
+  [conn team-id]
+  (db/exec-one! conn [sql:team-stats team-id team-id]))

backend/src/app/services/queries/viewer.clj

@@ -14,6 +14,7 @@
    [app.db :as db]
    [app.services.queries :as sq]
    [app.services.queries.files :as files]
+   [app.services.queries.teams :as teams]
    [clojure.spec.alpha :as s]))
 
 ;; --- Query: Viewer Bundle (by Page ID)
@@ -50,13 +51,14 @@
           file    (merge (dissoc file :data)
                          (select-keys (:data file) [:colors :media :typographies]))
           libs    (files/retrieve-file-libraries conn false file-id)
-          users   (files/retrieve-file-users conn file-id)
+          users   (teams/retrieve-users conn (:team-id project))
 
           bundle  {:file file
                    :page page
                    :users users
                    :project project
                    :libraries libs}]
+
       (if (string? token)
         (do
           (check-shared-token! conn file-id page-id token)