Playwright test remove member

.storybook/main.ts

@@ -34,24 +34,3 @@ function getUiDirs(dir: string = path.join(__dirname, "../app")): string[] {
   const otherDirs = dirs.filter(dir => dir.name !== "ui")
   return uiDirs.concat(otherDirs.flatMap(subDir => getUiDirs(fullPath(subDir)).sort()))
 }
-
-function getParent(dir: string) {
-  return path.basename(path.dirname(dir))
-}
-
-function stripPunctuation(str: string) {
-  return str.replace(/[^\w\s]/g, "")
-}
-
-function titleCase(str: string) {
-  return str
-    .split(" ")
-    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-    .join(" ")
-}
-
-function getTitlePrefix(dir: string) {
-  const parent = getParent(dir)
-  const title = titleCase(stripPunctuation(parent)).replace("App", "")
-  return `Components/${title}`
-}

app/context/Auth/getSyncServer.ts

@@ -1,6 +1,5 @@
 const isDev = !import.meta.env.PROD
 const devPort = (import.meta.env.VITE_SYNC_SERVER_PORT as string) ?? "3030"
-console.log("devPort", devPort)
 
 const httpProtocol = isDev ? "http:" : "https:"
 const wsProtocol = isDev ? "ws:" : "wss:"

app/context/Database/Collection.ts

@@ -113,17 +113,24 @@ export abstract class Collection<
   }
 
   /** Adds an item to the collection */
-  add(item: Item) {
+  add(arg: Item | Item[]) {
+    const items = Array.isArray(arg) ? arg : [arg]
+
     return E.gen(this, function* () {
-      // add the item to all indexes
-      for (const index of this.allIndexes) yield* index.add(item)
+      // add each item to all indexes
+      for (const index of this.allIndexes) {
+        yield* index.add(items)
+      }
 
       // update automerge-repo
-      this.change((root: Types.Mutable<RootEncoded>) => {
-        const rootElement = root[this.name]
-        rootElement[item.id] = this.encode(item)
-      })
-      return item
+      for (const item of items) {
+        this.change((root: Types.Mutable<RootEncoded>) => {
+          const rootElement = root[this.name]
+          rootElement[item.id] = this.encode(item)
+        })
+      }
+
+      return arg
     })
   }
 

app/context/Database/Indexes.ts

@@ -36,7 +36,8 @@ export abstract class BaseIndex<Item extends CollectionItem> {
         if (this.unique && existingItems.length > 0)
           throw new Error(`Duplicate key '${key}' found while building index`)
 
-        return { ...acc, [key]: [...existingItems, item] }
+        acc[key] = [...existingItems, item]
+        return acc
       }, {})
     }
 
@@ -58,33 +59,35 @@ export abstract class BaseIndex<Item extends CollectionItem> {
   }
 
   /** Adds a new item. For unique indexes, throws an error if an item with the same key already exists. */
-  add(itemToAdd: Item) {
-    const key = this.accessor(itemToAdd)
-    const existingItems = this.index[key] ?? []
+  add(arg: Item | Item[]) {
+    const items = Array.isArray(arg) ? arg : [arg]
 
-    if (this.unique && existingItems.length > 0)
-      return E.fail(new KeyExistsError({ field: this.name, value: key }))
+    for (const item of items) {
+      const key = this.accessor(item)
+
+      this.index[key] ??= []
+
+      const existingItems = this.index[key] ?? []
 
-    this.index = {
-      ...this.index,
-      [key]: [...existingItems, itemToAdd],
+      if (this.unique && existingItems.length > 0)
+        return E.fail(new KeyExistsError({ field: this.name, value: key }))
+
+      this.index[key] = [...existingItems, item]
     }
 
-    return E.succeed(itemToAdd)
+    return E.succeed(arg)
   }
 
   /** Updates an existing item. Throws an error if there is not an existing item. */
   update(item: Item) {
     return E.gen(this, function* () {
       const key = this.accessor(item)
+
       const items = [yield* this.find(key)].flat() as Item[]
       const matchingItem = items.find(i => i.id === item.id)
       if (!matchingItem) yield* E.fail(new KeyNotFoundError({ field: this.name, value: key }))
 
-      this.index = {
-        ...this.index,
-        [key]: items.map(i => (i.id === item.id ? item : i)),
-      }
+      this.index[key] = items.map(i => (i.id === item.id ? item : i))
     })
   }
 
@@ -96,10 +99,7 @@ export abstract class BaseIndex<Item extends CollectionItem> {
       const matchingItem = items.find(i => i.id === item.id)
       if (!matchingItem) yield* E.fail(new KeyNotFoundError({ field: this.name, value: key }))
 
-      this.index = {
-        ...this.index,
-        [key]: items.filter(i => i.id !== item.id),
-      }
+      this.index[key] = items.filter(i => i.id !== item.id)
     })
   }
 

app/context/Database/test/Collection.benchmark.ts

