Merge branch 'develop' of https://github.com/MeasureAuthoringTool/mad…

…ie-editor into MAT-6401_noContextError

src/AceEditor/madie-ace-editor.tsx

@@ -25,6 +25,7 @@ import {
 } from "../api/useTerminologyServiceApi";
 import { Definition } from "../CqlBuilderPanel/definitionsSection/definitionBuilder/DefinitionBuilder";
 import { SelectedLibrary } from "../CqlBuilderPanel/Includes/CqlLibraryDetailsDialog";
+import { Funct } from "../CqlBuilderPanel/functionsSection/functionBuilder/FunctionBuilder";
 
 export interface EditorPropsType {
   value: string;
@@ -45,6 +46,7 @@ export interface EditorPropsType {
     editedLib: SelectedLibrary
   ) => void;
   handleDeleteLibrary?: (lib: SelectedLibrary) => void;
+  handleApplyFunction?: (funct: Funct) => void;
   parseDebounceTime?: number;
   inboundAnnotations?: Ace.Annotation[];
   inboundErrorMarkers?: Ace.MarkerLike[];

src/CqlBuilderPanel/CqlBuilderPanel.test.tsx

@@ -98,6 +98,7 @@ jest.mock("@madie/madie-util", () => ({
   useFeatureFlags: jest.fn().mockReturnValue({
     CQLBuilderIncludes: true,
     CQLBuilderDefinitions: true,
+    CQLBuilderFunctions: true,
     QDMValueSetSearch: true,
     qdmCodeSearch: true,
   }),
@@ -121,6 +122,9 @@ const props = {
   handleDeleteLibrary: jest.fn(),
   handleEditLibrary: jest.fn(),
   handleDefinitionEdit: jest.fn(),
+  handleApplyFunction: jest.fn(),
+  handleParameterEdit: jest.fn(),
+  handleApplyParameter: jest.fn(),
   resetCql: jest.fn(),
   getCqlDefinitionReturnTypes: jest.fn(),
   makeExpanded: jest.fn(),
@@ -867,4 +871,40 @@ describe("CqlBuilderPanel", () => {
       expect(aceEditor.value).toContain("Some more Text");
     });
   });
+
+  it("Functions tab exists and it's enabled", async () => {
+    useFeatureFlags.mockImplementationOnce(() => ({
+      CQLBuilderIncludes: true,
+      QDMValueSetSearch: true,
+      CQLBuilderDefinitions: true,
+      qdmCodeSearch: true,
+      CQLBuilderParameters: true,
+      CQLBuilderFunctions: true,
+    }));
+    const newProps = { ...props, canEdit: false };
+    mockedAxios.put.mockResolvedValue({
+      data: mockCqlBuilderLookUpData,
+    });
+    render(<CqlBuilderPanel {...newProps} />);
+    const parameterTab = await screen.queryByText("Functions");
+    expect(parameterTab).toBeInTheDocument();
+    expect(parameterTab).toBeEnabled();
+  });
+
+  it("Functions tab does not exist", async () => {
+    useFeatureFlags.mockImplementationOnce(() => ({
+      CQLBuilderIncludes: true,
+      QDMValueSetSearch: true,
+      CQLBuilderDefinitions: true,
+      qdmCodeSearch: true,
+      CQLBuilderParameters: true,
+      CQLBuilderFunctions: false,
+    }));
+    mockedAxios.put.mockResolvedValue({
+      data: mockCqlBuilderLookUpData,
+    });
+    render(<CqlBuilderPanel {...props} />);
+    const parameterTab = await screen.queryByText("Functions");
+    expect(parameterTab).not.toBeInTheDocument();
+  });
 });

src/CqlBuilderPanel/CqlBuilderPanel.tsx

@@ -3,6 +3,7 @@ import CqlBuilderSectionPanelNavTabs from "./CqlBuilderSectionPanelNavTabs";
 import ValueSetsSection from "./ValueSets/ValueSets";
 import CodesSection from "./codesSection/CodesSection";
 import DefinitionsSection from "./definitionsSection/DefinitionsSection";
+import FunctionsSection from "./functionsSection/FunctionsSection";
 import { useFeatureFlags } from "@madie/madie-util";
 import IncludesTabSection from "./Includes/Includes";
 import Parameters from "./Parameters/Parameters";
@@ -34,13 +35,18 @@ export default function CqlBuilderPanel({
   handleApplyDefinition,
   handleDefinitionEdit,
   handleDefinitionDelete,
+  handleApplyFunction,
   resetCql,
   getCqlDefinitionReturnTypes,
   makeExpanded,
 }) {
   const featureFlags = useFeatureFlags();
-  const { CQLBuilderDefinitions, CQLBuilderIncludes, CQLBuilderParameters } =
-    featureFlags;
+  const {
+    CQLBuilderDefinitions,
+    CQLBuilderIncludes,
+    CQLBuilderParameters,
+    CQLBuilderFunctions,
+  } = featureFlags;
   // we have multiple flags and need to select a starting value based off of what's available and canEdit.
   const getStartingPage = (() => {
     // if cqlBuilderIncludes -> includes
@@ -128,6 +134,8 @@ export default function CqlBuilderPanel({
             setLoading(false);
           });
       }
+    } else {
+      setLoading(false);
     }
   }, [measureModel, measureStoreCql]);
 
