Merge pull request #476 from STAPLE-verse/deal-with-form-select-view

Deal with form select view

Author: doomlab

src/invites/components/InvitesList.tsx

@@ -14,7 +14,7 @@ export const InvitesListView = ({ invites }) => {
 export const InvitesList = ({ currentUser }) => {
   // Get invitations
   const [invites] = useQuery(getInvites, {
-    where: { email: currentUser!.email.toLowerCase() },
+    where: { email: { equals: currentUser!.email, mode: "insensitive" } },
     orderBy: { id: "asc" },
     include: { project: true },
   })

src/invites/mutations/createInvite.ts

@@ -15,6 +15,8 @@ export default resolver.pipe(
   resolver.zod(CreateInviteSchema),
   resolver.authorize(),
   async (input) => {
+    input.email = input.email.toLowerCase()
+
     let textResult
 
     // Check if the user is already a soft-deleted project member
@@ -24,7 +26,7 @@ export default resolver.pipe(
         name: null,
         deleted: true,
         users: {
-          some: { email: input.email }, // Match by email
+          some: { email: { equals: input.email, mode: "insensitive" } }, // Match by email
         },
       },
     })
@@ -35,7 +37,7 @@ export default resolver.pipe(
         data: {
           projectId: input.projectId,
           privilege: input.privilege,
-          email: input.email,
+          email: input.email.toLowerCase(),
           invitationCode: generateToken(20),
           addedBy: input.addedBy,
           tags: input.tags ?? undefined,
@@ -58,7 +60,7 @@ export default resolver.pipe(
           projectId: input.projectId,
           name: null,
           users: {
-            some: { email: input.email }, // Use `some` to query an array field
+            some: { email: { equals: input.email, mode: "insensitive" } }, // Use `some` to query an array field
           },
         },
       })
@@ -74,7 +76,7 @@ export default resolver.pipe(
           data: {
             projectId: input.projectId,
             privilege: input.privilege,
-            email: input.email,
+            email: input.email.toLowerCase(),
             invitationCode: generateToken(20),
             addedBy: input.addedBy,
             tags: input.tags ?? undefined,

src/projects/components/ProjectSchemaInput.tsx

@@ -80,6 +80,7 @@ export const ProjectSchemaInput = ({
   const schemas = typeduserForms
     .filter((form) => form.formVersion)
     .flatMap((form) => form.formVersion!)
+    .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
 
   // Add "(Default)" to the name of the default form
   const options = schemas.map((schema) => ({
@@ -91,19 +92,23 @@ export const ProjectSchemaInput = ({
   }))
 
   // Extra columns for the select table
-  const versionNumber = schemas.map((schema) => schema.version)
-
-  const extraData = versionNumber.map((version) => ({
-    version: version,
+  const extraData = schemas.map((schema) => ({
+    version: schema.version,
+    date: new Date(schema.createdAt).toLocaleDateString(),
   }))
-
   const extraColumns = [
     {
       id: "version",
       header: "Version",
       accessorKey: "version",
       cell: (info) => <span>{info.getValue()}</span>,
     },
+    {
+      id: "date",
+      header: "Created",
+      accessorKey: "date",
+      cell: (info) => <span>{info.getValue()}</span>,
+    },
   ]
 
   // Handle radio button selection

src/projects/mutations/createProject.ts

@@ -77,8 +77,17 @@ export default resolver.pipe(
           container: {
             connect: { id: firstContainerId }, // put it in default to do
           },
-          description:
-            "You added a description form to your project. You can complete that form by going to the project > clicking on settings in the left hand menu > and then edit form data.",
+          description: `### Next step: Complete your project description form
+
+You just added a **Project Description Form** to this project.
+
+**How to complete it:**
+1. Go to your **Project**.
+2. Click **Settings** in the left-hand menu.
+3. Open **Edit Form Data** and complete the required fields.
+
+_Why this matters:_ Completing this form helps make your project transparent and searchable via metadata.
+`,
           createdBy: {
             connect: { id: projectMember.id },
           },

src/tasks/components/TaskSchemaInput.tsx

@@ -31,22 +31,37 @@ export const TaskSchemaInput = ({
 
   const typedPmForms = pmForms as FormWithVersionAndUser[]
 
+  // Build a lookup from formVersion.id -> PM username for fast, reliable access
+  const versionIdToUsername = new Map<number, string>()
+  typedPmForms.forEach((form) => {
+    const username =
+      (form.user?.firstName && form.user?.lastName
+        ? `${form.user.firstName} ${form.user.lastName}`
+        : form.user?.username) ?? ""
+    const versions = Array.isArray(form.formVersion)
+      ? form.formVersion
+      : form.formVersion
+      ? [form.formVersion]
+      : []
+    versions.forEach((fv: any) => {
+      if (fv?.id != null) {
+        versionIdToUsername.set(fv.id, username)
+      }
+    })
+  })
+
   const schemas = typedPmForms
     .filter((form) => form.formVersion)
     .flatMap((form) => form.formVersion!)
+    .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
 
   const options = schemas.map((schema) => ({ id: schema.id, label: schema.name }))
 
   // Extra columns for the select table
-  const versionNumber = schemas.map((schema) => schema.version)
-
-  const pmNames = typedPmForms
-    .filter((form) => form.formVersion) // Keep only forms where formVersion is defined
-    .map((form) => form.user?.username) // Map to the username
-
-  const extraData = versionNumber.map((version, index) => ({
-    version: version,
-    username: pmNames[index], // Safely access pmNames[index]
+  const extraData = schemas.map((schema) => ({
+    version: schema.version,
+    username: versionIdToUsername.get(schema.id) ?? "",
+    date: new Date(schema.createdAt).toLocaleDateString(),
   }))
 
   const extraColumns = [
@@ -62,6 +77,12 @@ export const TaskSchemaInput = ({
       accessorKey: "username",
       cell: (info) => <span>{info.getValue()}</span>,
     },
+    {
+      id: "date",
+      header: "Created",
+      accessorKey: "date",
+      cell: (info) => <span>{info.getValue()}</span>,
+    },
   ]
 
   return (