@@ -0,0 +1,30 @@
+import { LocalDate } from "@js-joda/core"
+import { clients } from "data/clients"
+import { contacts } from "data/contacts"
+import { projects } from "data/projects"
+import { $ } from "lib/Effect"
+import { generateTimeEntries } from "lib/generateTimeEntries"
+import { TimeEntryCollection } from "schema/TimeEntryCollection"
+import { bench, describe } from "vitest"
+
+const addEntries = (weekCount: number) => {
+  const entries = generateTimeEntries({
+    clients,
+    contacts,
+    projects,
+    startDate: LocalDate.now(),
+    weekCount,
+  })
+
+  const collection = new TimeEntryCollection([])
+  $(collection.add(entries))
+}
+
+describe("collection.add()", () => {
+  bench("1 week", async () => addEntries(1))
+  bench("5 weeks", async () => addEntries(5))
+  bench("10 weeks", async () => addEntries(10))
+  // bench("50 weeks", async () => addEntries(50))
+})
+
+// describe("collection.all()", () => {})

app/context/Database/test/Collection.test.ts

@@ -1,5 +1,7 @@
 import { LocalDate } from "@js-joda/core"
+import { contacts } from "data/contacts"
 import { $, E, Either } from "lib/Effect"
+import { generateDones } from "lib/generateDones"
 import { Contact } from "schema/Contact"
 import { DoneEntry } from "schema/DoneEntry"
 import { DoneEntryCollection } from "schema/DoneEntryCollection"
@@ -84,6 +86,12 @@ describe("Collection", () => {
       const items = $(collection.findBy("week", "2024-11-03"))
       expect(items).toHaveLength(8)
     })
+
+    it("finds an item by year", () => {
+      const { collection } = setup()
+      const items = $(collection.findBy("year", 2024))
+      expect(items).toHaveLength(14)
+    })
   })
 
   describe("add", () => {
@@ -100,6 +108,23 @@ describe("Collection", () => {
       expect($(collection.findBy("contactId", alice.id))).toHaveLength(8)
       expect($(collection.findBy("week", "2024-11-03"))).toHaveLength(9)
     })
+
+    it("adds multiple items to the collection", () => {
+      const { collection } = setup()
+      expect($(collection.all())).toHaveLength(14)
+
+      // generate a bunch of dones
+      const dones = generateDones({
+        today: LocalDate.parse("2024-11-09"),
+        weeks: 1,
+        productivity: 3,
+        enthusiasm: 0.1,
+        contacts,
+      })
+      const result = $(collection.add(dones))
+      expect(result).toBe(dones)
+      expect($(collection.all())).toHaveLength(224)
+    })
   })
 
   describe("update", () => {
@@ -126,10 +151,10 @@ describe("Collection", () => {
       const { collection } = setup()
       const dones = $(collection.all())
       const item = dones[0]
-      $(collection.update({ ...item, likes: [bob.id] }))
+      $(collection.update({ ...item, likes: [bob] }))
 
       const updated = $(collection.find(item.id))
-      expect(updated.likes).toEqual([bob.id])
+      expect(updated.likes).toEqual([bob])
     })
   })
 

app/data/contacts.ts

@@ -1,4 +1,4 @@
-import { type ContactId, Contact } from "schema/Contact"
+import { type ContactId, Contact, ExtendedContact } from "schema/Contact"
 
 //  These will be replaced with contact information that people can edit
 
@@ -71,3 +71,8 @@ export const contacts = [
       id: contact.userName as ContactId,
     }),
 )
+
+/** for testing purposes */
+export const fakeExtendedContacts = contacts.map(
+  contact => new ExtendedContact({ ...contact, isSelf: false, isMember: true, isAdmin: true }),
+)

app/data/projects.ts

