MAT-7372 CQL Library: Unable to draft a library

MeasureAuthoringTool · Jun 27, 2024 · b1c69af · b1c69af
1 parent 3c3361b
commit b1c69af
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/components/createDraftDialog/CreateDraftDialog.test.tsx b/src/components/createDraftDialog/CreateDraftDialog.test.tsx
@@ -210,4 +210,28 @@ describe("Create Draft Dialog component", () => {
       });
     });
   });
+  it("should not update cql even if user renames library when there is no cql", async () => {
+    const onSubmitFn = jest.fn();
+    render(
+      <CreatDraftDialog
+        open={true}
+        onClose={jest.fn()}
+        onSubmit={onSubmitFn}
+        cqlLibrary={{ ...cqlLibrary, cql: null }}
+      />
+    );
+    const cqlLibraryNameInput = screen.getByRole("textbox", {
+      name: "CQL Library Name",
+    });
+    userEvent.clear(cqlLibraryNameInput);
+    userEvent.type(cqlLibraryNameInput, "TestingLibraryName12");
+    userEvent.click(screen.getByRole("button", { name: "Continue" }));
+    await waitFor(() => {
+      expect(onSubmitFn).toHaveBeenCalledWith({
+        ...cqlLibrary,
+        cqlLibraryName: "TestingLibraryName12",
+        cql: null,
+      });
+    });
+  });
 });
diff --git a/src/components/createDraftDialog/CreateDraftDialog.tsx b/src/components/createDraftDialog/CreateDraftDialog.tsx
@@ -38,14 +38,17 @@ const CreatDraftDialog = ({
   });
 
   const submitForm = async (cqlLibraryName: string) => {
+    const cqlContents = cqlLibrary?.cql?.split("\n");
     let cql = cqlLibrary?.cql;
     const previousLibraryName = cqlLibrary?.cqlLibraryName;
     // make sure cql is updated with new library name, if it is changed
     if (
       previousLibraryName !== cqlLibraryName &&
-      cql?.includes(cqlLibrary.cqlLibraryName)
+      cql &&
+      cqlContents[0].includes(cqlLibrary.cqlLibraryName)
     ) {
-      cql = cql.replace(previousLibraryName, cqlLibraryName);
+      cqlContents[0] = `library ${cqlLibraryName} version '${cqlLibrary.version}'`;
+      cql = cqlContents.join("\n");
     }
     return onSubmit({
       ...cqlLibrary,