Merge pull request #394 from MeasureAuthoringTool/MAT-7969/fixingDele…

…tingTheCodeAfterEditing MAT-7969, 7987, 7989 fixed deleting code, applying code bug, displaying versions in libraries
MeasureAuthoringTool · Dec 4, 2024 · e2ac37b · e2ac37b
2 parents e8c59ec + ce4efe6
commit e2ac37b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/src/CqlBuilderPanel/CqlBuilderPanel.tsx b/src/CqlBuilderPanel/CqlBuilderPanel.tsx
@@ -21,6 +21,7 @@ export default function CqlBuilderPanel({
   cqlMetaData,
   measureModel,
   handleCodeDelete,
+  editorVal,
   setEditorVal,
   setIsCQLUnchanged,
   isCQLUnchanged,
@@ -215,6 +216,7 @@ export default function CqlBuilderPanel({
               cqlMetaData={cqlMetaData}
               measureModel={measureModel}
               handleCodeDelete={handleCodeDelete}
+              editorVal={editorVal}
               setEditorVal={setEditorVal}
               setIsCQLUnchanged={setIsCQLUnchanged}
               isCQLUnchanged={isCQLUnchanged}

diff --git a/src/CqlBuilderPanel/Includes/CqlLibraryDetailsDialog.tsx b/src/CqlBuilderPanel/Includes/CqlLibraryDetailsDialog.tsx
@@ -143,17 +143,17 @@ const CqlLibraryDetailsDialog = ({
           }}
           size="small"
           onChange={(evt) => handleVersionChange(evt.target.value)}
-          options={library?.otherVersions?.map((version) => {
-            return (
+          options={library?.otherVersions
+            .sort((a, b) => b.localeCompare(a, undefined, { numeric: true }))
+            .map((version) => (
               <MenuItem
                 key={version}
                 value={version}
                 data-testid={`option-${version}`}
               >
                 {version}
               </MenuItem>
-            );
-          })}
+            ))}
         />
       );
     } else {

diff --git a/src/CqlBuilderPanel/codesSection/CodesSection.tsx b/src/CqlBuilderPanel/codesSection/CodesSection.tsx
@@ -19,6 +19,7 @@ interface CodesSectionProps {
   cqlMetaData: CqlMetaData;
   measureModel: string;
   handleCodeDelete;
+  editorVal: string;
   setEditorVal: Function;
   setIsCQLUnchanged: Function;
   isCQLUnchanged: boolean;
@@ -31,6 +32,7 @@ export default function CodesSection({
   cqlMetaData,
   measureModel,
   handleCodeDelete,
+  editorVal,
   setEditorVal,
   setIsCQLUnchanged,
   isCQLUnchanged,
@@ -87,6 +89,7 @@ export default function CodesSection({
             canEdit={canEdit}
             handleApplyCode={handleApplyCode}
             measureModel={measureModel}
+            editorVal={editorVal}
           />
         )}
         {activeTab === "savedCodes" && (

diff --git a/src/CqlBuilderPanel/codesSection/codesSubSection/codeSubSection/CodeSubSection.tsx b/src/CqlBuilderPanel/codesSection/codesSubSection/codeSubSection/CodeSubSection.tsx
@@ -13,13 +13,15 @@ interface CodeSectionProps {
   allCodeSystems: CodeSystem[];
   handleApplyCode: string;
   measureModel: string;
+  editorVal: string;
 }
 
 export default function CodeSubSection({
   canEdit,
   allCodeSystems,
   handleApplyCode,
   measureModel,
+  editorVal,
 }: CodeSectionProps) {
   const [code, setCode] = useState<Code>();
   const [showResultsTable, setShowResultsTable] = useState(false);
@@ -73,6 +75,7 @@ export default function CodeSubSection({
         showResultsTable={showResultsTable}
         setShowResultsTable={setShowResultsTable}
         code={code}
+        editorVal={editorVal}
         handleApplyCode={handleApplyCode}
       />
       <Toast

diff --git a/src/CqlBuilderPanel/codesSection/codesSubSection/codeSubSection/ResultsSection.tsx b/src/CqlBuilderPanel/codesSection/codesSubSection/codeSubSection/ResultsSection.tsx
@@ -25,6 +25,7 @@ type ResultSectionProps = {
   setShowResultsTable: any;
   code: Code;
   handleApplyCode;
+  editorVal: string;
 };
 
 type ResultsColumnRow = {
@@ -41,6 +42,7 @@ export default function ResultsSection({
   setShowResultsTable,
   code,
   handleApplyCode,
+  editorVal,
 }: ResultSectionProps) {
   const [selectedCodeDetails, setSelectedCodeDetails] =
     useState<ResultsColumnRow>(null);
@@ -116,7 +118,7 @@ export default function ResultsSection({
         ),
       },
     ],
-    []
+    [editorVal]
   );
 
   const table = useReactTable({

diff --git a/...qlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.tsx b/...qlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.tsx
@@ -267,7 +267,7 @@ export default function SavedCodesSubSection({
         ),
       },
     ],
-    []
+    [isCQLUnchanged]
   );
 
   const table = useReactTable({

diff --git a/src/cqlEditorWithTerminology/CqlEditorWithTerminology.tsx b/src/cqlEditorWithTerminology/CqlEditorWithTerminology.tsx
@@ -110,6 +110,7 @@ const CqlEditorWithTerminology = ({
               setEditorVal={setEditorVal}
               setIsCQLUnchanged={setIsCQLUnchanged}
               isCQLUnchanged={isCQLUnchanged}
+              editorVal={value}
               handleApplyCode={handleApplyCode}
               handleApplyParameter={handleApplyParameter}
               handleParameterEdit={handleParameterEdit}
-Original file line number
+Diff line change
@@ Expand Up / @@ -267,7 +267,7 @@ export default function SavedCodesSubSection({ @@
             ),
           },
         ],
-        []
+        [isCQLUnchanged]
       );
       const table = useReactTable({
@@ Expand Down @@