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 },

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,7 +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)
@@ -569,19 +567,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 +608,7 @@ export function ProjectsPage() {
       </PageHeader>
 
       <PageContent>
-        {!hasTeams
+        {sortedTeams.length === 0
           ? (
             <EmptyState
               icon={Search}