refactor: Filter and display only relevant teams, remove debug log, and un-hardcode checkbox state.

Author: abdotop

api/auth.ts

@@ -100,9 +100,7 @@ export async function handleGoogleCallback(
   // Verify and decode the ID token
   await verifyGoogleToken(tokens.id_token)
   const userInfo = decodeGoogleJWT(tokens.id_token) as GoogleUserInfo
-  if (userInfo.picture) {
-    userInfo.picture = await savePicture(userInfo.picture)
-  }
+  userInfo.picture &&= await savePicture(userInfo.picture)
   const sessionId = await authenticateOauthUser(userInfo)
 
   // Return response with session cookie

api/lmdb-store.ts

@@ -1,8 +1,6 @@
 import { STORE_SECRET, STORE_URL } from '/api/lib/env.ts'
 
 const headers = { authorization: `Bearer ${STORE_SECRET}` }
-export const pending = new Set<Promise<unknown>>()
-export const sync = () => Promise.all([...pending])
 export const getOne = async <T>(
   path: string,
   id: string,
@@ -13,17 +11,6 @@ export const getOne = async <T>(
   return res.json()
 }
 
-export const set = (path: string, id: unknown, dt: unknown) => {
-  const body = typeof dt === 'string' ? dt : JSON.stringify(dt)
-  const p = fetch(
-    `${STORE_URL}/${path}/${encodeURIComponent(String(id))}`,
-    { method: 'POST', body, headers },
-  )
-  pending.add(p)
-  p.finally(() => pending.delete(p))
-  return 1
-}
-
 export const get = async <T>(
   path: string,
   params?: { q?: string; limit?: number; from?: number },

api/routes.ts

@@ -11,7 +11,6 @@ import {
   TeamDetailDef,
   User,
   UserDef,
-  // UsersCollection,
 } from './schema.ts'
 import {
   ARR,
@@ -67,11 +66,11 @@ const withDeploymentSession = async (ctx: RequestContext) => {
 
 const userInTeam = async (teamId: string, userId?: string) => {
   if (!userId) return false
-  const matches = await get<{ id: string }[]>(
+  const matches = await getOne<{ id: string }>(
     `google/group/${teamId}`,
-    { q: `select(.id == "${userId}") | { id: .id }` },
+    userId,
   )
-  return matches.length > 0
+  return !!matches
 }
 
 const withDeploymentTableAccess = async (
@@ -121,6 +120,15 @@ const projectOutput = OBJ({
   updatedAt: optional(NUM('The last update date of the project')),
 })
 
+const userNameCache = new Map<string, string>()
+const getUserName = async (userId: string) => {
+  if (userNameCache.has(userId)) return userNameCache.get(userId)
+  const user = await getOne<{ name: { fullName: string } }>('google/user', userId)
+  const name = user?.name?.fullName ?? userId
+  userNameCache.set(userId, name)
+  return name
+}
+
 const defs = {
   'GET/api/health': route({
     fn: () => new Response('OK'),
@@ -166,7 +174,7 @@ const defs = {
       const groups = await get<{ id: string; name: string }[]>(
         'google/group',
         {
-          q: 'select((.kind == "admin#directory#group") and (.email | contains("@01edu")) and (.directMembersCount > 1)) | { id: .id, name: .name }',
+          q: 'select((.kind == "admin#directory#group") and (.email | endswith("@01edu.ai")) and (.directMembersCount > 1)) | { id: .id, name: .name }',
         },
       )
 
@@ -203,15 +211,12 @@ const defs = {
 
       const enrichedMembers = await Promise.all(
         members.map(async (m) => {
-          const user = await getOne<{ name: { fullName: string } }>(
-            'google/user',
-            m.id,
-          )
+          const name = await getUserName(m.id)
           const admin = AdminsCollection.get(m.id)
           return {
             email: m.email,
             id: m.id,
-            name: user?.name?.fullName ?? m.email,
+            name,
             isAdmin: !!admin,
           }
         }),

tasks/clickhouse.ts

@@ -41,6 +41,6 @@ if (import.meta.main) {
     console.log('logs table is ready')
   } catch (error) {
     console.error('Error creating ClickHouse table:', { error })
-    // Deno.exit(1)
+    Deno.exit(1)
   }
 }

tasks/seed.ts

@@ -3,43 +3,8 @@ import {
   DeploymentsCollection,
   type Project,
   ProjectsCollection,
-  type User,
-  UsersCollection,
 } from '/api/schema.ts'
 
-const users: User[] = [
-  {
-    userEmail: 'admin@example.com',
-    userFullName: 'Admin User',
-    userPicture: undefined,
-    isAdmin: true,
-  },
-  {
-    userEmail: 'member1@example.com',
-    userFullName: 'Member One',
-    userPicture: undefined,
-    isAdmin: false,
-  },
-  {
-    userEmail: 'member2@example.com',
-    userFullName: 'Member Two',
-    userPicture: undefined,
-    isAdmin: false,
-  },
-  {
-    userEmail: 'clement@01talent.com',
-    userFullName: 'Clement',
-    userPicture: undefined,
-    isAdmin: true,
-  },
-  {
-    userEmail: 'abdou.top@01talent.com',
-    userFullName: 'Abdou Top',
-    userPicture: undefined,
-    isAdmin: true,
-  },
-]
-
 const projects: Omit<Project, 'createdAt'>[] = [
   {
     slug: 'website-redesign',
@@ -66,7 +31,6 @@ const projects: Omit<Project, 'createdAt'>[] = [
 
 async function clearCollection(
   collection:
-    | typeof UsersCollection
     | typeof ProjectsCollection
     | typeof DeploymentsCollection,
 ) {
@@ -81,17 +45,9 @@ async function seed() {
   console.log('Starting seeding process...')
 
   // Clear existing data
-  await clearCollection(UsersCollection)
   await clearCollection(ProjectsCollection)
   await clearCollection(DeploymentsCollection)
 
-  // Seed users
-  console.log('Seeding users...')
-  for (const user of users) {
-    await UsersCollection.insert(user)
-  }
-  console.log('Users seeded.')
-
   // Seed projects
   console.log('Seeding projects...')
   for (const [_, project] of projects.entries()) {

web/pages/ProjectsPage.tsx

@@ -123,7 +123,6 @@ const ProjectCard = (
   { project, members }: { project: Project; members: string[] },
 ) => {
   const isMember = members.includes(user.data?.id || '')
-  console.log(members, user.data?.id, isMember)
   return (
     <A
       key={project.slug}
@@ -187,12 +186,6 @@ const TeamMembersRow = ({ user }: { user: Team['members'][number] }) => (
       <input
         type='checkbox'
         class='toggle toggle-sm toggle-primary'
-        checked={true}
-        // onChange={(e) => {
-        //   if ((e.target as HTMLInputElement).checked) {
-        //     addUserToTeam(user, team)
-        //   } else removeUserFromTeam(user, team)
-        // }}
       />
     </td>
   </tr>
@@ -569,19 +562,12 @@ export function ProjectsPage() {
     ? ''
     : 'pointer-events-none cursor-not-allowed opacity-20'
 
-  const hasTeams = teams.data && teams.data.length > 0
-  const sortedTeams = teams.data?.sort((a, b) => {
-    const aHasUser = a.members.includes(user.data?.id || '')
-    const bHasUser = b.members.includes(user.data?.id || '')
-    const aProjects = projectsByTeam[a.id] ?? []
-    const bProjects = projectsByTeam[b.id] ?? []
-    if (aHasUser && !bHasUser) return -1
-    if (!aHasUser && bHasUser) return 1
-    if (aProjects.length > bProjects.length) return -1
-    if (aProjects.length < bProjects.length) return 1
-    return 0
-  }) ?? []
-  
+  const sortedTeams =
+    teams.data?.filter((t) =>
+      (t.members.includes(user.data?.id || '') || isAdmin) &&
+      projectsByTeam[t.id]?.length > 0
+    ) ?? []
+
   return (
     <PageLayout>
       <PageHeader>
@@ -617,7 +603,7 @@ export function ProjectsPage() {
       </PageHeader>
 
       <PageContent>
-        {!hasTeams
+        {sortedTeams.length < 1
           ? (
             <EmptyState
               icon={Search}