@medplum/react 0.9.31 → 0.9.34

package/dist/cjs/QuestionnaireForm.d.ts

@@ -1,14 +1,17 @@
 /// <reference types="react" />
-import { Questionnaire, QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem, Reference } from '@medplum/fhirtypes';
+import { Questionnaire, QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem, QuestionnaireResponseItemAnswer, Reference } from '@medplum/fhirtypes';
 import './QuestionnaireForm.css';
 export interface QuestionnaireFormProps {
     questionnaire: Questionnaire | Reference<Questionnaire>;
     subject?: Reference;
+    submitButtonText?: string;
     onSubmit: (response: QuestionnaireResponse) => void;
 }
 export declare function QuestionnaireForm(props: QuestionnaireFormProps): JSX.Element | null;
 export interface QuestionnaireFormItemProps {
     item: QuestionnaireItem;
+    answers: Record<string, QuestionnaireResponseItemAnswer>;
     onChange: (newResponseItem: QuestionnaireResponseItem) => void;
 }
 export declare function QuestionnaireFormItem(props: QuestionnaireFormItemProps): JSX.Element | null;
+export declare function isQuestionEnabled(item: QuestionnaireItem, answers: Record<string, QuestionnaireResponseItemAnswer>): boolean;

package/dist/cjs/Scheduler.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
-import { Reference, Schedule } from '@medplum/fhirtypes';
+import { Questionnaire, Reference, Schedule } from '@medplum/fhirtypes';
 import './Scheduler.css';
 export interface SchedulerProps {
     schedule: Schedule | Reference<Schedule>;
+    questionnaire: Questionnaire | Reference<Questionnaire>;
 }
 export declare function Scheduler(props: SchedulerProps): JSX.Element | null;

package/dist/cjs/auth/AuthenticationForm.d.ts

@@ -6,6 +6,8 @@ export interface AuthenticationFormProps {
     readonly scope?: string;
     readonly nonce?: string;
     readonly googleClientId?: string;
+    readonly codeChallenge?: string;
+    readonly codeChallengeMethod?: string;
     readonly onForgotPassword?: () => void;
     readonly onRegister?: () => void;
     readonly handleAuthResponse: (response: LoginAuthenticationResponse) => void;

package/dist/cjs/auth/SignInForm.d.ts

@@ -8,6 +8,8 @@ export interface SignInFormProps {
     readonly clientId?: string;
     readonly scope?: string;
     readonly nonce?: string;
+    readonly codeChallenge?: string;
+    readonly codeChallengeMethod?: string;
     readonly onSuccess?: () => void;
     readonly onForgotPassword?: () => void;
     readonly onRegister?: () => void;

package/dist/cjs/index.js

@@ -654,7 +654,7 @@
         }
         return (React__default["default"].createElement(Document, { width: 450 },
             outcome && React__default["default"].createElement("pre", null, JSON.stringify(outcome, null, 2)),
-            !login && (React__default["default"].createElement(NewUserForm, { projectId: projectId, googleClientId: googleClientId, recaptchaSiteKey: recaptchaSiteKey, handleAuthResponse: handleAuthResponse })),
+            !login && (React__default["default"].createElement(NewUserForm, { projectId: projectId, googleClientId: googleClientId, recaptchaSiteKey: recaptchaSiteKey, handleAuthResponse: handleAuthResponse }, props.children)),
             login && type === 'project' && React__default["default"].createElement(NewProjectForm, { login: login, handleAuthResponse: handleAuthResponse })));
     }
 
@@ -713,6 +713,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 +736,8 @@
                                 clientId: props.clientId,
                                 scope: props.scope,
                                 nonce: props.nonce,
+                                codeChallenge: props.codeChallenge,
+                                codeChallengeMethod: props.codeChallengeMethod,
                                 googleClientId: response.clientId,
                                 googleCredential: response.credential,
                             })
@@ -887,7 +891,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 });
@@ -4221,9 +4225,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()),
@@ -4290,11 +4294,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 +5019,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 +5047,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 +5059,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 +5078,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 +5110,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 +5221,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 +5346,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) })))),
@@ -5876,22 +5919,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 +5944,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 +5968,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 +6000,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 +6201,7 @@
     exports.hasFilterOnField = hasFilterOnField;
     exports.initRecaptcha = initRecaptcha;
     exports.isChoiceQuestion = isChoiceQuestion;
+    exports.isQuestionEnabled = isQuestionEnabled;
     exports.isSortDescending = isSortDescending;
     exports.movePage = movePage;
     exports.parseForm = parseForm;