Added auto-detect for death table upon selecting death_table

Author: brian-kim31

app/airflow/dags/libs/queries.py

@@ -24,18 +24,6 @@
 
 
 find_existing_concepts_query = """
-    -- If the date_event is "death_date", mark this as a death table.
-    UPDATE mapping_scanreporttable
-    SET death_table = TRUE
-    WHERE id = %(table_id)s
-      AND date_event_id IS NOT NULL
-      AND EXISTS (
-          SELECT 1
-          FROM mapping_scanreportfield f
-          WHERE f.id = mapping_scanreporttable.date_event_id
-            AND LOWER(TRIM(f.name)) = 'death_date'
-      );
-
     INSERT INTO temp_existing_concepts_%(table_id)s (
         object_id, sr_concept_id, source_concept_id, content_type_id
     )
@@ -153,7 +141,6 @@
 
 -- If the scan report table has the "death_table" flag set to TRUE, set the destination table to OMOP's "death" table.
 -- This ensures that mapping rules will use "death" as the destination table and, for example, will select "cause_concept_id" as the mapped field.
--- Note: The "death_table" flag may have been set automatically if a date_event was mapped to the "death_date" field earlier in the workflow.
 UPDATE temp_existing_concepts_%(table_id)s temp_existing_concepts
 SET dest_table_id = (SELECT id FROM mapping_omoptable WHERE "table" = 'death' LIMIT 1)
 WHERE (SELECT death_table FROM mapping_scanreporttable WHERE id = %(table_id)s) = TRUE;

app/next-client-app/components/form-components/FormikSelect.tsx

@@ -1,8 +1,6 @@
 import { Field, FieldInputProps, FieldProps, FormikProps } from "formik";
 import Select from "react-select";
 import makeAnimated from "react-select/animated";
-import config from "@/tailwind.config";
-import { useTheme } from "next-themes";
 
 type Option = Object & {
   value: number;
@@ -36,8 +34,8 @@ const CustomSelect = ({
 
   const onChange = (newValue: any, actionMeta: any) => {
     const selectedValues = isMulti
-      ? (newValue as Option[]).map((option) => option.value)
-      : (newValue as Option).value;
+      ? ((newValue as Option[] | null) ?? []).map((option) => option.value)
+      : ((newValue as Option | null)?.value ?? null);
 
     form.setFieldValue(field.name, selectedValues);
   };

app/next-client-app/components/scanreports/ScanReportTableUpdateForm.tsx

@@ -1,12 +1,12 @@
 "use client";
 
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Button } from "@/components/ui/button";
 import { updateScanReportTable } from "@/api/scanreports";
 import { Check, Save, X } from "lucide-react";
 import { toast } from "sonner";
 import { FormDataFilter } from "../form-components/FormikUtils";
-import { Formik } from "formik";
+import { Formik, useFormikContext } from "formik";
 import { FormField, FormItem, FormLabel, FormControl, FormMessage, FormDescription } from "@/components/ui/form";
 import { FormikSelect } from "../form-components/FormikSelect";
 import { useRouter } from "next/navigation";
@@ -31,6 +31,39 @@ interface FormData {
   death_table: boolean;
 }
 
+function DeathDateModalController({
+  deathDateFieldId,
+  setIsDialogOpen,
+  pendingRevertRef,
+}: {
+  deathDateFieldId?: number;
+  setIsDialogOpen: (open: boolean) => void;
+  pendingRevertRef: React.MutableRefObject<number | null | undefined>;
+}) {
+  const { values, setFieldValue } = useFormikContext<FormData>();
+  const prevDateEventRef = useRef(values.dateEvent);
+
+  useEffect(() => {
+    const prev = prevDateEventRef.current;
+    const next = values.dateEvent;
+    prevDateEventRef.current = next;
+
+    if (!deathDateFieldId || next === prev) return;
+
+    if (next === deathDateFieldId && !values.death_table) {
+      pendingRevertRef.current = prev ?? null;
+      setIsDialogOpen(true);
+      return;
+    }
+
+    if (values.death_table && next !== deathDateFieldId) {
+      setFieldValue("death_table", false);
+    }
+  }, [deathDateFieldId, values.dateEvent, values.death_table]);
+
+  return null;
+}
+
 export function ScanReportTableUpdateForm({
   scanreportFields,
   scanreportTable,
@@ -46,13 +79,17 @@ export function ScanReportTableUpdateForm({
 }) {
   const router = useRouter();
   const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const pendingDateEventRevertRef = useRef<number | null | undefined>(undefined);
   const canUpdate =
     permissions.includes("CanEdit") || permissions.includes("CanAdmin");
 
   const fieldOptions = FormDataFilter<ScanReportField>(scanreportFields);
 
   const initialPersonId = FormDataFilter<ScanReportField>(personId);
   const initialDateEvent = FormDataFilter<ScanReportField>(dateEvent);
+  const deathDateField = scanreportFields.find(
+    (field) => field.name?.trim().toLowerCase() === "death_date",
+  );
 
   const handleSubmit = async (data: FormData) => {
     const submittingData = {
@@ -92,6 +129,11 @@ export function ScanReportTableUpdateForm({
       {({ handleSubmit, values, setFieldValue }) => (
         <form className="w-full max-w-2xl" onSubmit={handleSubmit}>
           <div className="flex flex-col gap-5">
+            <DeathDateModalController
+              deathDateFieldId={deathDateField?.id}
+              setIsDialogOpen={setIsDialogOpen}
+              pendingRevertRef={pendingDateEventRevertRef}
+            />
 
             <FormItem>
               <FormLabel>Person ID</FormLabel>
@@ -134,7 +176,16 @@ export function ScanReportTableUpdateForm({
                 <Tooltips
                   content="In the Carrot data standard, death data is provided in a separate file (e.g. death.csv). Mark Yes if this table contains that death data to be mapped to the OMOP Death table."
                 />
-                <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
+                <Dialog
+                  open={isDialogOpen}
+                  onOpenChange={(open) => {
+                    setIsDialogOpen(open);
+                    if (!open && pendingDateEventRevertRef.current !== undefined) {
+                      setFieldValue("dateEvent", pendingDateEventRevertRef.current);
+                      pendingDateEventRevertRef.current = undefined;
+                    }
+                  }}
+                >
                   <DialogContent>
                     <DialogHeader>
                       <DialogTitle>Please Confirm Your Choice</DialogTitle>
@@ -176,6 +227,7 @@ export function ScanReportTableUpdateForm({
                       <Button
                         type="button"
                         onClick={() => {
+                          pendingDateEventRevertRef.current = undefined;
                           setFieldValue("death_table", true);
                           setIsDialogOpen(false);
                         }}