@medplum/react 0.9.32 → 0.9.35

package/dist/cjs/index.js

@@ -18,7 +18,25 @@
 
     function getIssuesForExpression(outcome, expression) {
         var _a;
-        return (_a = outcome === null || outcome === void 0 ? void 0 : outcome.issue) === null || _a === void 0 ? void 0 : _a.filter((issue) => { var _a; return ((_a = issue.expression) === null || _a === void 0 ? void 0 : _a[0]) === expression; });
+        return (_a = outcome === null || outcome === void 0 ? void 0 : outcome.issue) === null || _a === void 0 ? void 0 : _a.filter((issue) => { var _a; return isExpressionMatch((_a = issue.expression) === null || _a === void 0 ? void 0 : _a[0], expression); });
+    }
+    function isExpressionMatch(expr1, expr2) {
+        // Expression can be either "fieldName" or "resourceType.fieldName"
+        if (expr1 === expr2) {
+            return true;
+        }
+        if (!expr1 || !expr2) {
+            return false;
+        }
+        const dot1 = expr1.indexOf('.');
+        if (dot1 >= 0 && expr1.substring(dot1 + 1) === expr2) {
+            return true;
+        }
+        const dot2 = expr2.indexOf('.');
+        if (dot2 >= 0 && expr2.substring(dot2 + 1) === expr1) {
+            return true;
+        }
+        return false;
     }
 
     function Input(props) {
@@ -518,9 +536,9 @@
             return clientId;
         }
         const origin = window.location.protocol + '//' + window.location.host;
-        const authorizedOrigins = (_b = (_a = "undefined") === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+        const authorizedOrigins = (_b = (_a = "http://localhost:3000,http://127.0.0.1:3000,http://localhost:6006,http://127.0.0.1:6006,https://app.medplum.com,https://docs.medplum.com,https://storybook.medplum.com,https://graphiql.medplum.com,https://www.medplum.com") === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
         if (authorizedOrigins.includes(origin)) {
-            return "undefined";
+            return "921088377005-3j1sa10vr6hj86jgmdfh2l53v3mp7lfi.apps.googleusercontent.com";
         }
         return undefined;
     }
@@ -713,6 +731,8 @@
                     clientId: props.clientId,
                     scope: props.scope,
                     nonce: props.nonce,
+                    codeChallenge: props.codeChallenge,
+                    codeChallengeMethod: props.codeChallengeMethod,
                     email: formData.email,
                     password: formData.password,
                     remember: formData.remember === 'true',
@@ -734,6 +754,8 @@
                                 clientId: props.clientId,
                                 scope: props.scope,
                                 nonce: props.nonce,
+                                codeChallenge: props.codeChallenge,
+                                codeChallengeMethod: props.codeChallengeMethod,
                                 googleClientId: response.clientId,
                                 googleCredential: response.credential,
                             })
