@medplum/react 0.9.20 → 0.9.21

package/dist/cjs/index.js

@@ -2184,8 +2184,7 @@
                 setHistory({});
                 return;
             }
-            const batchRequest = buildSearchRequests(resource);
-            medplum.post('fhir/R4', batchRequest).then(handleBatchResponse);
+            medplum.executeBatch(buildSearchRequests(resource)).then(handleBatchResponse);
         }, [medplum, resource, buildSearchRequests]);
         React.useEffect(() => {
             loadTimeline();
@@ -4613,31 +4612,64 @@
                 return (React__default["default"].createElement(TextArea, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueString, onChange: (newValue) => onChangeAnswer({ valueString: newValue }) }));
             case exports.QuestionnaireItemType.url:
                 return (React__default["default"].createElement(Input, { type: "url", name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueUri, onChange: (newValue) => onChangeAnswer({ valueUri: newValue }) }));
-            case exports.QuestionnaireItemType.choice:
-            case exports.QuestionnaireItemType.openChoice:
-                return (React__default["default"].createElement("div", null, item.answerOption &&
-                    item.answerOption.map((option, index) => {
-                        const valueElementDefinition = core.globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
-                        const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
-                        const initialValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
-                        const propertyName = 'value' + core.capitalize(optionValue.type);
-                        const optionName = `${name}-option-${index}`;
-                        return (React__default["default"].createElement("div", { key: optionName, className: "medplum-questionnaire-option-row" },
-                            React__default["default"].createElement("div", { className: "medplum-questionnaire-option-checkbox" },
-                                React__default["default"].createElement("input", { type: "radio", id: optionName, name: name, value: optionValue.value, defaultChecked: initialValue && core.stringify(optionValue) === core.stringify(initialValue), onChange: () => onChangeAnswer({ [propertyName]: optionValue.value }) })),
-                            React__default["default"].createElement("div", null,
-                                React__default["default"].createElement("label", { htmlFor: optionName },
-                                    React__default["default"].createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })))));
-                    })));
             case exports.QuestionnaireItemType.attachment:
                 return (React__default["default"].createElement(AttachmentInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueAttachment, onChange: (newValue) => onChangeAnswer({ valueAttachment: newValue }) }));
             case exports.QuestionnaireItemType.reference:
                 return (React__default["default"].createElement(ReferenceInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueReference, onChange: (newValue) => onChangeAnswer({ valueReference: newValue }) }));
             case exports.QuestionnaireItemType.quantity:
                 return (React__default["default"].createElement(QuantityInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueQuantity, onChange: (newValue) => onChangeAnswer({ valueQuantity: newValue }) }));
+            case exports.QuestionnaireItemType.choice:
+            case exports.QuestionnaireItemType.openChoice:
+                if (isDropDownChoice(item)) {
+                    return (React__default["default"].createElement(QuestionnaireChoiceDropDownInput, { name: name, item: item, initial: initial, onChangeAnswer: onChangeAnswer }));
+                }
+                else {
+                    return (React__default["default"].createElement(QuestionnaireChoiceRadioInput, { name: name, item: item, initial: initial, onChangeAnswer: onChangeAnswer }));
+                }
         }
         return null;
     }
+    function QuestionnaireChoiceDropDownInput(props) {
+        const { name, item, initial } = props;
+        const valueElementDefinition = core.globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
+        const initialValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
+        return (React__default["default"].createElement("select", { id: name, name: name, className: "medplum-select", onChange: (e) => {
+                const index = e.currentTarget.selectedIndex;
+                if (index === 0) {
+                    props.onChangeAnswer({});
+                    return;
+                }
+                const option = item.answerOption[index - 1];
+                const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+                const propertyName = 'value' + core.capitalize(optionValue.type);
+                props.onChangeAnswer({ [propertyName]: optionValue.value });
+            } },
+            React__default["default"].createElement("option", null),
+            item.answerOption &&
+                item.answerOption.map((option, index) => {
+                    const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+                    const optionName = `${name}-option-${index}`;
+                    return (React__default["default"].createElement("option", { key: optionName, value: optionValue.value, selected: initialValue && core.stringify(optionValue) === core.stringify(initialValue) },
+                        React__default["default"].createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })));
+                })));
+    }
+    function QuestionnaireChoiceRadioInput(props) {
+        const { name, item, initial, onChangeAnswer } = props;
+        const valueElementDefinition = core.globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
+        const initialValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
+        return (React__default["default"].createElement(React__default["default"].Fragment, null, item.answerOption &&
+            item.answerOption.map((option, index) => {
+                const optionValue = core.getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+                const propertyName = 'value' + core.capitalize(optionValue.type);
+                const optionName = `${name}-option-${index}`;
+                return (React__default["default"].createElement("div", { key: optionName, className: "medplum-questionnaire-option-row" },
+                    React__default["default"].createElement("div", { className: "medplum-questionnaire-option-checkbox" },
+                        React__default["default"].createElement("input", { type: "radio", id: optionName, name: name, value: optionValue.value, defaultChecked: initialValue && core.stringify(optionValue) === core.stringify(initialValue), onChange: () => onChangeAnswer({ [propertyName]: optionValue.value }) })),
+                    React__default["default"].createElement("div", null,
+                        React__default["default"].createElement("label", { htmlFor: optionName },
+                            React__default["default"].createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })))));
+            })));
+    }
     function buildInitialResponse(questionnaire) {
         const response = {
             resourceType: 'QuestionnaireResponse',
@@ -4663,6 +4695,14 @@
         // have the same properties.
         return Object.assign({}, answer);
     }
+    function isDropDownChoice(item) {
+        var _a;
+        return !!((_a = item.extension) === null || _a === void 0 ? void 0 : _a.some((e) => {
+            var _a, _b, _c;
+            return e.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl' &&
+                ((_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 QuestionnaireBuilder(props) {
         const medplum = useMedplum();
@@ -4876,7 +4916,7 @@
         const [responseBundle, setResponseBundle] = React.useState();
         React.useEffect(() => {
             if (requestGroup && !startedLoading) {
-                medplum.post('fhir/R4', buildBatchRequest(requestGroup)).then(setResponseBundle);
+                medplum.executeBatch(buildBatchRequest(requestGroup)).then(setResponseBundle);
                 setStartedLoading(true);
             }
         }, [medplum, requestGroup, startedLoading]);