diff --git a/run_build.sh b/run_build.sh new file mode 100644 index 0000000..d6cb288 --- /dev/null +++ b/run_build.sh @@ -0,0 +1 @@ +npm run build diff --git a/src/app/db/schema/solar.ts b/src/app/db/schema/solar.ts index ea7ca22..94088a4 100644 --- a/src/app/db/schema/solar.ts +++ b/src/app/db/schema/solar.ts @@ -10,7 +10,7 @@ import { boolean, } from "drizzle-orm/pg-core"; import { InferModel } from "drizzle-orm"; -import { C } from "drizzle-orm/db.d-cf0abe10"; +// import { C } from "drizzle-orm/db.d-cf0abe10"; export const solar = pgTable("solar", { id: bigserial("id", { mode: "bigint" }).primaryKey(), diff --git a/src/app/db/surveyDB/utils/utility.ts b/src/app/db/surveyDB/utils/utility.ts index 5fbd0c8..adeeaf0 100644 --- a/src/app/db/surveyDB/utils/utility.ts +++ b/src/app/db/surveyDB/utils/utility.ts @@ -1,8 +1,9 @@ // insertUploadedFile.ts -import { uploaded_files } from "@/app/db/surveyDB/schema/surveyDB"; +import { uploaded_files, docTypeEnum } from "@/app/db/surveyDB/schema/surveyDB"; import { surveyDB } from "../connection"; import type { ReportType, ReportTypeSchema} from "../schema/documents"; import { reportTypeToDbLabel } from "../schema/documents"; +type DbDocType = (typeof docTypeEnum.enumValues)[number]; export interface UploadedFileInput { s3JsonUri?: string; // optional @@ -19,7 +20,7 @@ export async function insertUploadedFile(data: UploadedFileInput) { .values({ s3JsonUri: data.s3JsonUri ?? null, // Pass null if missing s3FileUri: data.s3FileUri, - docType: reportTypeToDbLabel[data.docType], // map UI value -> DB enum NAME + docType: reportTypeToDbLabel[data.docType] as DbDocType, // map UI value -> DB enum NAME s3FileUploadTimestamp: data.s3FileUploadTimestamp, s3JsonUploadTimestamp: data.s3JsonUploadTimestamp ?? null, // Pass null if missing uprn: data.uprn, diff --git a/src/app/portfolio/[slug]/components/RemoteAssessmentDropdowns.tsx b/src/app/portfolio/[slug]/components/RemoteAssessmentDropdowns.tsx index 1da5392..706e272 100644 --- a/src/app/portfolio/[slug]/components/RemoteAssessmentDropdowns.tsx +++ b/src/app/portfolio/[slug]/components/RemoteAssessmentDropdowns.tsx @@ -2,7 +2,7 @@ import { Menu, Transition } from "@headlessui/react"; import { Fragment } from "react"; import { Button } from "@/app/shadcn_components/ui/button"; import { PlusIcon, ChevronDownIcon } from "@heroicons/react/20/solid"; -import { Float } from "@headlessui-float/react"; +// import { Float } from "@headlessui-float/react"; export type Option = { label: string; value: string; disabled?: boolean }; diff --git a/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx b/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx index e838e08..b3ea2a9 100644 --- a/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx +++ b/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx @@ -1,6 +1,14 @@ "use client"; -import { Dialog, Transition } from "@headlessui/react"; +import { + Dialog, + DialogBackdrop, + DialogPanel, + DialogTitle, + Transition, + TransitionChild, +} from "@headlessui/react"; + import { Fragment, useMemo } from "react"; import { Input } from "@/app/shadcn_components/ui/input"; import { Button } from "@/app/shadcn_components/ui/button"; @@ -542,7 +550,7 @@ export default function RemoteAssessmentModal({ onClose={() => setIsOpen(false)} >