STAPLE-verse · doomlab · Jan 13, 2025 · Dec 27, 2024 · Dec 27, 2024 · Dec 27, 2024
diff --git a/db/migrations/migration_lock.toml b/db/migrations/migration_lock.toml
diff --git a/db/schema.prisma b/db/schema.prisma
@@ -148,6 +148,9 @@ model Project {
   notifications    Notification[]
   ProjectPrivilege ProjectPrivilege[]
   invitations      Invitation[]
+  metadata         Json? // Add metadata field
+  formVersion      FormVersion?       @relation(fields: [formVersionId], references: [id])
+  formVersionId    Int?
 }
 
 enum Status {
@@ -243,15 +246,16 @@ model Form {
 }
 
 model FormVersion {
-  id        Int      @id @default(autoincrement())
+  id        Int       @id @default(autoincrement())
   name      String
   formId    Int
   version   Int
   schema    Json
   uiSchema  Json?
-  createdAt DateTime @default(now())
-  form      Form     @relation(fields: [formId], references: [id], onDelete: Cascade)
+  createdAt DateTime  @default(now())
+  form      Form      @relation(fields: [formId], references: [id], onDelete: Cascade)
   tasks     Task[]
+  projects  Project[]
 
   @@index([formId, version], name: "formVersionIndex")
 }

diff --git a/src/core/components/DateFormat.tsx b/src/core/components/DateFormat.tsx
@@ -9,7 +9,7 @@ export default function DateFormat({ date }: DateFormatProps) {
   const locale = currentUser ? currentUser.language : "en-US"
 
   return (
-    <span data-testid="dateformat-id">
+    <>
       {" "}
       {date
         ? date.toLocaleDateString(locale, {
@@ -22,6 +22,6 @@ export default function DateFormat({ date }: DateFormatProps) {
             hour12: false, // Use 24-hour format
           })
         : ""}
-    </span>
+    </>
   )
 }
diff --git a/src/core/components/Table.tsx b/src/core/components/Table.tsx
@@ -208,7 +208,7 @@ const Table = <TData,>({
               onChange={(e) => {
                 table.setPageSize(Number(e.target.value))
               }}
-              className={`text-secondary input-secondary input-bordered border-2 bg-base-300 rounded input-sm ${
+              className={`text-secondary input-secondary input-bordered border-2 bg-base-300 rounded input-sm mt-2 ${
                 classNames?.pageSizeSelect || ""
               }`}
             >

diff --git a/src/core/components/fields/RadioFieldTable.tsx b/src/core/components/fields/RadioFieldTable.tsx
@@ -7,24 +7,38 @@ interface RadioFieldTableProps<T> {
   options: { id: number; label: string }[]
   extraData?: T[]
   extraColumns?: any[]
+  value?: number | null // New prop for pre-selected value
+  onChange?: (selectedId: number) => void // Callback for when a radio button is selected
 }
 
 const RadioFieldTable = <T,>({
   name,
   options,
   extraData = [],
   extraColumns = [],
+  value, // Receive the pre-selected value
+  onChange, // Receive the onChange callback
 }: RadioFieldTableProps<T>) => {
   const {
     input: { value: selectedId, onChange: setSelectedId },
     meta,
   } = useField(name, { subscription: { value: true, touched: true, error: true } })
 
+  // Ensure the selected ID is initialized with the provided value
+  React.useEffect(() => {
+    if (value && value !== selectedId) {
+      setSelectedId(value)
+    }
+  }, [value, selectedId, setSelectedId])
+
   const handleSelection = useCallback(
     (id) => {
       setSelectedId(id)
+      if (onChange) {
+        onChange(id) // Trigger the parent callback when a selection is made
+      }
     },
-    [setSelectedId]
+    [setSelectedId, onChange]
   )
 
   const columns = React.useMemo(

diff --git a/src/forms/components/AddFormTemplates.tsx b/src/forms/components/AddFormTemplates.tsx
@@ -51,7 +51,7 @@ const AddFormTemplates: React.FC<AddFormTemplatesProps> = ({
 
   return (
     <Modal open={open} size="large">
-      <h2>Select Form Templates</h2>
+      <h2 className="flex justify-center mb-2 text-3xl">Select Form Templates</h2>
       {open && (
         <Form
           schema={AddFormTemplatesSchema}

diff --git a/src/forms/components/DownloadJSON.tsx b/src/forms/components/DownloadJSON.tsx
@@ -1,6 +1,13 @@
 import React from "react"
 
-const DownloadJSON = ({ data, fileName, className }) => {
+interface DownloadJSONProps {
+  data: any
+  fileName: string
+  type?: "button" | "submit" | "reset" // Match the allowed types
+  className?: string
+}
+
+const DownloadJSON = ({ data, fileName, type = "button", className }: DownloadJSONProps) => {
   const downloadJSON = () => {
     const jsonData = new Blob([JSON.stringify(data)], { type: "application/json" })
     const jsonURL = URL.createObjectURL(jsonData)
@@ -13,7 +20,7 @@ const DownloadJSON = ({ data, fileName, className }) => {
   }
 
   return (
-    <button className={className} onClick={downloadJSON}>
+    <button type={type} className={className} onClick={downloadJSON}>
       Download JSON
     </button>
   )

diff --git a/src/forms/components/DownloadXLSX.tsx b/src/forms/components/DownloadXLSX.tsx
@@ -2,7 +2,14 @@ import React from "react"
 import * as XLSX from "xlsx"
 import { saveAs } from "file-saver"
 
-function DownloadXLSX({ data, fileName, className }) {
+interface DownloadXLSXProps {
+  data: any
+  fileName: string
+  type?: "button" | "submit" | "reset" // Match the allowed types
+  className?: string
+}
+
+function DownloadXLSX({ data, fileName, type = "button", className }: DownloadXLSXProps) {
   const exportToExcel = () => {
     const worksheet = XLSX.utils.json_to_sheet(data)
     const workbook = XLSX.utils.book_new()
@@ -18,7 +25,7 @@ function DownloadXLSX({ data, fileName, className }) {
   }
 
   return (
-    <button className={className} onClick={exportToExcel}>
+    <button type={type} className={className} onClick={exportToExcel}>
       Download XLSX
     </button>
   )

diff --git a/src/forms/mutations/createForm.ts b/src/forms/mutations/createForm.ts
@@ -30,6 +30,9 @@ export default resolver.pipe(
           },
         },
       },
+      include: {
+        versions: true, // Include related formVersion in the return
+      },
     })
 
     return form

diff --git a/src/forms/schema/projectSchema.js b/src/forms/schema/projectSchema.js
@@ -0,0 +1,52 @@
+export const JsonProject = `
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "title": "Project Information",
+  "required": [],
+  "properties": {
+    "abstract": {
+      "type": "string",
+      "title": "Abstract:"
+    },
+    "citation": {
+      "type": "string",
+      "title": "Citation:"
+    },
+    "keywords": {
+      "type": "string",
+      "title": "Keywords:",
+      "description": "Keywords separated by commas."
+    },
+    "publisher": {
+      "type": "string",
+      "title": "Publisher:"
+    },
+    "identifier": {
+      "type": "string",
+      "title": "Identifier:",
+      "description": "DOI, ISSN, etc."
+    }
+  },
+  "description": "Default Project Metadata",
+  "dependencies": {}
+}
+`
+
+export const JsonProjectUI = `
+{
+  "abstract": {
+    "ui:widget": "textarea"
+  },
+  "citation": {
+    "ui:widget": "textarea"
+  },
+  "ui:order": [
+    "abstract",
+    "keywords",
+    "citation",
+    "publisher",
+    "identifier"
+  ]
+}
+`
diff --git a/src/forms/utils/getDefaultSchemaList.ts b/src/forms/utils/getDefaultSchemaList.ts
@@ -1,9 +1,10 @@
 import { JsonProjectMember, JsonProjectMemberUI } from "src/forms/schema/projectMemberSchema"
 import { JsonFunder, JsonFunderUI } from "src/forms/schema/funderSchema"
+import { JsonProject, JsonProjectUI } from "src/forms/schema/projectSchema"
 
 export function getDefaultSchemaLists() {
-  const schemas = [JsonProjectMember, JsonFunder]
-  const uis = [JsonProjectMemberUI, JsonFunderUI]
+  const schemas = [JsonProjectMember, JsonFunder, JsonProject]
+  const uis = [JsonProjectMemberUI, JsonFunderUI, JsonProjectUI]
 
   const restructured = schemas.map((schema, index) => {
     const parsed = JSON.parse(schema)

diff --git a/src/pages/projects/[projectId]/contributors/[contributorId]/edit.tsx b/src/pages/projects/[projectId]/contributors/[contributorId]/edit.tsx
@@ -1,6 +1,5 @@
 import { Suspense } from "react"
 import { Routes } from "@blitzjs/next"
-import Head from "next/head"
 import { useRouter } from "next/router"
 import { useQuery, useMutation } from "@blitzjs/rpc"
 import { useParam } from "@blitzjs/next"
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,9 @@ export default resolver.pipe( @@
               },
             },
           },
+          include: {
+            versions: true, // Include related formVersion in the return
+          },
         })
         return form
@@ Expand Down @@