merging

package.json

@@ -12,7 +12,7 @@
     "test:staging": "CLIENT_BACKEND=staging npx playwright test",
     "test:production": "CLIENT_BACKEND=production npx playwright test",
     "test:ipfs": "CLIENT_BACKEND=ipfs npx playwright test",
-    "build": "DISABLE_ESLINT_PLUGIN=true CLIENT_BACKEND=staging next build",
+    "build": "next build",
     "start": "next start",
     "post-update": "yarn upgrade --latest",
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\"",
@@ -24,7 +24,7 @@
     "@json2csv/plainjs": "^6.1.2",
     "@mui/material": "^5.11.3",
     "@next/font": "^13.1.1",
-    "@prisma/client": "5.1.1",
+    "@prisma/client": "^5.1.1",
     "@supabase/auth-helpers-nextjs": "^0.5.2",
     "@supabase/auth-helpers-react": "^0.3.1",
     "@supabase/auth-ui-react": "^0.2.6",
@@ -58,6 +58,7 @@
     "react-datetime": "^3.2.0",
     "react-dom": "^18.2.0",
     "react-draft-wysiwyg": "^1.15.0",
+    "react-error-boundary": "^4.0.11",
     "supabase": "^1.42.7",
     "tailwindcss": "^3.2.4",
     "trpc": "^0.11.3",
@@ -80,7 +81,7 @@
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",
     "csv-parser": "^3.0.0",
-    "eslint": "^8.47.0",
+    "eslint": "^8.32.0",
     "eslint-config-next": "^13.1.4",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",

prisma/migrations/0_init/migration.sql

