@@ -35,13 +35,12 @@ const Collection = () => {
const planTitleNode = SchemaUtils.getChildOfNode(resources[i+1], "title");
const firstExpression: string | undefined = SchemaUtils.getChildOfNodePath(resources[i+1], ["action", "condition", "expression", "expression"])?.value;
const conditionExpressions: string[] = firstExpression ? [firstExpression] : [];
- const profile = SchemaUtils.getChildOfNode(resource, "profile");
return
diff --git a/src/simplified/folder.tsx b/src/simplified/folder.tsx
index 26d5a30..6cf4982 100644
--- a/src/simplified/folder.tsx
+++ b/src/simplified/folder.tsx
@@ -1,26 +1,29 @@
import {useState, useEffect} from "react";
-import { propTypes } from "react-bootstrap/esm/Image";
import {BaseCard} from"./baseCard";
import { CSSTransition } from 'react-transition-group';
import State from "../state";
-import { PLAN_DEFINITION } from "./nameHelpers";
+import { CloseButton } from "react-bootstrap";
+import { ACTIVITY_DEFINITION, getBorderPropsForType, PLAN_DEFINITION, profileToFriendlyResourceListEntry, profileToFriendlyResourceSelf } from "./nameHelpers";
interface FolderProps {
actTitle: string,
planTitle: string,
conditionExpressions: string[],
index: number,
- type: string,
+ profile: string,
link?: string
wait: number
}
export const Folder = (props: FolderProps) => {
const [show, setShow] = useState(false);
+ const friendlyName = profileToFriendlyResourceListEntry(props.profile)?.FRIENDLY ?? "Unknown";
+ const resourceType = profileToFriendlyResourceSelf(props.profile)?.FHIR ?? "";
useEffect(() => {
- setTimeout(() => {
+ const timeoutId = setTimeout(() => {
setShow(true);
}, props.wait);
+ return () => clearTimeout(timeoutId);
}, [props.wait]);
@@ -31,33 +34,40 @@ export const Folder = (props: FolderProps) => {
classNames="res-folder"
unmountOnExit
>
-
{
setShow(false);
- setTimeout(() => {
- State.emit("set_bundle_pos", props.index);
- }, 300);
+ State.emit("set_bundle_pos", props.index);
}}>
-
+
+
{props.actTitle} {props.conditionExpressions.length > 0 ? `WHEN ${props.conditionExpressions[0]} IS TRUE` : ""}
-
+
}/>
{State.get().bundle.resources.length > 2 &&
-
}
+
+ {
+ e.stopPropagation();
+ State.emit("remove_from_bundle", props.index + 1);
+ State.emit("remove_from_bundle", props.index);
+ State.get().set("ui", {status:"collection"})
+ }}
+ />
+
+ }
)
diff --git a/src/simplified/nameHelpers.tsx b/src/simplified/nameHelpers.tsx
index 56e3b96..3b209b1 100644
--- a/src/simplified/nameHelpers.tsx
+++ b/src/simplified/nameHelpers.tsx
@@ -1,5 +1,9 @@
import friendlyNames from "../../friendly-names.json";
+export type FriendlyResource = (typeof friendlyNames.RESOURCES) extends Array
? T : never;
+export type FriendlyResourceSelf = FriendlyResource["SELF"];
+export type FriendlyResourceListEntry = FriendlyResource["LIST"] extends Array ? T : never;
+
const defaultUndefinedString = "undefined";
const getType = (type: string) => {
@@ -20,36 +24,70 @@ export const DATA_ELEMENT = getType("DataElement");
export const VALUE_SET = getType("ValueSet");
export const STRUCTURE_DEFINITION = getType("StructureDefinition");
-export function getFhirSelf(resourceParent: any[], resourceType: string) {
+export function getFhirSelf(resourceParent: FriendlyResource[], resourceType: string) {
return resourceParent.find(
(resource) => {
- return resource.SELF.FHIR === resourceType|| resource.FHIR === resourceType;
+ return resource.SELF.FHIR === resourceType;
}
);
}
-function elseIfUndefined(maybeUndefinedObject: any, ifDefinedFunction: any, replacementText: string): string {
+function elseIfUndefined(maybeUndefinedObject: T, ifDefinedFunction: (input: Exclude) => string): string | undefined
+function elseIfUndefined(maybeUndefinedObject: T, ifDefinedFunction: (input: Exclude) => string, replacementText: string): string
+function elseIfUndefined(maybeUndefinedObject: T, ifDefinedFunction: (input: Exclude) => string, replacementText?: string): string | undefined {
if (typeof(maybeUndefinedObject) === 'undefined') {
- return replacementText
+ return replacementText ?? undefined;
} else {
- return ifDefinedFunction(maybeUndefinedObject);
+ return ifDefinedFunction(maybeUndefinedObject as Exclude); // This cast is necessary for some reason. todo: figure out how to remove it
}
}
export const fhirToFriendly = (fhirWord: string) => {
return elseIfUndefined(getFhirSelf(friendlyNames.RESOURCES, fhirWord)
- ,((o:string) => (o))
+ ,((o) => (o.SELF.FRIENDLY))
, defaultUndefinedString);
}
-export const friendlyToFhir = (friendlyWord: string) => {
+export const friendlyToFhir = (friendlyWord: string) => {
return elseIfUndefined(friendlyNames.RESOURCES.find(resource => resource.SELF.FRIENDLY == friendlyWord)
- ,((object: { SELF: { FHIR: any; }; }) => object.SELF.FHIR)
+ ,((object) => object.SELF.FHIR)
, defaultUndefinedString);
}
+export function profileToFriendlyResourceListEntry(profile?: string) {
+ if (!profile) {
+ return undefined;
+ }
+ for (const resource of friendlyNames.RESOURCES) {
+ const out = resource.LIST.find(res => res.PROFILE_URI == profile);
+ if (out) {
+ return out;
+ }
+ }
+}
+
+export function profileToFriendlyResourceSelf(profile?: string) {
+ if (!profile) {
+ return undefined;
+ }
+ for (const resource of friendlyNames.RESOURCES) {
+ const found = resource.LIST.find(res => res.PROFILE_URI == profile);
+ if (found) {
+ return resource.SELF;
+ }
+ }
+}
+
export const defaultProfileUriOfResourceType = (resourceType: string) => {
return elseIfUndefined(getFhirSelf(friendlyNames.RESOURCES, resourceType)
- ,((object: { SELF: { DEFAULT_PROFILE_URI: any; }; }) => object.SELF.DEFAULT_PROFILE_URI)
- , defaultUndefinedString);
+ ,((object) => object.SELF.DEFAULT_PROFILE_URI));
}
+
+export function getBorderPropsForType(resourceType: string): string | undefined {
+ switch (resourceType) {
+ case ACTIVITY_DEFINITION:
+ return "activitydefinition";
+ default:
+ return "questionnaire";
+ }
+}
\ No newline at end of file
diff --git a/src/simplified/selectView.tsx b/src/simplified/selectView.tsx
index a37a0e1..27f4bce 100644
--- a/src/simplified/selectView.tsx
+++ b/src/simplified/selectView.tsx
@@ -3,48 +3,62 @@ import {BaseCard} from"./baseCard";
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import {faCaretRight, faInfoCircle} from '@fortawesome/pro-solid-svg-icons';
import State from "../state";
+import { Container, Row, Col } from "react-bootstrap";
import friendlyNames from "../../friendly-names.json";
-import { makeLink, makeProfile } from "../helpers/schema-utils";
+import { ACTIVITY_DEFINITION, getBorderPropsForType } from "./nameHelpers";
const SelectView = () => {
return (
-
-
Make a Card
-
-
-
- {
- friendlyNames.RESOURCES.map(
- (resourceType) => (
- resourceType.LIST.map((resource, i) => (
-
-
}
- wait={i * 25}
- clickable={true}
- profile={makeProfile(resource)} />
-
- )
- )
- )
- )
+
+
Make a Card
+
+
+
+
+
+ {
+ friendlyNames.RESOURCES.map(
+ (resourceType) => {
+ return resourceType.LIST.map(
+ (resource, i) => {
+ return (
+
+
+
+
+
+ FHIR Docs
+
+
+ }
+ wait={i*25}
+ clickable={true}
+ profile={resource.PROFILE_URI}
+ />
+
+
-