@@ -141,6 +149,7 @@ export default function CqlBuilderPanel({
           isQDM={measureModel?.includes("QDM")}
           CQLBuilderParameters={CQLBuilderParameters}
           CQLBuilderIncludes={CQLBuilderIncludes}
+          CQLBuilderFunctions={CQLBuilderFunctions}
         />
         <div
           style={{
@@ -242,6 +251,14 @@ export default function CqlBuilderPanel({
               loading={loading}
             />
           )}
+
+          {activeTab === "functions" && (
+            <FunctionsSection
+              canEdit={canEdit}
+              handleApplyFunction={handleApplyFunction}
+              loading={loading}
+            />
+          )}
         </div>
       </div>
     </div>

src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx

@@ -6,6 +6,7 @@ export interface NavTabProps {
   CQLBuilderIncludes: boolean;
   CQLBuilderParameters: boolean;
   CQLBuilderDefinitions: boolean;
+  CQLBuilderFunctions: boolean;
   isQDM: boolean;
 }
 
@@ -16,6 +17,7 @@ export default function CqlBuilderSectionPanelNavTabs(props: NavTabProps) {
     CQLBuilderDefinitions,
     CQLBuilderIncludes,
     CQLBuilderParameters,
+    CQLBuilderFunctions,
     isQDM,
   } = props;
 
@@ -78,6 +80,16 @@ export default function CqlBuilderSectionPanelNavTabs(props: NavTabProps) {
           data-testid="definitions-tab"
         />
       )}
+      {CQLBuilderFunctions && (
+        <Tab
+          tabIndex={0}
+          aria-label="Functions"
+          type="D"
+          value="functions"
+          label="Functions"
+          data-testid="functions-tab"
+        />
+      )}
     </Tabs>
   );
 }

src/CqlBuilderPanel/common/ConfirmationDialog.tsx

@@ -0,0 +1,39 @@
+import React from "react";
+import { MadieDialog } from "@madie/madie-design-system/dist/react";
+import ErrorIcon from "@mui/icons-material/Error";
+
+const ConfirmationDialog = ({ open, onClose, onSubmit }) => {
+  return (
+    <MadieDialog
+      title="Are you sure?"
+      dialogProps={{
+        onClose,
+        open,
+      }}
+      cancelButtonProps={{
+        variant: "secondary",
+        cancelText: "Cancel",
+        "data-testid": "confirmation-cancel-button",
+      }}
+      continueButtonProps={{
+        variant: "cyan",
+        type: "submit",
+        "data-testid": "confirmation-clear-button",
+        continueText: "Clear",
+        onClick: onSubmit,
+      }}
+    >
+      <div id="discard-changes-dialog-body">
+        <section className="dialog-warning-body">
+          <p>You are about to clear this function, including all arguments.</p>
+        </section>
+        <section className="dialog-warning-action">
+          <ErrorIcon />
+          <p>This action cannot be undone!</p>
+        </section>
+      </div>
+    </MadieDialog>
+  );
+};
+
+export default ConfirmationDialog;

src/CqlBuilderPanel/definitionsSection/Definitions.scss

@@ -68,6 +68,9 @@
       margin-top: 1rem;
       margin-right: 32px;
     }
