Add support for adding concepts to DEATH table

app/api/api/views.py

@@ -566,6 +566,15 @@ def post(self, request, *args, **kwargs):
                 pk=body["object_id"]
             ).scan_report_field.type_column
 
+        # Checking death_table and meas value domain relationship
+        if domain == "meas value" and table.death_table:
+            return Response(
+                {
+                    "detail": "Because concepts with 'Meas Value' domain will be mapped to Measurement table as 'value_as_concept_id', they should not be added to DEATH table."
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         # Checking field's datatype for concept with domain Observation
         if domain == "observation" and field_datatype.lower() not in [
             "real",
@@ -581,7 +590,7 @@ def post(self, request, *args, **kwargs):
                 status=status.HTTP_400_BAD_REQUEST,
             )
         # validate the destination_table
-        destination_table = _find_destination_table(concept)
+        destination_table = _find_destination_table(concept, table)
         if destination_table is None:
             return Response(
                 {

app/next-client-app/api/scanreports.ts

@@ -16,25 +16,25 @@ const fetchKeys = {
   field: (
     scanReportId: string | number,
     tableId: string | number,
-    fieldId: string | number | undefined,
+    fieldId: string | number | undefined
   ) => `v2/scanreports/${scanReportId}/tables/${tableId}/fields/${fieldId}/`,
   fields: (scanReportId: string, tableId: string, filter?: string) =>
     `v2/scanreports/${scanReportId}/tables/${tableId}/fields/?${filter}`,
   values: (
     scanReportId: string,
     tableId: string,
     fieldId: string,
-    filter?: string,
+    filter?: string
   ) =>
     `v2/scanreports/${scanReportId}/tables/${tableId}/fields/${fieldId}/values/?${filter}`,
 };
 
 export async function getScanReports(
-  filter: string | undefined,
+  filter: string | undefined
 ): Promise<PaginatedResponse<ScanReport>> {
   try {
     return await request<PaginatedResponse<ScanReport>>(
-      fetchKeys.index(filter),
+      fetchKeys.index(filter)
     );
   } catch (error) {
     console.warn("Failed to fetch data.");
@@ -67,7 +67,7 @@ export async function getScanReport(id: string): Promise<ScanReport | null> {
 export async function updateScanReport(
   id: number,
   data: {},
-  needRedirect?: boolean,
+  needRedirect?: boolean
 ) {
   try {
     await request(fetchKeys.get(id), {
@@ -107,7 +107,7 @@ export async function deleteScanReport(id: number) {
  * @returns A object with a list of the users permissions.
  */
 export async function getScanReportPermissions(
-  id: string,
+  id: string
 ): Promise<PermissionsResponse> {
   try {
     return await request<PermissionsResponse>(fetchKeys.permissions(id));
@@ -119,11 +119,11 @@ export async function getScanReportPermissions(
 
 export async function getScanReportTable(
   scanReportId: string,
-  tableId: string,
+  tableId: string
 ): Promise<ScanReportTable> {
   try {
     return await request<ScanReportTable>(
-      fetchKeys.table(scanReportId, tableId),
+      fetchKeys.table(scanReportId, tableId)
     );
   } catch (error) {
     console.warn("Failed to fetch data.");
@@ -136,14 +136,15 @@ export async function getScanReportTable(
       updated_at: new Date(),
       date_event: null,
       permissions: [],
+      death_table: false,
     };
   }
 }
 
 export async function updateScanReportTable(
   scanReportId: string | number,
   tableId: string | number,
-  data: {},
+  data: {}
 ) {
   try {
     await request(fetchKeys.table(scanReportId, tableId), {
@@ -162,11 +163,11 @@ export async function updateScanReportTable(
 
 export async function getScanReportTables(
   scanReportId: string,
-  filter: string | undefined,
+  filter: string | undefined
 ): Promise<PaginatedResponse<ScanReportTable>> {
   try {
     return await request<PaginatedResponse<ScanReportTable>>(
-      fetchKeys.tables(scanReportId, filter),
+      fetchKeys.tables(scanReportId, filter)
     );
   } catch (error) {
     console.warn("Failed to fetch data.");
@@ -177,11 +178,11 @@ export async function getScanReportTables(
 export async function getScanReportFields(
   scanReportId: string,
   tableId: string,
-  filter: string | undefined,
+  filter: string | undefined
 ): Promise<PaginatedResponse<ScanReportField>> {
   try {
     return await request<PaginatedResponse<ScanReportField>>(
-      fetchKeys.fields(scanReportId, tableId, filter),
+      fetchKeys.fields(scanReportId, tableId, filter)
     );
   } catch (error) {
     console.warn("Failed to fetch data.");
@@ -192,11 +193,11 @@ export async function getScanReportFields(
 export async function getScanReportField(
   scanReportId: string,
   tableId: string,
-  fieldId: string | number | undefined,
+  fieldId: string | number | undefined
 ): Promise<ScanReportField> {
   try {
     return await request<ScanReportField>(
-      fetchKeys.field(scanReportId, tableId, fieldId),
+      fetchKeys.field(scanReportId, tableId, fieldId)
     );
   } catch (error) {
     console.warn("Failed to fetch data. Passed ID could be null");
@@ -230,7 +231,7 @@ export async function updateScanReportField(
   scanReportId: string | number,
   tableId: string | number,
   fieldId: string,
-  data: {},
+  data: {}
 ) {
   try {
     await request(fetchKeys.field(scanReportId, tableId, fieldId), {
@@ -248,11 +249,11 @@ export async function updateScanReportField(
 export async function getAllScanReportFields(
   scanReportId: string,
   tableId: string,
-  filter: string | undefined,
+  filter: string | undefined
 ): Promise<ScanReportField[]> {
   try {
     return await fetchAllPages<ScanReportField>(
-      fetchKeys.fields(scanReportId, tableId, filter),
+      fetchKeys.fields(scanReportId, tableId, filter)
     );
   } catch (error) {
     console.warn("Failed to fetch data.");
@@ -264,11 +265,11 @@ export async function getScanReportValues(
   scanReportId: string,
   tableId: string,
   fieldId: string,
-  filter: string | undefined,
+  filter: string | undefined
 ): Promise<PaginatedResponse<ScanReportValue>> {
   try {
     return await request<PaginatedResponse<ScanReportValue>>(
-      fetchKeys.values(scanReportId, tableId, fieldId, filter),
+      fetchKeys.values(scanReportId, tableId, fieldId, filter)
     );
   } catch (error) {
     console.warn("Failed to fetch data.");

app/next-client-app/app/(protected)/scanreports/[id]/columns.tsx

@@ -3,6 +3,7 @@
 import { ColumnDef } from "@tanstack/react-table";
 import { DataTableColumnHeader } from "@/components/data-table/DataTableColumnHeader";
 import { EditButton } from "@/components/scanreports/EditButton";
+import { Tooltips } from "@/components/Tooltips";
 
 export const columns: ColumnDef<ScanReportTable>[] = [
   {
@@ -48,6 +49,40 @@ export const columns: ColumnDef<ScanReportTable>[] = [
     enableHiding: true,
     enableSorting: false,
   },
+  {
+    id: "note",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="Note" />
+    ),
+    cell: ({ row }) => {
+      const { death_table } = row.original;
+      return (
+        <div>
+          {death_table && (
+            <h3 className="flex">
+              {" "}
+              Death table
+              <Tooltips
+                content={
+                  <h2>
+                    Concepts added to this table with domains{" "}
+                    <span className="font-bold">
+                      Race, Ethnicity and Gender
+                    </span>{" "}
+                    will be mapped to the{" "}
+                    <span className="font-bold">Person</span> table. Concepts
+                    with <span className="font-bold">other domains</span> will
+                    be mapped to the <span className="font-bold">Death</span>{" "}
+                    table.
+                  </h2>
+                }
+              />
+            </h3>
+          )}
+        </div>
+      );
+    },
+  },
   {
     id: "edit",
     header: ({ column }) => <DataTableColumnHeader column={column} title="" />,

app/next-client-app/app/(protected)/scanreports/[id]/tables/[tableId]/fields/[fieldId]/page.tsx

@@ -41,21 +41,21 @@ export default async function ScanReportsValue({
     id,
     tableId,
     fieldId,
-    query,
+    query
   );
 
   const scanReportsConcepts =
     scanReportsValues.results.length > 0
       ? await getAllScanReportConcepts(
           `object_id__in=${scanReportsValues.results
             .map((item) => item.id)
-            .join(",")}`,
+            .join(",")}`
         )
       : [];
   const conceptsFilter =
     scanReportsConcepts.length > 0
       ? await getAllConceptsFiltered(
-          scanReportsConcepts?.map((item) => item.concept).join(","),
+          scanReportsConcepts?.map((item) => item.concept).join(",")
         )
       : [];
   return (
@@ -64,7 +64,7 @@ export default async function ScanReportsValue({
         {" "}
         <Link href={`/scanreports/${id}/tables/${tableId}`}>
           <Button variant={"secondary"} className="mb-3">
-            Table: {table.name}
+            Table: {table.name} {table.death_table && "(Death table)"}
           </Button>
         </Link>
         <Button variant={"secondary"} className="mb-3">

app/next-client-app/app/(protected)/scanreports/[id]/tables/[tableId]/fields/[fieldId]/update/page.tsx

@@ -35,7 +35,7 @@ export default async function ScanReportsEditField({
         {" "}
         <Link href={`/scanreports/${id}/tables/${tableId}`}>
           <Button variant={"secondary"} className="mb-3">
-            Table: {table.name}
+            Table: {table.name} {table.death_table && "(Death table)"}
           </Button>
         </Link>
         <Button variant={"secondary"} className="mb-3">

app/next-client-app/app/(protected)/scanreports/[id]/tables/[tableId]/page.tsx

@@ -40,21 +40,21 @@ export default async function ScanReportsField({
       ? await getAllScanReportConcepts(
           `object_id__in=${scanReportsFields.results
             .map((item) => item.id)
-            .join(",")}`,
+            .join(",")}`
         )
       : [];
 
   const conceptsFilter =
     scanReportsConcepts.length > 0
       ? await getAllConceptsFiltered(
-          scanReportsConcepts?.map((item) => item.concept).join(","),
+          scanReportsConcepts?.map((item) => item.concept).join(",")
         )
       : [];
 
   return (
     <div>
       <Button variant={"secondary"} className="mb-3">
-        Table: {tableName.name}
+        Table: {tableName.name} {tableName.death_table && "(Death table)"}
       </Button>
       <div>
         <ConceptDataTable

app/next-client-app/app/(protected)/scanreports/[id]/tables/[tableId]/update/page.tsx

@@ -40,7 +40,7 @@ export default async function UpdateTable({
     <div>
       <Link href={`/scanreports/${id}/tables/${tableId}`}>
         <Button variant={"secondary"} className="mb-3">
-          Update Table: {table.name}
+          Update Table: {table.name} {table.death_table && "(Death table)"}
         </Button>
       </Link>
       {(table.date_event === null || table.person_id === null) && (

app/next-client-app/components/Tooltips.tsx

@@ -6,16 +6,17 @@ import {
 } from "@/components/ui/tooltip";
 
 import { InfoIcon } from "lucide-react";
+import { ReactElement } from "react";
 
 export function Tooltips({
   content,
   link,
 }: {
-  content: string;
+  content: string | ReactElement;
   link?: string;
 }) {
   return (
-    <TooltipProvider>
+    <TooltipProvider delayDuration={100}>
       <Tooltip>
         <TooltipTrigger asChild>
           <InfoIcon className="ml-1 size-4 text-carrot" />