@@ -887,7 +909,7 @@
         }
         return (React__default["default"].createElement(Document, { width: 450 }, (() => {
             if (!login) {
-                return (React__default["default"].createElement(AuthenticationForm, { projectId: props.projectId, clientId: props.clientId, scope: props.scope, nonce: props.nonce, googleClientId: props.googleClientId, onForgotPassword: props.onForgotPassword, onRegister: props.onRegister, handleAuthResponse: handleAuthResponse }, props.children));
+                return (React__default["default"].createElement(AuthenticationForm, { projectId: props.projectId, clientId: props.clientId, scope: props.scope, nonce: props.nonce, googleClientId: props.googleClientId, codeChallenge: props.codeChallenge, codeChallengeMethod: props.codeChallengeMethod, onForgotPassword: props.onForgotPassword, onRegister: props.onRegister, handleAuthResponse: handleAuthResponse }, props.children));
             }
             else if (memberships) {
                 return React__default["default"].createElement(ChooseProfileForm, { login: login, memberships: memberships, handleAuthResponse: handleAuthResponse });
@@ -2546,11 +2568,14 @@
                     ((_b = propsRef.current) === null || _b === void 0 ? void 0 : _b.autoClose) &&
                     (ref === null || ref === void 0 ? void 0 : ref.current) &&
                     !ref.current.contains(e.target)) {
+                    killEvent(e);
                     props.onClose();
                 }
             }
             document.addEventListener('click', handleClick, true);
-            return () => document.removeEventListener('click', handleClick, true);
+            return () => {
+                document.removeEventListener('click', handleClick, true);
+            };
         }, [props]);
         // Listen for changes in the location
         // If the browser navigates to a new page, close the popup
@@ -2952,27 +2977,25 @@
 
     /**
      * Returns the collection of field definitions for the search request.
-     * @param typeSchema The schema for the resource type
      * @param search The search request definition.
      * @returns An array of field definitions.
      */
-    function getFieldDefinitions(schema, search) {
+    function getFieldDefinitions(search) {
         const resourceType = search.resourceType;
         const fields = [];
         for (const name of search.fields || ['id', '_lastUpdated']) {
-            fields.push(getFieldDefinition(schema, resourceType, name));
+            fields.push(getFieldDefinition(resourceType, name));
         }
         return fields;
     }
     /**
      * Return the field definition for a given field name.
      * Field names can be either property names or search parameter codes.
-     * @param typeSchema The schema for the resource type
      * @param resourceType The resource type.
      * @param name The search field name (either property name or search parameter code).
      * @returns The field definition.
      */
-    function getFieldDefinition(schema, resourceType, name) {
+    function getFieldDefinition(resourceType, name) {
         var _a;
         if (name === '_lastUpdated') {
             return {
@@ -3004,7 +3027,7 @@
                 ],
             };
         }
-        const typeSchema = schema.types[resourceType];
+        const typeSchema = core.globalSchema.types[resourceType];
         const exactElementDefinition = typeSchema.properties[name];
         const exactSearchParam = (_a = typeSchema.searchParams) === null || _a === void 0 ? void 0 : _a[name.toLowerCase()];
         // Best case: Exact match of element definition or search parameter.
@@ -3035,7 +3058,7 @@
         // Patient.email is a search parameter for the Patient.telecom element.
         // So we need to walk backwards to find the element definition.
         if (exactSearchParam) {
-            const details = core.getSearchParameterDetails(schema, resourceType, exactSearchParam);
+            const details = core.getSearchParameterDetails(resourceType, exactSearchParam);
             return { name, elementDefinition: details.elementDefinition, searchParams: [exactSearchParam] };
         }
         // Worst case: no element definition and no search parameter.
@@ -3651,7 +3674,7 @@
             return null;
         }
         const resourceType = props.search.resourceType;
-        const typeDef = props.schema.types[resourceType];
+        const typeDef = core.globalSchema.types[resourceType];
         const selected = (_a = state.search.fields) !== null && _a !== void 0 ? _a : [];
         const available = getFieldsList(typeDef)
             .filter((field) => !(selected === null || selected === void 0 ? void 0 : selected.includes(field)))
@@ -3726,7 +3749,7 @@
 
     function SearchFilterValueInput(props) {
         var _a;
-        const details = core.getSearchParameterDetails(props.schema, props.resourceType, props.searchParam);
+        const details = core.getSearchParameterDetails(props.resourceType, props.searchParam);
         const name = 'filter-value';
         switch (details.type) {
             case core.SearchParameterType.REFERENCE:
@@ -3787,9 +3810,8 @@
         if (!props.visible) {
             return null;
         }
-        const schema = props.schema;
         const resourceType = props.search.resourceType;
-        const searchParams = schema.types[resourceType].searchParams;
+        const searchParams = core.globalSchema.types[resourceType].searchParams;
         const filters = search.filters || [];
         return (React__default["default"].createElement(Dialog, { title: "Filters", visible: props.visible, onOk: () => props.onOk(searchRef.current), onCancel: props.onCancel },
             React__default["default"].createElement("div", { className: "medplum-filter-editor" },
@@ -3808,7 +3830,7 @@
                     React__default["default"].createElement("tbody", null,
                         filters.map((filter, index) => {
                             if (index === editingIndex) {
-                                return (React__default["default"].createElement(FilterRowInput, { key: `filter-${index}-${filters.length}-input`, schema: schema, resourceType: resourceType, searchParams: searchParams, defaultValue: filter, okText: "Save", onOk: (newFilter) => {
+                                return (React__default["default"].createElement(FilterRowInput, { key: `filter-${index}-${filters.length}-input`, resourceType: resourceType, searchParams: searchParams, defaultValue: filter, okText: "Save", onOk: (newFilter) => {
                                         const newFilters = [...filters];
                                         newFilters[index] = newFilter;
                                         setSearch(setFilters(searchRef.current, newFilters));
@@ -3819,7 +3841,7 @@
                                 return (React__default["default"].createElement(FilterRowDisplay, { key: `filter-${index}-${filters.length}-display`, resourceType: resourceType, searchParams: searchParams, filter: filter, onEdit: () => setEditingIndex(index), onDelete: () => setSearch(deleteFilter(searchRef.current, index)) }));
                             }
                         }),
-                        React__default["default"].createElement(FilterRowInput, { schema: schema, resourceType: resourceType, searchParams: searchParams, okText: "Add", onOk: onAddFilter }))))));
+                        React__default["default"].createElement(FilterRowInput, { resourceType: resourceType, searchParams: searchParams, okText: "Add", onOk: onAddFilter }))))));
     }
     function FilterRowDisplay(props) {
         const { filter } = props;
@@ -3856,7 +3878,7 @@
             React__default["default"].createElement("td", null, operators && (React__default["default"].createElement(Select, { testid: "filter-operation", defaultValue: value.operator, onChange: setFilterOperator },
                 React__default["default"].createElement("option", { value: "" }),
                 operators.map((operator) => (React__default["default"].createElement("option", { key: operator, value: operator }, getOpString(operator))))))),
-            React__default["default"].createElement("td", null, searchParam && value.operator && (React__default["default"].createElement(SearchFilterValueInput, { schema: props.schema, resourceType: props.resourceType, searchParam: searchParam, defaultValue: value.value, onChange: setFilterValue }))),
+            React__default["default"].createElement("td", null, searchParam && value.operator && (React__default["default"].createElement(SearchFilterValueInput, { resourceType: props.resourceType, searchParam: searchParam, defaultValue: value.value, onChange: setFilterValue }))),
             React__default["default"].createElement("td", null,
                 value.code && value.operator && value.value && (React__default["default"].createElement(Button, { size: "small", onClick: () => {
                         props.onOk(valueRef.current);
@@ -3877,7 +3899,7 @@
         return (React__default["default"].createElement(Dialog, { title: props.title, visible: props.visible, onOk: onOk, onCancel: props.onCancel },
             React__default["default"].createElement("div", { style: { width: 500 } },
                 React__default["default"].createElement(Form, { onSubmit: onOk },
-                    React__default["default"].createElement(SearchFilterValueInput, { schema: props.schema, resourceType: props.resourceType, searchParam: props.searchParam, defaultValue: value, autoFocus: true, onChange: setValue })))));
+                    React__default["default"].createElement(SearchFilterValueInput, { resourceType: props.resourceType, searchParam: props.searchParam, defaultValue: value, autoFocus: true, onChange: setValue })))));
     }
 
     function MenuSeparator() {
@@ -4073,7 +4095,7 @@
     function SearchControl(props) {
         var _a, _b, _c, _d;
         const medplum = useMedplum();
-        const [schema, setSchema] = React.useState();
+        const [schemaLoaded, setSchemaLoaded] = React.useState(false);
         const [outcome, setOutcome] = React.useState();
         const { search, onLoad } = props;
         const [state, setState] = React.useState({
@@ -4091,7 +4113,7 @@
         React.useEffect(() => {
             setOutcome(undefined);
             medplum
-                .search(search.resourceType, core.formatSearchQuery(Object.assign(Object.assign({}, search), { total: 'accurate' })))
+                .search(search.resourceType, core.formatSearchQuery(Object.assign(Object.assign({}, search), { total: 'accurate', fields: undefined })))
                 .then((response) => {
                 setState(Object.assign(Object.assign({}, stateRef.current), { searchResponse: response }));
                 if (onLoad) {
@@ -4185,19 +4207,15 @@
         React.useEffect(() => {
             medplum
                 .requestSchema(props.search.resourceType)
-                .then((newSchema) => {
-                // The schema could have the same object identity,
-                // so need to use the spread operator to kick React re-render.
-                setSchema(Object.assign({}, newSchema));
-            })
+                .then(() => setSchemaLoaded(true))
                 .catch(console.log);
         }, [medplum, props.search.resourceType]);
-        const typeSchema = (_a = schema === null || schema === void 0 ? void 0 : schema.types) === null || _a === void 0 ? void 0 : _a[props.search.resourceType];
+        const typeSchema = schemaLoaded && ((_a = core.globalSchema === null || core.globalSchema === void 0 ? void 0 : core.globalSchema.types) === null || _a === void 0 ? void 0 : _a[props.search.resourceType]);
         if (!typeSchema) {
             return React__default["default"].createElement(Loading, null);
         }
         const checkboxColumn = props.checkboxesEnabled;
-        const fields = getFieldDefinitions(schema, search);
+        const fields = getFieldDefinitions(search);
         const resourceType = search.resourceType;
         const lastResult = state.searchResponse;
         const entries = lastResult === null || lastResult === void 0 ? void 0 : lastResult.entry;
@@ -4221,9 +4239,9 @@
                     props.onBulk && (React__default["default"].createElement(Button, { size: "small", onClick: () => props.onBulk(Object.keys(state.selected)) }, "Bulk..."))),
                 lastResult && (React__default["default"].createElement("div", null,
                     React__default["default"].createElement("span", { className: "medplum-search-summary" },
-                        getStart(search, lastResult.total),
+                        getStart$1(search, lastResult.total),
                         "-",
-                        getEnd(search, lastResult.total),
+                        getEnd$1(search, lastResult.total),
                         " of",
                         ' ', (_d = lastResult.total) === null || _d === void 0 ? void 0 :
                         _d.toLocaleString()),
@@ -4247,7 +4265,7 @@
             (resources === null || resources === void 0 ? void 0 : resources.length) === 0 && (React__default["default"].createElement("div", { "data-testid": "empty-search", className: "medplum-empty-search" }, "No results")),
             outcome && (React__default["default"].createElement("div", { "data-testid": "search-error", className: "medplum-empty-search" },
                 React__default["default"].createElement("pre", { style: { textAlign: 'left' } }, JSON.stringify(outcome, undefined, 2)))),
-            React__default["default"].createElement(SearchPopupMenu, { schema: schema, search: props.search, visible: state.popupVisible, x: state.popupX, y: state.popupY, searchParams: state.popupSearchParams, onPrompt: (searchParam, filter) => {
+            React__default["default"].createElement(SearchPopupMenu, { search: props.search, visible: state.popupVisible, x: state.popupX, y: state.popupY, searchParams: state.popupSearchParams, onPrompt: (searchParam, filter) => {
                     setState(Object.assign(Object.assign({}, stateRef.current), { popupVisible: false, filterDialogVisible: true, filterDialogSearchParam: searchParam, filterDialogFilter: filter }));
                 }, onChange: (result) => {
                     emitSearchChange(result);
@@ -4255,19 +4273,19 @@
                 }, onClose: () => {
                     setState(Object.assign(Object.assign({}, stateRef.current), { popupVisible: false, popupSearchParams: undefined }));
                 } }),
-            React__default["default"].createElement(SearchFieldEditor, { schema: schema, search: props.search, visible: stateRef.current.fieldEditorVisible, onOk: (result) => {
+            React__default["default"].createElement(SearchFieldEditor, { search: props.search, visible: stateRef.current.fieldEditorVisible, onOk: (result) => {
                     emitSearchChange(result);
                     setState(Object.assign(Object.assign({}, stateRef.current), { fieldEditorVisible: false }));
                 }, onCancel: () => {
                     setState(Object.assign(Object.assign({}, stateRef.current), { fieldEditorVisible: false }));
                 } }),
-            React__default["default"].createElement(SearchFilterEditor, { schema: schema, search: props.search, visible: stateRef.current.filterEditorVisible, onOk: (result) => {
+            React__default["default"].createElement(SearchFilterEditor, { search: props.search, visible: stateRef.current.filterEditorVisible, onOk: (result) => {
                     emitSearchChange(result);
                     setState(Object.assign(Object.assign({}, stateRef.current), { filterEditorVisible: false }));
                 }, onCancel: () => {
                     setState(Object.assign(Object.assign({}, stateRef.current), { filterEditorVisible: false }));
                 } }),
-            React__default["default"].createElement(SearchFilterValueDialog, { visible: stateRef.current.filterDialogVisible, title: 'Input', schema: schema, resourceType: resourceType, searchParam: state.filterDialogSearchParam, filter: state.filterDialogFilter, defaultValue: '', onOk: (filter) => {
+            React__default["default"].createElement(SearchFilterValueDialog, { visible: stateRef.current.filterDialogVisible, title: 'Input', resourceType: resourceType, searchParam: state.filterDialogSearchParam, filter: state.filterDialogFilter, defaultValue: '', onOk: (filter) => {
                     emitSearchChange(addFilter(props.search, filter.code, filter.operator, filter.value));
                     setState(Object.assign(Object.assign({}, stateRef.current), { filterDialogVisible: false }));
                 }, onCancel: () => {
@@ -4290,11 +4308,11 @@
         return (React__default["default"].createElement("svg", { xmlns: "http://www.w3.org/2000/svg", className: "h-6 w-6", fill: "none", viewBox: "0 0 24 24", stroke: "rgba(0, 0, 0, 0.3)", strokeWidth: 2 },
             React__default["default"].createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M4 6h16M4 12h16m-7 6h7" })));
     }
-    function getStart(search, total) {
+    function getStart$1(search, total) {
         var _a;
         return Math.min(total, ((_a = search.offset) !== null && _a !== void 0 ? _a : 0) + 1);
     }
-    function getEnd(search, total) {
+    function getEnd$1(search, total) {
         var _a, _b;
         return Math.min(total, (((_a = search.offset) !== null && _a !== void 0 ? _a : 0) + 1) * ((_b = search.count) !== null && _b !== void 0 ? _b : core.DEFAULT_SEARCH_COUNT));
     }
@@ -5015,17 +5033,24 @@
         const [schema, setSchema] = React.useState();
         const questionnaire = useResource(props.questionnaire);
         const [response, setResponse] = React.useState();
+        const [answers, setAnswers] = React.useState({});
         React.useEffect(() => {
-            medplum.requestSchema('Questionnaire').then(setSchema).catch(console.log);
+            medplum
+                .requestSchema('Questionnaire')
+                .then(() => medplum.requestSchema('QuestionnaireResponse'))
+                .then(setSchema)
+                .catch(console.log);
         }, [medplum]);
         React.useEffect(() => {
             setResponse(questionnaire ? buildInitialResponse(questionnaire) : undefined);
         }, [questionnaire]);
         function setItems(newResponseItems) {
-            setResponse({
+            const newResponse = {
                 resourceType: 'QuestionnaireResponse',
                 item: newResponseItems,
-            });
+            };
+            setResponse(newResponse);
+            setAnswers(core.getQuestionnaireAnswers(newResponse));
         }
         if (!schema || !questionnaire) {
             return null;
@@ -5036,8 +5061,8 @@
                 }
             } },
             questionnaire.title && React__default["default"].createElement("h1", null, questionnaire.title),
-            questionnaire.item && React__default["default"].createElement(QuestionnaireFormItemArray, { items: questionnaire.item, onChange: setItems }),
-            React__default["default"].createElement(Button, { type: "submit", size: "large" }, "OK")));
+            questionnaire.item && (React__default["default"].createElement(QuestionnaireFormItemArray, { items: questionnaire.item, answers: answers, onChange: setItems })),
+            React__default["default"].createElement(Button, { type: "submit", size: "large" }, props.submitButtonText || 'OK')));
     }
     function QuestionnaireFormItemArray(props) {
         const [responseItems, setResponseItems] = React.useState(buildInitialResponseItems(props.items));
@@ -5048,11 +5073,14 @@
             props.onChange(newResponseItems);
         }
         return (React__default["default"].createElement(React__default["default"].Fragment, null, props.items.map((item, index) => {
+            if (!isQuestionEnabled(item, props.answers)) {
+                return null;
+            }
             if (item.type === exports.QuestionnaireItemType.display) {
                 return React__default["default"].createElement("p", { key: item.linkId }, item.text);
             }
             if (item.type === exports.QuestionnaireItemType.group) {
-                return (React__default["default"].createElement(QuestionnaireFormItem, { key: item.linkId, item: item, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) }));
+                return (React__default["default"].createElement(QuestionnaireFormItem, { key: item.linkId, item: item, answers: props.answers, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) }));
             }
             if (item.type === exports.QuestionnaireItemType.boolean) {
                 const initial = item.initial && item.initial.length > 0 ? item.initial[0] : undefined;
@@ -5064,7 +5092,7 @@
                         }) })));
             }
             return (React__default["default"].createElement(FormSection, { key: item.linkId, htmlFor: item.linkId, title: item.text || '' },
-                React__default["default"].createElement(QuestionnaireFormItem, { item: item, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) })));
+                React__default["default"].createElement(QuestionnaireFormItem, { item: item, answers: props.answers, onChange: (newResponseItem) => setResponseItem(index, newResponseItem) })));
         })));
     }
     function QuestionnaireFormItem(props) {
@@ -5096,7 +5124,7 @@
             case exports.QuestionnaireItemType.group:
                 return (React__default["default"].createElement("div", null,
                     React__default["default"].createElement("h3", null, item.text),
-                    item.item && React__default["default"].createElement(QuestionnaireFormItemArray, { items: item.item, onChange: onChangeItem })));
+                    item.item && (React__default["default"].createElement(QuestionnaireFormItemArray, { items: item.item, answers: props.answers, onChange: onChangeItem }))));
             case exports.QuestionnaireItemType.boolean:
                 return (React__default["default"].createElement(Checkbox, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueBoolean, onChange: (newValue) => onChangeAnswer({ valueBoolean: newValue }) }));
             case exports.QuestionnaireItemType.decimal:
@@ -5207,6 +5235,35 @@
                 ((_c = (_b = (_a = e.valueCodeableConcept) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code) === 'drop-down';
         }));
     }
+    function isQuestionEnabled(item, answers) {
+        if (!item.enableWhen) {
+            return true;
+        }
+        const enableBehavior = item.enableBehavior || 'any';
+        for (const enableWhen of item.enableWhen) {
+            const expectedAnswer = core.getTypedPropertyValue({
+                type: 'QuestionnaireItemEnableWhen',
+                value: enableWhen,
+            }, 'answer[x]');
+            const actualAnswer = core.getTypedPropertyValue({
+                type: 'QuestionnaireResponseItemAnswer',
+                value: answers[enableWhen.question],
+            }, 'value[x]');
+            const match = core.deepEquals(expectedAnswer, actualAnswer);
+            if (enableBehavior === 'any' && match) {
+                return true;
+            }
+            if (enableBehavior === 'all' && !match) {
+                return false;
+            }
+        }
+        if (enableBehavior === 'any') {
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
 
     function QuestionnaireBuilder(props) {
         const medplum = useMedplum();
@@ -5303,7 +5360,7 @@
                 isChoiceQuestion(item) && (React__default["default"].createElement(AnswerBuilder, { options: item.answerOption, onChange: (newOptions) => changeProperty('answerOption', newOptions) })))) : (React__default["default"].createElement(React__default["default"].Fragment, null,
                 resource.title && React__default["default"].createElement("h1", null, resource.title),
                 item.text && React__default["default"].createElement("p", null, item.text),
-                !isContainer && React__default["default"].createElement(QuestionnaireFormItem, { item: item, onChange: () => undefined }))),
+                !isContainer && React__default["default"].createElement(QuestionnaireFormItem, { item: item, answers: {}, onChange: () => undefined }))),
             item.item &&
                 item.item.map((i) => (React__default["default"].createElement("div", { key: i.id },
                     React__default["default"].createElement(ItemBuilder, { item: i, selectedKey: props.selectedKey, setSelectedKey: props.setSelectedKey, hoverKey: props.hoverKey, setHoverKey: props.setHoverKey, onChange: changeItem, onRemove: () => removeItem(i) })))),
@@ -5593,6 +5650,7 @@
     function blame(history) {
         // Convert to array of array of lines
         const versions = history.entry
+            .filter((entry) => !!entry.resource)
             .map((entry) => {
             var _a;
             return ({
@@ -5876,22 +5934,23 @@
         var _a;
         const medplum = useMedplum();
         const schedule = useResource(props.schedule);
+        const questionnaire = useResource(props.questionnaire);
         const [slots, setSlots] = React.useState();
         const slotsRef = React.useRef();
         slotsRef.current = slots;
         const [month, setMonth] = React.useState(getStartMonth());
         const [date, setDate] = React.useState();
         const [slot, setSlot] = React.useState();
-        const [info, setInfo] = React.useState();
-        const [form, setForm] = React.useState();
+        const [response, setResponse] = React.useState();
         React.useEffect(() => {
             if (schedule) {
                 setSlots([]);
                 medplum
                     .searchResources('Slot', new URLSearchParams([
+                    ['_count', (30 * 24).toString()],
                     ['schedule', core.getReferenceString(schedule)],
-                    ['start', 'gt' + month.toISOString()],
-                    ['start', 'lt' + new Date(month.getTime() + 31 * 24 * 60 * 60 * 1000).toISOString()],
+                    ['start', 'gt' + getStart(month)],
+                    ['start', 'lt' + getEnd(month)],
                 ]))
                     .then(setSlots)
                     .catch(console.log);
@@ -5900,7 +5959,7 @@
                 setSlots(undefined);
             }
         }, [medplum, schedule, month]);
-        if (!schedule || !slots) {
+        if (!schedule || !slots || !questionnaire) {
             return null;
         }
         const actor = (_a = schedule.actor) === null || _a === void 0 ? void 0 : _a[0];
@@ -5924,26 +5983,20 @@
                             slotStart.getTime() < date.getTime() + 24 * 3600 * 1000 && (React__default["default"].createElement("div", { key: s.id },
                             React__default["default"].createElement(Button, { style: { width: 150 }, onClick: () => setSlot(s) }, formatTime(slotStart)))));
                     }))),
-                date && slot && !info && (React__default["default"].createElement("div", null,
-                    React__default["default"].createElement("h3", null, "Enter your info"),
-                    React__default["default"].createElement(FormSection, { title: "Name", htmlFor: "name" },
-                        React__default["default"].createElement(Input, { name: "name" })),
-                    React__default["default"].createElement(FormSection, { title: "Email", htmlFor: "email" },
-                        React__default["default"].createElement(Input, { name: "email" })),
-                    React__default["default"].createElement(Button, { primary: true, onClick: () => setInfo('info') }, "Next"))),
-                date && slot && info && !form && (React__default["default"].createElement("div", null,
-                    React__default["default"].createElement("h3", null, "Custom questions"),
-                    React__default["default"].createElement(FormSection, { title: "Question 1", htmlFor: "q1" },
-                        React__default["default"].createElement(Input, { name: "q1" })),
-                    React__default["default"].createElement(FormSection, { title: "Question 2", htmlFor: "q2" },
-                        React__default["default"].createElement(Input, { name: "email" })),
-                    React__default["default"].createElement(FormSection, { title: "Question 3", htmlFor: "q3" },
-                        React__default["default"].createElement(Input, { name: "email" })),
-                    React__default["default"].createElement(Button, { primary: true, onClick: () => setForm('form') }, "Next"))),
-                date && slot && info && form && (React__default["default"].createElement("div", null,
+                date && slot && !response && (React__default["default"].createElement(QuestionnaireForm, { questionnaire: questionnaire, submitButtonText: 'Next', onSubmit: setResponse })),
+                date && slot && response && (React__default["default"].createElement("div", null,
                     React__default["default"].createElement("h3", null, "You're all set!"),
                     React__default["default"].createElement("p", null, "Check your email for a calendar invite."))))));
     }
+    function getStart(month) {
+        return formatSlotInstant(month.getTime());
+    }
+    function getEnd(month) {
+        return formatSlotInstant(month.getTime() + 31 * 24 * 60 * 60 * 1000);
+    }
+    function formatSlotInstant(time) {
+        return new Date(Math.max(Date.now(), time)).toISOString();
+    }
     function formatTime(date) {
         return date.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' });
     }
@@ -5962,19 +6015,19 @@
                     {
                         request: {
                             method: 'GET',
-                            url: `Communication?based-on=${core.getReferenceString(resource)}`,
+                            url: `Communication?based-on=${core.getReferenceString(resource)}&_sort=-_lastUpdated`,
                         },
                     },
                     {
                         request: {
                             method: 'GET',
-                            url: `Media?_count=100&based-on=${core.getReferenceString(resource)}`,
+                            url: `Media?_count=100&based-on=${core.getReferenceString(resource)}&_sort=-_lastUpdated`,
                         },
                     },
                     {
                         request: {
                             method: 'GET',
-                            url: `DiagnosticReport?based-on=${core.getReferenceString(resource)}`,
+                            url: `DiagnosticReport?based-on=${core.getReferenceString(resource)}&_sort=-_lastUpdated`,
                         },
                     },
                 ],
@@ -6163,6 +6216,7 @@
     exports.hasFilterOnField = hasFilterOnField;
     exports.initRecaptcha = initRecaptcha;
     exports.isChoiceQuestion = isChoiceQuestion;
+    exports.isQuestionEnabled = isQuestionEnabled;
     exports.isSortDescending = isSortDescending;
     exports.movePage = movePage;
     exports.parseForm = parseForm;