MAT-7795 use CqlFunction to line up with madie-measure

MeasureAuthoringTool · Dec 18, 2024 · fac2c90 · fac2c90
1 parent f0e0a13
commit fac2c90
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/AceEditor/madie-ace-editor.tsx b/src/AceEditor/madie-ace-editor.tsx
@@ -26,7 +26,7 @@ import { Definition } from "../CqlBuilderPanel/definitionsSection/definitionBuil
 import { SelectedLibrary } from "../CqlBuilderPanel/Includes/CqlLibraryDetailsDialog";
 import { Funct } from "../CqlBuilderPanel/functionsSection/functionBuilder/FunctionBuilder";
 import CqlVersion from "@madie/cql-antlr-parser/dist/src/dto/CqlVersion";
-import { FunctionLookup } from "../model/CqlBuilderLookup";
+import { CQLFunction } from "../model/CqlFunction";
 
 export interface EditorPropsType {
   value: string;
@@ -48,7 +48,7 @@ export interface EditorPropsType {
   ) => void;
   handleDeleteLibrary?: (lib: SelectedLibrary) => void;
   handleApplyFunction?: (funct: Funct) => void;
-  handleFunctionDelete?: (funct: FunctionLookup) => void;
+  handleFunctionDelete?: (funct: CQLFunction) => void;
   parseDebounceTime?: number;
   inboundAnnotations?: Ace.Annotation[];
   inboundErrorMarkers?: Ace.MarkerLike[];

diff --git a/src/CqlBuilderPanel/functionsSection/functions/Functions.tsx b/src/CqlBuilderPanel/functionsSection/functions/Functions.tsx
@@ -20,6 +20,7 @@ import {
   MadieConfirmDialog,
 } from "@madie/madie-design-system/dist/react";
 import Tooltip from "@mui/material/Tooltip";
+import { CQLFunction } from "../../../model/CqlFunction";
 
 const TH = tw.th`p-3 text-left text-sm font-bold capitalize`;
 const TD = tw.td`p-3 text-left text-sm break-all`;
@@ -51,7 +52,7 @@ const Functions = ({
   const [visibleFunctions, setVisibleFunctions] = useState<FunctionLookup[]>(
     []
   );
-  const [selectedFunction, setSelectedFunction] = useState<FunctionLookup>();
+  const [selectedFunction, setSelectedFunction] = useState<CQLFunction>();
   const [deleteDialogOpen, setDeleteDialogOpen] = useState<boolean>(false);
   const [discardDialog, setDiscardDialog] = useState({
     open: false,
@@ -147,14 +148,16 @@ const Functions = ({
                   size: "small",
                   onClick: (e) => {
                     const tableData = table.getRow(row.cell.row.id).original;
-                    const functionToDelete = {
+                    const functionToDelete: CQLFunction = {
                       functionName: tableData.name,
                       comment: tableData.comment,
-                      functionsArguments: tableData.arguments,
-                      fluentFunction: tableData.isFluent,
+                      functionsArguments: row.cell.row.original.argumentNames,
+                      fluentFunction:
+                        tableData.isFluent === "Yes" ? true : false,
                       expressionValue: tableData.logic,
+                      expression: tableData.logic,
                     };
-                    setSelectedFunction(tableData);
+                    setSelectedFunction(functionToDelete);
                     if (!isCQLUnchanged) {
                       setDiscardDialog({ open: true, operation: "delete" });
                     } else {

diff --git a/src/model/CqlFunction.ts b/src/model/CqlFunction.ts
@@ -0,0 +1,13 @@
+export interface CQLFunctionArgument {
+  argumentName?: string;
+  dataType?: string;
+}
+
+export interface CQLFunction {
+  functionName?: string;
+  expression?: string;
+  comment?: string;
+  fluentFunction?: boolean;
+  expressionValue?: string;
+  functionsArguments?: CQLFunctionArgument[];
+}