@@ -3,72 +3,72 @@ import { Project } from "schema/Project"
 import tailwindColors from "tailwindcss/colors"
 
 const projectList = `
-Business: Contracts	yes	Contract negotiation & other back-and-forth
-Business: Marketing		Work on DevResults.com, writing blogs, creating materials, etc.
-Business: Outreach	sometimes	Conferences, coffee, donuts, cold calls, etc
-Business: Proposals	yes	Writing/editing proposals for specific prospects
-DevOps: Azure migration		
-DevOps: CI configuration		
-DevOps: General		Non-project-oriented DevOps work: server/VM/database configuration, etc.
-Feature: Activity-Specific Stuff		
-Feature: Ag Grid conversions		
-Feature: API		
-Feature: Baselines		
-Feature: ContentObject Validation		
-Feature: Count First/Last		
-Feature: Count Unique Per Reporting Period		
-Feature: Dashboard		
-Feature: Data Tables		
-Feature: DevIndicators		
-Feature: Diagnostics		
-Feature: Dropbox integration		
-Feature: EditGrid		
-Feature: Enterprise		
-Feature: Frameworks Index		2022-S01 etc
-Feature: GDPR		
-Feature: Google Drive integration		
-Feature: Ground Truth		
-Feature: IATI		
-Feature: Indexify		
-Feature: Instance Export		
-Feature: Internal Tooling		Includes instance bootstrapper features, DevResults CLI, etc.
-Feature: Localization		Includes managing LanguageStrings, getting translations, etc.
-Feature: Matrix		
-Feature: Metadata visualization		
-Feature: Notifications		
-Feature: Partner Permissions		2022 sprint 8 and associated work
-Feature: PowerBI		
-Feature: Project X		
-Feature: Pseudonyms		
-Feature: Public Site		
-Feature: RDTs		
-Feature: Self-serve		
-Feature: Single Sign-On		, and supporting clients
-Feature: Standard RP Picker		
-Feature: Survey123		
-Feature: SurveyCTO		
-Feature: Too small to name		But you can name it in the comments!
-Feature: WorldAdminDivisions update		
+Business:Contracts	yes	Contract negotiation & other back-and-forth
+Business:Marketing		Work on DevResults.com, writing blogs, creating materials, etc.
+Business:Outreach	sometimes	Conferences, coffee, donuts, cold calls, etc
+Business:Proposals	yes	Writing/editing proposals for specific prospects
+DevOps:Azure migration		
+DevOps:CI configuration		
+DevOps:General		Non-project-oriented DevOps work:server/VM/database configuration, etc.
+Feature:Activity-Specific Stuff		
+Feature:Ag Grid conversions		
+Feature:API		
+Feature:Baselines		
+Feature:ContentObject Validation		
+Feature:Count First-Last		
+Feature:Count Unique Per Reporting Period		
+Feature:Dashboard		
+Feature:Data Tables		
+Feature:DevIndicators		
+Feature:Diagnostics		
+Feature:Dropbox integration		
+Feature:EditGrid		
+Feature:Enterprise		
+Feature:Frameworks Index		2022-S01 etc
+Feature:GDPR		
+Feature:Google Drive integration		
+Feature:Ground Truth		
+Feature:IATI		
+Feature:Indexify		
+Feature:Instance Export		
+Feature:Internal Tooling		Includes instance bootstrapper features, DevResults CLI, etc.
+Feature:Localization		Includes managing LanguageStrings, getting translations, etc.
+Feature:Matrix		
+Feature:Metadata visualization		
+Feature:Notifications		
+Feature:Partner Permissions		2022 sprint 8 and associated work
+Feature:PowerBI		
+Feature:Project X		
+Feature:Pseudonyms		
+Feature:Public Site		
+Feature:RDTs		
+Feature:Self-serve		
+Feature:Single Sign-On		, and supporting clients
+Feature:Standard RP Picker		
+Feature:Survey123		
+Feature:SurveyCTO		
+Feature:Too small to name		But you can name it in the comments!
+Feature:WorldAdminDivisions update		
 Out		
 Overhead		General meetings, company process stuff, finance stuff, HR, onboarding, learning…
 Security		All things security
-Support: API	mostly	Any help provided to helping users access and use the API
-Support: External tooling		Providing support for "other tools" outside of DevResults (e.g. PowerBI)
-Support: Ongoing	mostly	Includes engineering support to individual clients (but not bug fixing)
-Support: Scaling training & help		Videos, help materials, etc.
-Support: Setup	yes	Everything before the instance goes live
-Support: Training	sometimes	Training dedicated to one specific client
-Tech wealth: Bug fixin		Probably mostly on call. Note feature in comments if it's a major feature fix.
-Tech wealth: Other		Catch-all for general improvements to the codebase
-Tech wealth: Optimization		Work to improve performance within the app
-Tech wealth: TypeScript		
-Tech wealth: Webpack		
+Support:API	mostly	Any help provided to helping users access and use the API
+Support:External tooling		Providing support for "other tools" outside of DevResults (e.g. PowerBI)
+Support:Ongoing	mostly	Includes engineering support to individual clients (but not bug fixing)
+Support:Scaling training & help		Videos, help materials, etc.
+Support:Setup	yes	Everything before the instance goes live
+Support:Training	sometimes	Training dedicated to one specific client
+Tech wealth:Bug fixin		Probably mostly on call. Note feature in comments if it's a major feature fix.
+Tech wealth:Other		Catch-all for general improvements to the codebase
+Tech wealth:Optimization		Work to improve performance within the app
+Tech wealth:TypeScript		
+Tech wealth:Webpack		
 Thought Leadership		`
   .trim()
   .split("\n")
   .map(line => {
     const [fullCode, requiresClient, description] = line.trim().split("\t")
-    const [code, subCode] = fullCode.split(/:\s+/).map(s => s.trim().replaceAll(" ", "-"))
+    const [code, subCode] = fullCode.split(/:\s*/).map(s => s.trim().replaceAll(" ", "-"))
     return {
       code,
       subCode,

app/hooks/useRedirect.tsx

@@ -3,10 +3,11 @@
 import { useLocation, useNavigate } from "@remix-run/react"
 import { useEffect } from "react"
 
-export function useRedirect({ from, to }: Params) {
+export function useRedirect({ from, to, condition = true }: Params) {
   const { pathname, state } = useLocation()
   const navigate = useNavigate()
   useEffect(() => {
+    if (!condition) return
     if (typeof from === "string" && pathname === from) {
       console.log(`redirecting from ${from} to ${to}`)
       navigate(to, { state })
@@ -21,4 +22,5 @@ export function useRedirect({ from, to }: Params) {
 type Params = {
   from: string | RegExp
   to: string
+  condition?: boolean
 }