Merge pull request #412 from MeasureAuthoringTool/MAT-7937

MAT-7937: add returntype to definitions table
MeasureAuthoringTool · Dec 31, 2024 · cd24d70 · cd24d70
2 parents 2d70195 + d017186
commit cd24d70
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/src/CqlBuilderPanel/definitionsSection/definitions/Definitions.tsx b/src/CqlBuilderPanel/definitionsSection/definitions/Definitions.tsx
@@ -85,13 +85,17 @@ const Definitions = ({
     managePagination();
   }, [definitions, currentPage, currentLimit]);
 
-  const showEditDefinitionDialog = (index) => {
+  const getReturnType = (index) => {
     const rowModal = table.getRow(index).original;
     const returnTypes = getCqlDefinitionReturnTypes();
-    const returnType = returnTypes
-      ? returnTypes[_.camelCase(rowModal.name)]
-      : undefined;
-    setSelectedDefinition({ ...rowModal, returnType: returnType });
+    return returnTypes ? returnTypes[_.camelCase(rowModal.name)] : undefined;
+  };
+
+  const showEditDefinitionDialog = (index) => {
+    setSelectedDefinition({
+      ...table.getRow(index).original,
+      returnType: getReturnType(index),
+    });
   };
 
   // table data
@@ -103,6 +107,14 @@ const Definitions = ({
         header: "Name",
         accessorKey: "name",
       },
+      {
+        header: "Return Type",
+        accessorKey: "returnType",
+        cell: (row: any) => {
+          const returnTypeShow = getReturnType(row.cell.row.id);
+          return <div>{returnTypeShow == "NA" ? "" : returnTypeShow}</div>;
+        },
+      },
       {
         header: "Comment",
         accessorKey: "comment",