@@ -3,7 +3,7 @@ CREATE TABLE "evaluation" (
     "id" UUID NOT NULL DEFAULT gen_random_uuid(),
     "name" TEXT,
     "status" TEXT NOT NULL DEFAULT 'draft',
-    "description" TEXT NOT NULL DEFAULT '',
+    "description" TEXT DEFAULT '',
     "start_time" TIMESTAMPTZ(6),
     "end_time" TIMESTAMPTZ(6),
     "form_description" TEXT,
@@ -19,6 +19,7 @@ CREATE TABLE "evaluation_field" (
     "subheading" TEXT,
     "char_count" INTEGER,
     "placeholder" TEXT,
+    "field_order" INTEGER,
 
     CONSTRAINT "evaluation_field_pkey" PRIMARY KEY ("id")
 );
@@ -42,7 +43,7 @@ CREATE TABLE "invitation" (
     "evaluation_id" UUID NOT NULL,
     "code" TEXT,
     "voice_credits" INTEGER,
-    "remaining_uses" INTEGER NOT NULL DEFAULT 100,
+    "remaining_uses" INTEGER NOT NULL,
     "is_sme" BOOLEAN NOT NULL DEFAULT false,
 
     CONSTRAINT "invitation_pkey" PRIMARY KEY ("id")

prisma/migrations/1_init/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - Made the column `description` on table `evaluation` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- AlterTable
+ALTER TABLE "evaluation" ALTER COLUMN "description" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "invitation" ALTER COLUMN "remaining_uses" SET DEFAULT 100;

prisma/migrations/20230830233721_add_is_upload_column/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "evaluation" ADD COLUMN     "is_upload" BOOLEAN;

prisma/schema.prisma

@@ -31,6 +31,7 @@ model EvaluationField {
   subheading       String?
   char_count       Int?
   placeholder      String?
+  field_order      Int?
   evaluation       Evaluation?       @relation(fields: [evaluation_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
   submission_field SubmissionField[]
 
@@ -103,6 +104,7 @@ model User {
   github_user_id  String?     @db.Uuid
   role            String      @default("user")
   evaluator       Evaluator[]
+  test            String?
 
   @@map("user")
 }

src/components/dashboard/Dashboard.tsx

@@ -1,21 +1,29 @@
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import LoadingSpinner from "src/components/shared/LoadingSpinner";
 import SubTitle from "src/components/shared/SubTitle";
 import DashboardHeader from "./DashboardHeader";
 import { EvaluationCard } from "./EvaluationCard";
 import { EvaluationEmptyCard } from "./EvaluationEmptyCard";
 import { EvaluationItem } from "./EvaluationItem";
 import { useDashboardStore } from "./DashboardStore";
+import { trpc } from "src/lib/trpc";
+import { ErrorBoundary } from "react-error-boundary";
 
 export default function Dashboard() {
-  const store = useDashboardStore();
+  const [spinner, setSpinner] = useState(1);
+
+  const store = useDashboardStore(setSpinner)();
+  // const store = useDashboardStore();
+
+  console.log(spinner);
 
   useEffect(() => {
     store.load();
   }, [store.fetching]);
 
   if (store.fetching) return <LoadingSpinner />;
   if (store.error) return <p>Oh no... {store.error.message}</p>;
+
   return (
     <>
       <DashboardHeader store={store} />

src/components/dashboard/DashboardStore.tsx

@@ -2,6 +2,7 @@ import { create } from "zustand";
 import { Evaluation, rpc, DashboardEvaluation } from "src/lib";
 import { Evaluation as evaluation } from "@prisma/client";
 import { trpc } from "src/lib/trpc";
+import { Dispatch, SetStateAction } from "react";
 
 export interface DashboardStore {
   fetching: boolean;
@@ -11,36 +12,76 @@ export interface DashboardStore {
   createEvaluation: () => Promise<evaluation | Error>;
 }
 
-export const useDashboardStore = create<DashboardStore>()((set, get) => ({
-  fetching: true,
-  evaluations: [],
-
-  load: async () => {
-    trpc()
-      .user.getDashboardStore.query()
-      .then((data) => {
-        if (data instanceof Error) {
-          console.error(`ERROR -- rpc call getUserEvaluations failed`, data);
-          return;
-        }
-
-        set({
-          fetching: false,
-          evaluations: data,
+export function useDashboardStore(setSpinner: Dispatch<SetStateAction<number>>) {
+  return create<DashboardStore>()((set, get) => ({
+    fetching: true,
+    evaluations: [],
+
+    load: async () => {
+      trpc()
+        .user.getDashboardStore.query()
+        .then((data) => {
+          if (data instanceof Error) {
+            console.error(`ERROR -- rpc call getUserEvaluations failed`, data);
+            return;
+          }
+
+          set({
+            fetching: false,
+            evaluations: data,
+          });
+
+          setSpinner((prev) => prev + 1);
         });
-      });
-  },
-
-  createEvaluation: async (): Promise<evaluation | Error> => {
-    const newEvaluation: evaluation = {
-      ...Evaluation.init(),
-    };
-
-    const res = await trpc().admin.createEvaluation.mutate(newEvaluation);
-
-    if (res instanceof Error) {
-      return res;
-    }
-    return newEvaluation;
-  },
-}));
+    },
+
+    createEvaluation: async (): Promise<evaluation | Error> => {
+      const newEvaluation: evaluation = {
+        ...Evaluation.init(),
+      };
+
+      const res = await trpc().admin.createEvaluation.mutate(newEvaluation);
+
+      if (res instanceof Error) {
+        return res;
+      }
+      return newEvaluation;
+    },
+  }));
+}
+
+// setSpinner: Dispatch<SetStateAction<number>>
+
+// export const useDashboardStore = create<DashboardStore>()((set, get) => ({
+//   fetching: true,
+//   evaluations: [],
+
+//   load: async () => {
+//     trpc()
+//       .user.getDashboardStore.query()
+//       .then((data) => {
+//         if (data instanceof Error) {
+//           console.error(`ERROR -- rpc call getUserEvaluations failed`, data);
+//           return;
+//         }
+
+//         set({
+//           fetching: false,
+//           evaluations: data,
+//         });
+//       });
+//   },
+
+//   createEvaluation: async (): Promise<evaluation | Error> => {
+//     const newEvaluation: evaluation = {
+//       ...Evaluation.init(),
+//     };
+
+//     const res = await trpc().admin.createEvaluation.mutate(newEvaluation);
+
+//     if (res instanceof Error) {
+//       return res;
+//     }
+//     return newEvaluation;
+//   },
+// }));

src/components/layout/Layout.tsx

@@ -1,15 +1,29 @@
+import { ErrorBoundary } from "react-error-boundary";
+
 type LayoutProps = {
   children?: React.ReactNode;
 };
 
+function fallbackRender({ error, resetErrorBoundary }: { error: Error; resetErrorBoundary: () => void }) {
+  // Call resetErrorBoundary() to reset the error boundary and retry the render.
+  console.log("caught error", error);
+
+  return (
+    <div role="alert">
+      <p>Something went wrong:</p>
+      <pre style={{ color: "red" }}>{error.message}</pre>
+    </div>
+  );
+}
+
 export default function Layout({ children }: LayoutProps) {
   return (
     <div
       className="w-full min-h-screen h-full bg-[#fafafa] text-offblack flex flex-col relative"
       onDragOver={(evt) => evt.preventDefault()}
       onDrop={(evt) => evt.preventDefault()}
     >
-      {children}
+      <ErrorBoundary fallbackRender={fallbackRender}>{children}</ErrorBoundary>
     </div>
   );
 }

src/pages/_app.tsx

@@ -8,6 +8,7 @@ import { createBrowserSupabaseClient } from "@supabase/auth-helpers-nextjs";
 import { SessionContextProvider } from "@supabase/auth-helpers-react";
 import AuthWrapper from "src/components/layout/AuthWrapper";
 import Head from "next/head";
+import Script from "next/script";
 
 const aileron = localFont({
   src: [

src/server/index.ts

@@ -6,6 +6,10 @@ import { user } from "./routes/user";
 export const appRouter = router({
   admin: admin,
   user: user,
+
+  test1: publicProcedure.query(async () => {
+    throw new Error("test1");
+  }),
 });
 
 // Export type router type signature,