+    > #clear-definition-btn:focus {
+      margin-right: 16px;
+    }
     > button[type="submit"] {
       margin-top: 0;
     }

src/CqlBuilderPanel/functionsSection/FunctionSectionNavTabs.tsx

@@ -0,0 +1,46 @@
+import React from "react";
+import { Tabs, Tab } from "@madie/madie-design-system/dist/react";
+
+export interface NavTabProps {
+  activeTab: string;
+  setActiveTab: (value: string) => void;
+  functionCount: number;
+  loading: boolean;
+}
+
+export default function FunctionSectionNavTabs(props: NavTabProps) {
+  const { activeTab, setActiveTab, functionCount, loading } = props;
+
+  return (
+    <div style={{ borderBottom: "1px solid #b0b0b0" }} tw="flex flex-row">
+      <Tabs
+        id="function-tabs"
+        value={activeTab}
+        onChange={(e, v) => {
+          setActiveTab(v);
+        }}
+        type="B"
+        visibleScrollbar
+        variant="scrollable"
+        scrollButtons={false}
+      >
+        <Tab
+          tabIndex={0}
+          aria-label="Function"
+          type="B"
+          label="Function"
+          data-testid="function-tab"
+          value="function"
+        />
+        <Tab
+          tabIndex={0}
+          aria-label="Saved Functions"
+          type="B"
+          label={`Saved Functions ${!loading ? "(" + functionCount + ")" : ""}`}
+          data-testid="saved-functions-tab"
+          value="saved-functions"
+        />
+      </Tabs>
+    </div>
+  );
+}

src/CqlBuilderPanel/functionsSection/Functions.scss

@@ -0,0 +1,89 @@
+#function-form {
+  font-family: Rubik, sans-serif;
+  grid-column: span 5 / span 14;
+  display: flex;
+  flex-direction: column;
+  padding-top: 32px;
+  textArea {
+    box-sizing: border-box;
+    border-radius: 3px;
+    border: solid 1px #8c8c8c;
+    background-color: #fff;
+    opacity: 1;
+    height: 100%;
+    font-size: 14px;
+    font-weight: 400;
+    resize: both;
+    color: #333;
+    &::placeholder {
+      color: #717171;
+      opacity: 1;
+    }
+  }
+  > .content {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    position: relative;
+    .subTitle {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: baseline;
+      padding-bottom: 8px;
+      margin-bottom: 33px;
+      border-bottom: solid 1px;
+      position: relative;
+      h2 {
+        font-size: 24px;
+        border: none;
+        margin: 0;
+        padding: 0;
+      }
+    }
+    h3 {
+      font-weight: 400;
+      font-size: 32px;
+      line-height: 48px;
+      display: flex;
+      flex-direction: row;
+      padding-bottom: 8px;
+      border-bottom: solid 1px #8c8c8c;
+    }
+    label:not(.Mui-disabled) {
+      font-weight: 500;
+      font-size: 14px;
+      line-height: 17px;
+      color: #333333;
+      text-transform: none;
+      margin-bottom: 7px;
+    }
+  }
+  .form-actions {
+    display: flex;
+    flex-direction: row;
+    min-width: 100%;
+    justify-content: end;
+    > .cancel-button {
+      margin-top: 1rem;
+      margin-right: 32px;
+    }
+    > #clear-function-btn:focus {
+      margin-right: 16px;
+    }
+    > button[type="submit"] {
+      margin-top: 0;
+    }
+  }
+  .left-box {
+    width: 40%;
+    float: left;
+  }
+  .right-box {
+    width: 55%;
+    font-family: Rubik, sans-serif;
+    margin-left: 30px;
+    height: 80%;
+    float: right;
+  }
+}