From 1b51f41df20f00294618f24d9f8645e3a2ebbc81 Mon Sep 17 00:00:00 2001
From: Raghavan Chandrabalan <raghavan.chandrabalan@purajuniper.com>
Date: Mon, 24 Jan 2022 17:00:31 -0500
Subject: [PATCH 1/8] remove any from freezer-js declaration file

---
 src/freezer-js.d.ts | 62 ++++++++++++++++++++++-----------------------
 src/state.ts        |  4 +--
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/freezer-js.d.ts b/src/freezer-js.d.ts
index 4f2b1e6..fb5cf28 100644
--- a/src/freezer-js.d.ts
+++ b/src/freezer-js.d.ts
@@ -5,29 +5,29 @@ declare module 'freezer-js' {
         freezeInstances: boolean,
     }
 
-    export type EventDict<E> = E extends {[K in keyof E]: (...args: any[]) => any} ? {
+    export type EventDict<E> = E extends {[K in keyof E]: (...args: any[]) => unknown} ? {
         [K in keyof E]: E[K]
     } : never;
 
     // FreezerEvents shortened to FE because it will be repeated a lot!
-    export type FE<T, E extends EventDict<any>> = E & {
+    export type FE<T, E> = E & {
         "update": (state: T, prevState: T) => void,
-        "beforeAll": <K extends keyof E>(eventName: K, ...args: Parameters<E[K]>) => void,
-        "afterAll": <K extends keyof E>(eventName: K, ...args: Parameters<E[K]>) => void,
+        "beforeAll": <K extends keyof E>(eventName: K, ...args: Parameters<E extends EventDict<E> ? E[K] : never>) => void,
+        "afterAll": <K extends keyof E>(eventName: K, ...args: Parameters<E extends EventDict<E> ? E[K] : never>) => void,
     };
 
-    export type FreezerListener<E extends EventDict<any>> = {
-        on: <K extends keyof E>(eventName: K, cb: E[K]) => FreezerListener<E>;
-        once: <K extends keyof E>(eventName: K, cb: E[K]) => FreezerListener<E>;
-        off: <K extends keyof E>(eventName: K, cb: E[K]) => FreezerListener<E>;
-        emit: <K extends keyof E>(eventName: K, ...args: Parameters<E[K]>) => ReturnType<E[K]>;
-        trigger: <K extends keyof E>(eventName: K, ...args: Parameters<E[K]>) => ReturnType<E[K]>; // deprecated
+    export type FreezerListener<T, E> = {
+        on: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<T, E>;
+        once: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<T, E>;
+        off: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<T, E>;
+        emit: <K extends keyof FE<T, E>>(eventName: K, ...args: Parameters<E extends EventDict<E> ? FE<T, E>[K] : never>) => ReturnType<E extends EventDict<E> ? FE<T, E>[K] : never>;
+        trigger: <K extends keyof FE<T, E>>(eventName: K, ...args: Parameters<E extends EventDict<E> ? FE<T, E>[K] : never>) => ReturnType<E extends EventDict<E> ? FE<T, E>[K] : never>; // deprecated
     };
     
-    export type FreezerNode<T, E extends EventDict<any>> = T extends Array<infer ArrayType> ? FreezerArray<ArrayType, E> : T extends string | number | boolean | null | undefined ? T : FreezerObject<T, E>;
+    export type FreezerNode<T, E> = T extends Array<infer ArrayType> ? FreezerArray<ArrayType, E> : T extends string | number | boolean | null | undefined ? T : FreezerObject<T, E>;
 
-    type FreezerCommon<T, E extends EventDict<any>> = FreezerListener<E> & {
-        getListener(): FreezerListener<E>,
+    type FreezerCommon<T, E> = FreezerListener<T, E> & {
+        getListener(): FreezerListener<T, E>,
         now(): void,
         pivot(): FreezerNodePivoted<T, E, T>,
         reset(a: FreezerNode<T, E>): FreezerNode<T, E>,
@@ -38,7 +38,7 @@ declare module 'freezer-js' {
         transact(): void,
     }
 
-    type FreezerArray<T, E extends EventDict<any>> = FreezerCommon<T, E> & {
+    type FreezerArray<T, E> = FreezerCommon<T, E> & {
         append(a: T[]): FreezerArray<T, E>,
         pop(): T | undefined,
         prepend(): FreezerArray<T, E>,
@@ -58,7 +58,7 @@ declare module 'freezer-js' {
           : K
       }[keyof T], undefined>
       
-    type FreezerObject<T, E extends EventDict<any>> = FreezerCommon<T, E> & {
+    type FreezerObject<T, E> = FreezerCommon<T, E> & {
         remove(a: OptionalPropertyOf<T>): FreezerObject<T, E>,
         remove(a: OptionalPropertyOf<T>[]): FreezerObject<T, E>,
     } & {
@@ -66,9 +66,9 @@ declare module 'freezer-js' {
     };
 
     // Definitions repeated for pivots
-    export type FreezerNodePivoted<PivotType, E extends EventDict<any>, T> = T extends Array<infer Type> ? FreezerArrayPivoted<PivotType, E, Type> : T extends string | number | boolean | null | undefined ? T : FreezerObjectPivoted<PivotType, E, T>;
+    export type FreezerNodePivoted<PivotType, E, T> = T extends Array<infer ArrayType> ? FreezerArrayPivoted<PivotType, E, ArrayType> : T extends string | number | boolean | null | undefined ? T : FreezerObjectPivoted<PivotType, E, T>;
 
-    type FreezerCommonPivoted<PivotType, E extends EventDict<any>, T> = FreezerListener<E> & {
+    type FreezerCommonPivoted<PivotType, E, T> = FreezerListener<T, E> & {
         getListener(): void,
         now(): void,
         pivot(): FreezerNodePivoted<T, E, T>,
@@ -80,7 +80,7 @@ declare module 'freezer-js' {
         transact(): void,
     }
 
-    type FreezerArrayPivoted<PivotType, E extends EventDict<any>, T> = FreezerCommonPivoted<PivotType, E, T> & {
+    type FreezerArrayPivoted<PivotType, E, T> = FreezerCommonPivoted<PivotType, E, T> & {
         append(): FreezerNodePivoted<PivotType, E, PivotType>,
         pop(): T | undefined,
         prepend(): FreezerNodePivoted<PivotType, E, PivotType>,
@@ -93,7 +93,7 @@ declare module 'freezer-js' {
         unshift(): FreezerNodePivoted<PivotType, E, PivotType>,
     } & FreezerNodePivoted<PivotType, E, T>[];
 
-    type FreezerObjectPivoted<PivotType, E extends EventDict<any>, T> = FreezerCommonPivoted<PivotType, E, T> & {
+    type FreezerObjectPivoted<PivotType, E, T> = FreezerCommonPivoted<PivotType, E, T> & {
         // remove(a: string): FreezerObject<Omit<T,a>>,
         remove(a: string): FreezerNodePivoted<PivotType, E, PivotType>,
         remove(a: string[]): FreezerNodePivoted<PivotType, E, PivotType>,
@@ -101,24 +101,24 @@ declare module 'freezer-js' {
         [K in keyof T]-?: FreezerNodePivoted<PivotType, E, T[K]>
     };
 
-    export class Freezer<T, E extends EventDict<any>>{
+    export class Freezer<T, E>{
         constructor(a: T, b?: FreezerOptions);
 
-        get() : FreezerNode<T, FE<T, E>>;
-        set(state: T) : FreezerNode<T, FE<T, E>>;
-        set(state: FreezerNode<T, FE<T, E>>) : FreezerNode<T, FE<T, E>>;
+        get() : FreezerNode<T, E>;
+        set(state: T) : FreezerNode<T, E>;
+        set(state: FreezerNode<T, E>) : FreezerNode<T, E>;
         // set() : FreezerCommon<T, FE<T, E>>;
         
-        getEventHub() : FreezerListener<FE<T, E>>;
+        getEventHub() : FreezerListener<T, E>;
 
-        getData() : FreezerCommon<T, FE<T, E>>;
-        setData() : FreezerCommon<T, FE<T, E>>;
+        getData() : FreezerCommon<T, E>;
+        setData() : FreezerCommon<T, E>;
 
-        on: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<FE<T, E>>;
-        once: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<FE<T, E>>;
-        off: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<FE<T, E>>;
-        emit: <K extends keyof FE<T, E>>(eventName: K, ...args: Parameters<FE<T, E>[K]>) => ReturnType<FE<T, E>[K]>;
-        trigger: <K extends keyof FE<T, E>>(eventName: K, ...args: Parameters<FE<T, E>[K]>) => ReturnType<FE<T, E>[K]>; // deprecated
+        on: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<T, E>;
+        once: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<T, E>;
+        off: <K extends keyof FE<T, E>>(eventName: K, cb: FE<T, E>[K]) => FreezerListener<T, E>;
+        emit: <K extends keyof FE<T, E>>(eventName: K, ...args: Parameters<E extends EventDict<E> ? FE<T, E>[K] : never>) => ReturnType<E extends EventDict<E> ? FE<T, E>[K] : never>;
+        trigger: <K extends keyof FE<T, E>>(eventName: K, ...args: Parameters<E extends EventDict<E> ? FE<T, E>[K] : never>) => ReturnType<E extends EventDict<E> ? FE<T, E>[K] : never>; // deprecated
 
         // reset(newData:any):void;
 
diff --git a/src/state.ts b/src/state.ts
index 509f4ab..71745c3 100644
--- a/src/state.ts
+++ b/src/state.ts
@@ -119,10 +119,10 @@ const defaultStateVars: StateVars = {
 	valuesets: {},
 }
 
-const State = new Freezer<StateVars, EventDict<SageReactions>>(defaultStateVars);
+const State = new Freezer<StateVars, SageReactions>(defaultStateVars);
 
 // convenience
-export type SageFreezerNode<T> = FreezerNode<T, FE<T, EventDict<SageReactions>>>;
+export type SageFreezerNode<T> = FreezerNode<T, FE<T, SageReactions>>;
 export type StateVarsFreezerNode = SageFreezerNode<StateVars>
 export type SageNodeInitializedFreezerNode = SageFreezerNode<SageNodeInitialized>
 

From 6ba2b3ca85979387bad9034612b4b031423a30bc Mon Sep 17 00:00:00 2001
From: Raghavan Chandrabalan <raghavan.chandrabalan@purajuniper.com>
Date: Tue, 25 Jan 2022 11:21:17 -0500
Subject: [PATCH 2/8] remove some anys

---
 src/domain-resource/value-editor.tsx |  2 +-
 src/freezer-js.d.ts                  |  2 ++
 src/helpers/sage-utils.ts            | 45 ++++++++++++++++------------
 src/helpers/schema-utils.ts          |  2 +-
 src/simplified/baseCard.tsx          |  4 +--
 src/simplified/simpleForm.tsx        | 11 +++----
 6 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/domain-resource/value-editor.tsx b/src/domain-resource/value-editor.tsx
index 930e4a8..90930d8 100644
--- a/src/domain-resource/value-editor.tsx
+++ b/src/domain-resource/value-editor.tsx
@@ -20,7 +20,7 @@ interface ValueEditorProps {
 	onEditCancel: (e?: React.SyntheticEvent) => void,
 	hasFocus: boolean,
 	required: boolean,
-	shortName: any,
+	shortName: string,
 }
 class ValueEditor extends React.Component<ValueEditorProps, Record<string, never>> {
 	ESC_KEY: number;
diff --git a/src/freezer-js.d.ts b/src/freezer-js.d.ts
index fb5cf28..56e6515 100644
--- a/src/freezer-js.d.ts
+++ b/src/freezer-js.d.ts
@@ -5,6 +5,8 @@ declare module 'freezer-js' {
         freezeInstances: boolean,
     }
 
+    export type ExtractTypeOfFN<FN> = FN extends FreezerNode<infer T, infer E> ? T : never;
+    
     export type EventDict<E> = E extends {[K in keyof E]: (...args: any[]) => unknown} ? {
         [K in keyof E]: E[K]
     } : never;
diff --git a/src/helpers/sage-utils.ts b/src/helpers/sage-utils.ts
index e95400b..98f5bfa 100644
--- a/src/helpers/sage-utils.ts
+++ b/src/helpers/sage-utils.ts
@@ -1,33 +1,40 @@
 import * as cql from 'cql-execution';
+import { Library } from 'fhir/r4';
 
-export function getCqlExecutionLibraryFromInputLibraryResource(resource: any) {
-    if (resource.content && Array.isArray(resource.content)) {
-        for (const content of resource.content) {
-            if (content.contentType == "application/elm+json") {
-                if (content.data) {
-                    try {
-                        const elm = JSON.parse(window.atob(content.data));
-                        const parsedLib = getCqlExecutionLibraryFromJsonElm(elm);
-                        if (parsedLib) {
-                            return {
-                                library: parsedLib,
-                                url: resource.url
-                            };
+export function getCqlExecutionLibraryFromInputLibraryResource(resource: unknown) {
+    if (resource && typeof resource == 'object') {
+        const resourceToTest = resource as Partial<Library>; // Assume Partial type so that we're forced to check each property
+        if (!resourceToTest.url) {
+            return null; // Libraries are useless when building a PD if we can't reference them by URL
+        }
+        if (Array.isArray(resourceToTest.content)) {
+            for (const content of resourceToTest.content) {
+                if (content.contentType == "application/elm+json") {
+                    if (content.data) {
+                        try {
+                            const elm = JSON.parse(window.atob(content.data));
+                            const parsedLib = getCqlExecutionLibraryFromJsonElm(elm);
+                            if (parsedLib) {
+                                return {
+                                    library: parsedLib,
+                                    url: resourceToTest.url
+                                };
+                            }
+                        }
+                        catch(error) {
+                            console.log("Could not parse encoded JSON ELM in resource:", resource);
+                            return null;
                         }
-                    }
-                    catch(error) {
-                        console.log("Could not parse encoded JSON ELM in resource:", resource);
-                        return null;
                     }
                 }
             }
+            console.log("No JSON ELM found in resource:", resource);
         }
-        console.log("No JSON ELM found in resource:", resource);
     }
     return null;
 }
 
-export function getCqlExecutionLibraryFromJsonElm(elm: any) {
+export function getCqlExecutionLibraryFromJsonElm(elm: unknown) {
     try {
         const parsedLib = new cql.Library(elm);
         console.log('parsed library into:', parsedLib);
diff --git a/src/helpers/schema-utils.ts b/src/helpers/schema-utils.ts
index 97f4d52..51ef820 100644
--- a/src/helpers/schema-utils.ts
+++ b/src/helpers/schema-utils.ts
@@ -27,7 +27,7 @@ export type SageNode = {
 	type: ElementDefinitionType,
 	level?: number,
 	sliceName: string,
-	short: any, 
+	short: string, 
 	isRequired: boolean,
 	profile: string, // This profile must be able to resolve `schemaPath`
 	binding?: any,
diff --git a/src/simplified/baseCard.tsx b/src/simplified/baseCard.tsx
index 1ea5acc..b52ae37 100644
--- a/src/simplified/baseCard.tsx
+++ b/src/simplified/baseCard.tsx
@@ -40,8 +40,8 @@ export const BaseCard = (props: BaseCardProps) => {
         classNames="res-card"
         >
         <Card
-        onClick={(e: any) => {
-            if (e.target.tagName !== "svg" && e.target.tagName !== "path" && props.clickable) {
+        onClick={(e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+            if (e.target instanceof Element && e.target.tagName !== "svg" && e.target.tagName !== "path" && props.clickable) {
                 setShow(false);
                 setTimeout(() => {
                     if (State.get().bundle?.resources.length) {
diff --git a/src/simplified/simpleForm.tsx b/src/simplified/simpleForm.tsx
index 22135f9..1fdf3eb 100644
--- a/src/simplified/simpleForm.tsx
+++ b/src/simplified/simpleForm.tsx
@@ -1,6 +1,7 @@
 import React, { FormEvent, useEffect, useState } from "react";
 import { Form, Row , Col, InputGroup, DropdownButton, Dropdown, FormControl, Modal, Button} from 'react-bootstrap';
 import State, { SageNodeInitializedFreezerNode } from "../state";
+import { ExtractTypeOfFN } from "freezer-js";
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import {faCaretRight, faCaretLeft} from  '@fortawesome/pro-solid-svg-icons';
 import * as SchemaUtils from "../helpers/schema-utils"
@@ -73,7 +74,7 @@ export const SimpleForm = (props:SimpleFormProps) => {
         () => {
             const initialLibraries = State.get().simplified.libraries;
             const librariesListener = initialLibraries.getListener();
-            const updateCB = function(libraries: any, prevLibraries: any) {
+            const updateCB = function(libraries: ExtractTypeOfFN<typeof initialLibraries>) {
                 setLibraries(Object.keys(libraries).map((v) => {
                     return {
                         library: libraries[v].library,
@@ -107,11 +108,11 @@ export const SimpleForm = (props:SimpleFormProps) => {
     const [showImportModal, setShowImportModal] = useState<boolean>(false);
     const handleShowImportModal = () => setShowImportModal(true);
     const handleCloseImportModal = () => setShowImportModal(false);
-    const [FhirLibrary, setFhirLibrary] = useState<any>();
+    const [FhirLibraryStr, setFhirLibraryStr] = useState<string>();
     const handleImportLibrary = () => {
-        if (FhirLibrary) {
+        if (FhirLibraryStr) {
             try {
-                const parsedFhir = JSON.parse(FhirLibrary);
+                const parsedFhir = JSON.parse(FhirLibraryStr);
                 const newLib = SageUtils.getCqlExecutionLibraryFromInputLibraryResource(parsedFhir);
                 if (newLib) {
                     State.emit("load_library", newLib.library, newLib.url, parsedFhir);
@@ -137,7 +138,7 @@ export const SimpleForm = (props:SimpleFormProps) => {
                         <Form.Control as="textarea" rows={14} wrap="hard"
                             className="name-input" type="text" placeholder="FHIR Library" name="FHIR Library"
                             autoComplete="off"
-                            onChange={(e) => setFhirLibrary(e.currentTarget.value)}
+                            onChange={(e) => setFhirLibraryStr(e.currentTarget.value)}
                         />
                     </Form.Group>
                 </Form>

From 75adff703896f8795d105a5a244e5456253d40f2 Mon Sep 17 00:00:00 2001
From: Raghavan Chandrabalan <raghavan.chandrabalan@purajuniper.com>
Date: Wed, 26 Jan 2022 15:30:08 -0500
Subject: [PATCH 3/8] change formatting

---
 src/simplified/simpleForm.tsx | 317 +++++++++++++++++-----------------
 1 file changed, 160 insertions(+), 157 deletions(-)

diff --git a/src/simplified/simpleForm.tsx b/src/simplified/simpleForm.tsx
index 0270904..2d48b4f 100644
--- a/src/simplified/simpleForm.tsx
+++ b/src/simplified/simpleForm.tsx
@@ -29,7 +29,7 @@ interface SimpleFormProps {
 }
 
 const buildConditionFromSelection = (expression?: string): PlanDefinitionActionCondition => {
-    var insertedExpression = "";
+    let insertedExpression = "";
     if (expression) {
         insertedExpression = expression;
     }
@@ -91,180 +91,183 @@ export const SimpleForm = (props:SimpleFormProps) => {
             }
         },
         []
-        )
+    );
         
-        const [libraries, setLibraries] = useState<{library: cql.Library, url: string}[]>([]);
-        useEffect(
-            () => {
-                setExpressionOptions(getExpressionOptionsFromLibraries(libraries));
-                return;
-            },
-            [libraries],
-            );
-            
-            // Import Library Modal
-            //  Allows the user to import a new CQL Library to use as a condition
-            const [showImportModal, setShowImportModal] = useState<boolean>(false);
-            const handleShowImportModal = () => setShowImportModal(true);
-            const handleCloseImportModal = () => setShowImportModal(false);
-            const [FhirLibrary, setFhirLibrary] = useState<any>();
-            const handleImportLibrary = () => {
-                if (FhirLibrary) {
-                    try {
-                        const parsedFhir = JSON.parse(FhirLibrary);
-                        const newLib = SageUtils.getCqlExecutionLibraryFromInputLibraryResource(parsedFhir);
-                        if (newLib) {
-                            State.emit("load_library", newLib.library, newLib.url, parsedFhir);
-                        }
-                    }
-                    catch (err) {
-                        console.log("Could not parse FHIR Library as JSON object");
-                        return;
-                    }
+    const [libraries, setLibraries] = useState<{library: cql.Library, url: string}[]>([]);
+    useEffect(
+        () => {
+            setExpressionOptions(getExpressionOptionsFromLibraries(libraries));
+            return;
+        },
+        [libraries],
+    );
+        
+    // Import Library Modal
+    //  Allows the user to import a new CQL Library to use as a condition
+    const [showImportModal, setShowImportModal] = useState<boolean>(false);
+    const handleShowImportModal = () => setShowImportModal(true);
+    const handleCloseImportModal = () => setShowImportModal(false);
+    const [FhirLibrary, setFhirLibrary] = useState<any>();
+    const handleImportLibrary = () => {
+        if (FhirLibrary) {
+            try {
+                const parsedFhir = JSON.parse(FhirLibrary);
+                const newLib = SageUtils.getCqlExecutionLibraryFromInputLibraryResource(parsedFhir);
+                if (newLib) {
+                    State.emit("load_library", newLib.library, newLib.url, parsedFhir);
                 }
-            };
-            const importModalElement = (<>
-                <Modal show={showImportModal} onHide={handleCloseImportModal}
-                centered
-                >
-                <Modal.Header closeButton>
+            }
+            catch (err) {
+                console.log("Could not parse FHIR Library as JSON object");
+                return;
+            }
+        }
+    };
+
+    const importModalElement = (<>
+        <Modal show={showImportModal} onHide={handleCloseImportModal}
+            centered
+        >
+            <Modal.Header closeButton>
                 <Modal.Title>Import Library</Modal.Title>
-                </Modal.Header>
-                <Modal.Body>
+            </Modal.Header>
+            <Modal.Body>
                 Paste in the FHIR Library Resource that contains the condition you wish to use below:
                 <Form className="signup-form">
-                <Form.Group>
-                <Form.Control as="textarea" rows={14} wrap="hard"
-                className="name-input" type="text" placeholder="FHIR Library" name="FHIR Library"
-                autoComplete="off"
-                onChange={(e) => setFhirLibrary(e.currentTarget.value)}
-                />
-                </Form.Group>
+                    <Form.Group>
+                        <Form.Control as="textarea" rows={14} wrap="hard"
+                            className="name-input" type="text" placeholder="FHIR Library" name="FHIR Library"
+                            autoComplete="off"
+                            onChange={(e) => setFhirLibrary(e.currentTarget.value)}
+                        />
+                    </Form.Group>
                 </Form>
                 <i>Please note that any dependencies of the pasted FHIR Library will not be automatically resolved or added to the final Bundle.</i>
-                </Modal.Body>
-                <Modal.Footer>
+            </Modal.Body>
+            <Modal.Footer>
                 <Button variant="secondary" onClick={handleCloseImportModal}>
-                Close
+                    Close
                 </Button>
                 <Button variant="primary" 
-                onClick={() => {
-                    handleImportLibrary();
-                    handleCloseImportModal();
-                }}
+                    onClick={() => {
+                        handleImportLibrary();
+                        handleCloseImportModal();
+                    }}
                 >
-                Import
+                    Import
                 </Button>
-                </Modal.Footer>
-                </Modal>
-                </>);
-                
-                // All logic for saving the Simplified Form data into the underlying FHIR Resources should be performed here
-                const handleSaveResource = function() {
-                    if (props.actNode.displayName == ACTIVITY_DEFINITION) { // Questionnaires have trouble saving otherwise
-                        State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "title"), title, false);
-                        State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "description"), description, false);
-                        State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "experimental"), State.get().experimental, false);
-                        State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "status"), State.get().status, false);
-                    }
-                    State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "title"), title, false);
-                    State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "description"), description, false);
-                    State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "experimental"), State.get().experimental, false);
-                    State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "status"), State.get().status, false);
-                    const titleNode = SchemaUtils.getChildOfNodePath(props.planNode, ["action", "title"]);
-                    if (titleNode) {
-                        State.emit("value_change", titleNode, title, false);
-                    }
-                    const descriptionNode = SchemaUtils.getChildOfNodePath(props.planNode, ["action", "description"]);
-                    if (descriptionNode) {
-                        State.emit("value_change", descriptionNode, description, false);
-                    }
-                    const conditionNode = SchemaUtils.getChildOfNodePath(props.planNode, ["action", "condition"]);
-                    if (conditionNode) {
-                        const conditionNodes = SchemaUtils.getChildrenFromObjectArrayNode(conditionNode);
-                        State.emit("load_json_into", conditionNodes[0], condition);
-                        State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "library"), [selectedLibrary], false);
-                    }
-                    State.get().set("ui", {status:"collection"})
-                }
-                
-                return (
-                    <div>
-                    <iframe name="void" style={{display:"none"}}></iframe>
-                    {importModalElement}
-                    <Form style={{color:"#2a6b92"}} id="commonMetaDataForm" target="void" onSubmit={handleSaveResource}>
-                    <button className="navigate-reverse col-lg-2 col-md-3" 
-                    disabled={state.bundle.resources.length <= 2}
-                    onClick={() => {
-                        State.emit("remove_from_bundle", state.bundle.pos + 1);
-                        State.emit("remove_from_bundle", state.bundle.pos); 
-                        State.get().set("ui", {status:"cards"})
-                    }}>
-                    <FontAwesomeIcon icon={faCaretLeft} />
-                    &nbsp;Delete Resource
-                    </button>
-                    <button className="navigate col-lg-2 col-md-3" 
-                    type="submit">
-                    Save Resource&nbsp;
-                    <FontAwesomeIcon icon={faCaretRight} />
-                    </button>
-                    <h3  style={{marginTop:"20px", marginBottom:"10px"}}><b>
-                    {props.actNode ? profileToFriendlyResourceListEntry(SchemaUtils.toFhir(props.actNode, false).meta?.profile?.[0])?.FRIENDLY ?? "Unknown Resource Type" : ""}
-                    </b></h3>
-                    <Row className="mb-2">
-                    <Form.Group as= {Col} controlId="title">
-                    <Form.Label>Title</Form.Label>
-                    <Form.Control 
+            </Modal.Footer>
+        </Modal>
+        </>
+        );
+        
+    // All logic for saving the Simplified Form data into the underlying FHIR Resources should be performed here
+    const handleSaveResource = function() {
+        if (props.actNode.displayName == ACTIVITY_DEFINITION) { // Questionnaires have trouble saving otherwise
+            State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "title"), title, false);
+            State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "description"), description, false);
+            State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "experimental"), State.get().experimental, false);
+            State.emit("value_change", SchemaUtils.getChildOfNode(props.actNode, "status"), State.get().status, false);
+        }
+        State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "title"), title, false);
+        State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "description"), description, false);
+        State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "experimental"), State.get().experimental, false);
+        State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "status"), State.get().status, false);
+        const titleNode = SchemaUtils.getChildOfNodePath(props.planNode, ["action", "title"]);
+        if (titleNode) {
+            State.emit("value_change", titleNode, title, false);
+        }
+        const descriptionNode = SchemaUtils.getChildOfNodePath(props.planNode, ["action", "description"]);
+        if (descriptionNode) {
+            State.emit("value_change", descriptionNode, description, false);
+        }
+        const conditionNode = SchemaUtils.getChildOfNodePath(props.planNode, ["action", "condition"]);
+        if (conditionNode) {
+            const conditionNodes = SchemaUtils.getChildrenFromObjectArrayNode(conditionNode);
+            State.emit("load_json_into", conditionNodes[0], condition);
+            State.emit("value_change", SchemaUtils.getChildOfNode(props.planNode, "library"), [selectedLibrary], false);
+        }
+        State.get().set("ui", {status:"collection"})
+    }
+    
+    return (
+        <div>
+        {importModalElement}
+        <Form style={{color:"#2a6b92"}} id="commonMetaDataForm" target="void" onSubmit={handleSaveResource}>
+            <button className="navigate-reverse col-lg-2 col-md-3" 
+                disabled={state.bundle.resources.length <= 2}
+                onClick={() => {
+                    State.emit("remove_from_bundle", state.bundle.pos + 1);
+                    State.emit("remove_from_bundle", state.bundle.pos); 
+                    State.get().set("ui", {status:"cards"})
+                }}
+            >
+                <FontAwesomeIcon icon={faCaretLeft} />
+                &nbsp;Delete Resource
+            </button>
+            <button className="navigate col-lg-2 col-md-3" 
+                type="submit">
+                Save Resource&nbsp;
+                <FontAwesomeIcon icon={faCaretRight} />
+            </button>
+            <h3 style={{marginTop:"20px", marginBottom:"10px"}}><b>
+                {props.actNode ? profileToFriendlyResourceListEntry(SchemaUtils.toFhir(props.actNode, false).meta?.profile?.[0])?.FRIENDLY ?? "Unknown Resource Type" : ""}
+            </b></h3>
+            <Row className="mb-2">
+                <Form.Group as= {Col} controlId="title">
+                <Form.Label>Title</Form.Label>
+                <Form.Control 
                     type="text"
                     defaultValue={title}
                     onChange={(e) => setTitle(e.currentTarget.value)}
-                    />
-                    </Form.Group>
-                    </Row>
-                    <Row className="mb-2">
-                    <Form.Group as= {Col} controlId="description">
-                    <Form.Label>Description</Form.Label>
-                    <Form.Control 
+                />
+                </Form.Group>
+            </Row>
+            <Row className="mb-2">
+                <Form.Group as= {Col} controlId="description">
+                <Form.Label>Description</Form.Label>
+                <Form.Control 
                     type="text"
                     defaultValue={description}
                     onChange={(e) => setDescription(e.currentTarget.value)}
-                    />
-                    </Form.Group>
-                    </Row>
-                    <Row className="mb-2">
-                    <Form.Group as= {Col} controlId="condition">
-                    <Form.Label>Condition</Form.Label>
-                    <InputGroup className="mb-3">
+                />
+                </Form.Group>
+            </Row>
+            <Row className="mb-2">
+                <Form.Group as= {Col} controlId="condition">
+                <Form.Label>Condition</Form.Label>
+                <InputGroup className="mb-3">
                     <Form.Control as="select" 
-                    onChange={(e) => {
-                        if (e.currentTarget.value == '') {
-                            setCondition(buildConditionFromSelection());
-                            setSelectedLibrary("");
-                        }
-                        else if (e.currentTarget.value == '[[import library]]') {
-                            handleShowImportModal();
-                            setCondition(buildConditionFromSelection());
-                            setSelectedLibrary("");
-                        }
-                        else {
-                            setCondition(buildConditionFromSelection(e.currentTarget.value));
-                            setSelectedLibrary(expressionOptions[e.currentTarget.value].libraryUrl);
-                        }
-                    }}
-                    value={condition.expression?.expression}
+                        onChange={(e) => {
+                            if (e.currentTarget.value == '') {
+                                setCondition(buildConditionFromSelection());
+                                setSelectedLibrary("");
+                            }
+                            else if (e.currentTarget.value == '[[import library]]') {
+                                handleShowImportModal();
+                                setCondition(buildConditionFromSelection());
+                                setSelectedLibrary("");
+                            }
+                            else {
+                                setCondition(buildConditionFromSelection(e.currentTarget.value));
+                                setSelectedLibrary(expressionOptions[e.currentTarget.value].libraryUrl);
+                            }
+                        }}
+                        value={condition.expression?.expression}
                     >
-                    <option key="" value="">None</option>
-                    {Object.keys(expressionOptions).map((v) => {
-                        const exprOption = expressionOptions[v];
-                        return <option key={v} value={v}>{`${exprOption.expressionInLibrary} (${exprOption.libraryIdentifier})`}</option>
-                    })}
-                    <option key="[[import library]]" value="[[import library]]">Import condition from FHIR Library...</option>
+                        <option key="" value="">None</option>
+                        {Object.keys(expressionOptions).map((v) => {
+                            const exprOption = expressionOptions[v];
+                            return <option key={v} value={v}>{`${exprOption.expressionInLibrary} (${exprOption.libraryIdentifier})`}</option>
+                        })}
+                        <option key="[[import library]]" value="[[import library]]">Import condition from FHIR Library...</option>
                     </Form.Control>
-                    </InputGroup>
-                    </Form.Group>
-                    </Row>
-                    </Form>
-                    </div>);
-                    
-                }
-                
\ No newline at end of file
+                </InputGroup>
+                </Form.Group>
+            </Row>
+        </Form>
+        </div>
+        );
+        
+}
+        
\ No newline at end of file

From e0d43b37ad1ebb244d6904bb5ad0eba6495e49ec Mon Sep 17 00:00:00 2001
From: Raghavan Chandrabalan <raghavan.chandrabalan@purajuniper.com>
Date: Wed, 26 Jan 2022 15:43:18 -0500
Subject: [PATCH 4/8] allow last resource to be deleted from basic view

---
 src/simplified/baseCard.tsx   | 1 -
 src/simplified/collection.tsx | 3 ++-
 src/simplified/folder.tsx     | 2 +-
 src/simplified/simpleForm.tsx | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/simplified/baseCard.tsx b/src/simplified/baseCard.tsx
index ca7e07d..2ecc276 100644
--- a/src/simplified/baseCard.tsx
+++ b/src/simplified/baseCard.tsx
@@ -36,7 +36,6 @@ export const BaseCard = (props: BaseCardProps) => {
     let headerPadding = {};
     if (props.title == "") headerPadding = {padding:"7px"};
     const resourceType = friendlyToFhir(props.header);
-    const isActivity = resourceType?.includes("Activity");
     
     return (
         <CSSTransition
diff --git a/src/simplified/collection.tsx b/src/simplified/collection.tsx
index e28e746..356181c 100644
--- a/src/simplified/collection.tsx
+++ b/src/simplified/collection.tsx
@@ -46,7 +46,8 @@ const Collection = () => {
                             />
                         </div>
                 })
-            } 
+                }
+                { resources.length == 0 ? <div style={{margin: "50px", marginTop: "40px"}}> <i>No Cards</i> </div> : undefined }
             </div>
         </div>
     );
diff --git a/src/simplified/folder.tsx b/src/simplified/folder.tsx
index 6cf4982..0eaf606 100644
--- a/src/simplified/folder.tsx
+++ b/src/simplified/folder.tsx
@@ -56,7 +56,7 @@ export const Folder = (props: FolderProps) => {
                 </span>
                 }/>
         </div>
-        {State.get().bundle.resources.length > 2 && 
+        {
             <div className="delete">
                 <CloseButton
                     onClick={(e) => {
diff --git a/src/simplified/simpleForm.tsx b/src/simplified/simpleForm.tsx
index 2d48b4f..ef5de86 100644
--- a/src/simplified/simpleForm.tsx
+++ b/src/simplified/simpleForm.tsx
@@ -194,8 +194,7 @@ export const SimpleForm = (props:SimpleFormProps) => {
         <div>
         {importModalElement}
         <Form style={{color:"#2a6b92"}} id="commonMetaDataForm" target="void" onSubmit={handleSaveResource}>
-            <button className="navigate-reverse col-lg-2 col-md-3" 
-                disabled={state.bundle.resources.length <= 2}
+            <button className="navigate-reverse col-lg-2 col-md-3"
                 onClick={() => {
                     State.emit("remove_from_bundle", state.bundle.pos + 1);
                     State.emit("remove_from_bundle", state.bundle.pos); 

From 261a86904c6d8837169cb10dd4898abb69d35b17 Mon Sep 17 00:00:00 2001
From: Raghavan Chandrabalan <raghavan.chandrabalan@purajuniper.com>
Date: Wed, 26 Jan 2022 15:49:32 -0500
Subject: [PATCH 5/8] fix basic-cpg test

---
 src/simplified/simpleForm.tsx |  4 ++--
 test/basic-cpg.test.jsx       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/simplified/simpleForm.tsx b/src/simplified/simpleForm.tsx
index ef5de86..5e62d42 100644
--- a/src/simplified/simpleForm.tsx
+++ b/src/simplified/simpleForm.tsx
@@ -202,11 +202,11 @@ export const SimpleForm = (props:SimpleFormProps) => {
                 }}
             >
                 <FontAwesomeIcon icon={faCaretLeft} />
-                &nbsp;Delete Resource
+                &nbsp;Delete Card
             </button>
             <button className="navigate col-lg-2 col-md-3" 
                 type="submit">
-                Save Resource&nbsp;
+                Save Card&nbsp;
                 <FontAwesomeIcon icon={faCaretRight} />
             </button>
             <h3 style={{marginTop:"20px", marginBottom:"10px"}}><b>
diff --git a/test/basic-cpg.test.jsx b/test/basic-cpg.test.jsx
index 984ae5e..2d48205 100644
--- a/test/basic-cpg.test.jsx
+++ b/test/basic-cpg.test.jsx
@@ -43,16 +43,16 @@ test('Create a basic CPG with a single PD that uses the hypertension library and
     // CpgDialog open on screen
     userEvent.click(await screen.findByRole('button', {name: 'Open Resource'}));
     // SelectView
-    userEvent.click(await screen.findByText('AdministerMedication'));
+    userEvent.click(await screen.findByText('Give Medication'));
     // SimpleForm
-    await screen.findByText('ActivityDefinition/Plandefinition');
+    await screen.findByText('Save Card');
     userEvent.type(screen.getByLabelText('Title'), '123');
     userEvent.type(screen.getByLabelText('Description'), '321');
     userEvent.selectOptions(screen.getByLabelText('Condition'), 'HypertensionCA.Mean BP >= 180/110');
-    fireEvent.submit(screen.getByRole('button', {name: 'Save Resource'}));
+    fireEvent.submit(screen.getByRole('button', {name: 'Save Card'}));
     // Collection
-    await screen.findByText('Saved Resources');
-    userEvent.click(screen.getByRole('button', {name: 'Export Resource'}));
+    await screen.findByText('Saved Cards');
+    userEvent.click(screen.getByRole('button', {name: 'Export as FHIR Bundle'}));
     // ExportDialog open on screen
     await screen.findByText('Exported FHIR JSON');
     expect(JSON.parse(screen.getByRole('textbox', {name: "exportedJson"}).textContent)).toStrictEqual(basicCpgExport);

From 25ae4ef6fe360988c60ac2f10272f6b9c12f7df3 Mon Sep 17 00:00:00 2001
From: Raghavan Chandrabalan <raghavan.chandrabalan@purajuniper.com>
Date: Wed, 26 Jan 2022 15:59:14 -0500
Subject: [PATCH 6/8] increase jest timeout for ci

---
 jest.setup.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jest.setup.js b/jest.setup.js
index 4fd5e98..1c149a8 100644
--- a/jest.setup.js
+++ b/jest.setup.js
@@ -4,6 +4,9 @@ import $ from 'jquery';
 global.$ = $;
 
 jest.setTimeout(10000);
+if (process.env.CI) {
+    jest.setTimeout(30000); // Initial loading of profiles takes a lot longer on GH Actions
+}
 
 // Mock functions
 window.scrollTo = jest.fn(); // unimplemented in jsdom

From a0ba09db5892233521ef7ee1db544d3c8ee6aa29 Mon Sep 17 00:00:00 2001
From: Raghavan Chandrabalan <raghavan.chandrabalan@purajuniper.com>
Date: Wed, 26 Jan 2022 16:07:54 -0500
Subject: [PATCH 7/8] increase timeout for initial load

---
 .eslintrc.cjs           | 3 ++-
 test/basic-cpg.test.jsx | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 0456a61..fd39f3b 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -61,7 +61,8 @@ module.exports = {
                 "**/*.test.jsx"
             ],
             env: {
-                jest: true
+                "jest": true,
+                "node": true
             },
             "extends": [
                 "eslint:recommended",
diff --git a/test/basic-cpg.test.jsx b/test/basic-cpg.test.jsx
index 2d48205..1652409 100644
--- a/test/basic-cpg.test.jsx
+++ b/test/basic-cpg.test.jsx
@@ -37,7 +37,7 @@ afterAll(() => server.close());
 test('Create a basic CPG with a single PD that uses the hypertension library and export it', async () => {
     render(<RootComponent />);
     // Wait for profiles to load
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar', {name: "loading-symbol"}), {timeout: 5000, interval: 1000});
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar', {name: "loading-symbol"}), {timeout: process.env.CI ? 30000 : 5000, interval: 1000});
     // RootComponent
     userEvent.click(screen.getAllByRole('button', {name: 'Basic CPG'})[0]);
     // CpgDialog open on screen

From 930e6c720e7c0f463a320897a14a5b951fccbcbe Mon Sep 17 00:00:00 2001
From: Josh Liben <josh@junipercds.com>
Date: Fri, 28 Jan 2022 10:42:25 -0500
Subject: [PATCH 8/8] refactor folder rendering

---
 src/simplified/collection.tsx | 76 +++++++++++++++++++----------------
 src/simplified/folder.tsx     |  5 ++-
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/simplified/collection.tsx b/src/simplified/collection.tsx
index 356181c..fd01f56 100644
--- a/src/simplified/collection.tsx
+++ b/src/simplified/collection.tsx
@@ -1,10 +1,11 @@
-import {useState, useEffect} from "react";
-import {Folder} from"./folder";
-import State from "../state";
+import { useState, useEffect } from "react";
+import { Folder } from "./folder";
+import State, { SageReactions } from "../state";
 import * as SchemaUtils from "../helpers/schema-utils"
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import {faDownload, faCaretLeft} from  '@fortawesome/pro-solid-svg-icons';
+import { faDownload, faCaretLeft } from '@fortawesome/pro-solid-svg-icons';
+import { SageNodeInitialized } from "../helpers/schema-utils";
 
 
 const Collection = () => {
@@ -12,42 +13,49 @@ const Collection = () => {
     const resources = State.get().bundle?.resources ?? [];
 
     return (
-        <div style={{marginTop:"50px"}}>
+        <div style={{ marginTop: "50px" }}>
             <div className="row">
-            <h3 className="col-lg-10 col-md-9" style={{color:"#2a6b92"}}><b>Saved Cards</b></h3>
-            <button className="navigate-reverse col-lg-2 col-md-3" 
-                    onClick={() => State.get().set("ui", {status:"cards"})}>
-            <FontAwesomeIcon icon={faCaretLeft} />
-                            &nbsp;New Card
-            </button>
-            <button className="navigate-reverse col-lg-2 col-md-2" 
-                    onClick={() => State.get().set("ui", {status:"export"})}>
-            <FontAwesomeIcon icon={faDownload} />
-                            &nbsp;Export as FHIR Bundle
-            </button>
+                <h3 className="col-lg-10 col-md-9" style={{ color: "#2a6b92" }}><b>Saved Cards</b></h3>
+                <button className="navigate-reverse col-lg-2 col-md-3"
+                    onClick={() => State.get().set("ui", { status: "cards" })}>
+                    <FontAwesomeIcon icon={faCaretLeft} />
+                    &nbsp;New Card
+                </button>
+                <button className="navigate-reverse col-lg-2 col-md-2"
+                    onClick={() => State.get().set("ui", { status: "export" })}>
+                    <FontAwesomeIcon icon={faDownload} />
+                    &nbsp;Export as FHIR Bundle
+                </button>
             </div>
             <div className="row box">
                 {
-                resources.map(
-                        (resource, i) => {
-                            if (i % 2 == 1) return; // Every other resource would be a plandef
-                            const actTitleNode = SchemaUtils.getChildOfNode(resource, "title");
-                            const planTitleNode = SchemaUtils.getChildOfNode(resources[i+1], "title");
-                            const firstExpression: string | undefined = SchemaUtils.getChildOfNodePath(resources[i+1], ["action", "condition", "expression", "expression"])?.value;
+                    resources.reduce(
+                        function (accumulator: any[], currentValue, currentIndex, array) {
+                            if (currentIndex % 2 === 0)
+                                accumulator.push(array.slice(currentIndex, currentIndex + 2));
+                            return accumulator;
+                        }, []).map((pair, i) => {
+                            const actNode = pair[0];
+                            const planDefNode = pair[1];
+                            const actTitleNode = SchemaUtils.getChildOfNode(actNode, "title");
+                            const planTitleNode = SchemaUtils.getChildOfNode(planDefNode, "title");
+                            const actDescNode = SchemaUtils.getChildOfNode(actNode, "description");
+                            const firstExpression: string | undefined = SchemaUtils.getChildOfNodePath(planDefNode, ["action", "condition", "expression", "expression"])?.value;
                             const conditionExpressions: string[] = firstExpression ? [firstExpression] : [];
-                        return <div className="col-lg-3 col-md-4 col-sm-6" key={i}>
-                            <Folder 
-                            actTitle={actTitleNode?.value ? actTitleNode.value : "Untitled AD"}
-                            planTitle={planTitleNode?.value ? planTitleNode.value : "Untitled PD"}
-                            conditionExpressions={conditionExpressions}
-                            profile={SchemaUtils.toFhir(resource, false).meta?.profile?.[0] ?? ""}
-                            wait={i*25} 
-                            index={i}
-                            />
-                        </div>
-                })
+                            return <div className="col-lg-3 col-md-4 col-sm-6" key={i*2}>
+                                <Folder
+                                    actTitle={actTitleNode?.value ? actTitleNode.value : "Untitled AD"}
+                                    planTitle={planTitleNode?.value ? planTitleNode.value : "Untitled PD"}
+                                    actDesc={actDescNode?.value ? actDescNode.value : ""}
+                                    conditionExpressions={conditionExpressions}
+                                    profile={SchemaUtils.toFhir(actNode, false).meta?.profile?.[0] ?? ""}
+                                    wait={i * 25}
+                                    index={i*2}
+                                />
+                            </div>
+                        })
                 }
-                { resources.length == 0 ? <div style={{margin: "50px", marginTop: "40px"}}> <i>No Cards</i> </div> : undefined }
+                {resources.length == 0 ? <div style={{ margin: "50px", marginTop: "40px" }}> <i>No Cards</i> </div> : undefined}
             </div>
         </div>
     );
diff --git a/src/simplified/folder.tsx b/src/simplified/folder.tsx
index 0eaf606..f4139ae 100644
--- a/src/simplified/folder.tsx
+++ b/src/simplified/folder.tsx
@@ -3,10 +3,11 @@ import {BaseCard} from"./baseCard";
 import { CSSTransition } from 'react-transition-group';
 import State from "../state";
 import { CloseButton } from "react-bootstrap";
-import { ACTIVITY_DEFINITION, getBorderPropsForType, PLAN_DEFINITION, profileToFriendlyResourceListEntry, profileToFriendlyResourceSelf } from "./nameHelpers";
+import {getBorderPropsForType, PLAN_DEFINITION, profileToFriendlyResourceListEntry, profileToFriendlyResourceSelf } from "./nameHelpers";
 
 interface FolderProps {
     actTitle: string,
+    actDesc: string,
     planTitle: string,
     conditionExpressions: string[],
     index: number,
@@ -52,7 +53,7 @@ export const Folder = (props: FolderProps) => {
             <BaseCard header={PLAN_DEFINITION} title={props.planTitle}
             content={
                 <span>
-                {props.actTitle} {props.conditionExpressions.length > 0 ? `WHEN ${props.conditionExpressions[0]} IS TRUE` : ""}
+                {props.actDesc} {props.conditionExpressions.length > 0 ? `WHEN ${props.conditionExpressions[0]} IS TRUE` : ""}
                 </span>
                 }/>
         </div>