@medplum/react 0.9.20 → 0.9.21

package/dist/esm/index.js

@@ -2178,8 +2178,7 @@ function ResourceTimeline(props) {
             setHistory({});
             return;
         }
-        const batchRequest = buildSearchRequests(resource);
-        medplum.post('fhir/R4', batchRequest).then(handleBatchResponse);
+        medplum.executeBatch(buildSearchRequests(resource)).then(handleBatchResponse);
     }, [medplum, resource, buildSearchRequests]);
     useEffect(() => {
         loadTimeline();
@@ -4607,31 +4606,64 @@ function QuestionnaireFormItem(props) {
             return (React.createElement(TextArea, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueString, onChange: (newValue) => onChangeAnswer({ valueString: newValue }) }));
         case QuestionnaireItemType.url:
             return (React.createElement(Input, { type: "url", name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueUri, onChange: (newValue) => onChangeAnswer({ valueUri: newValue }) }));
-        case QuestionnaireItemType.choice:
-        case QuestionnaireItemType.openChoice:
-            return (React.createElement("div", null, item.answerOption &&
-                item.answerOption.map((option, index) => {
-                    const valueElementDefinition = globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
-                    const optionValue = getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
-                    const initialValue = getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
-                    const propertyName = 'value' + capitalize(optionValue.type);
-                    const optionName = `${name}-option-${index}`;
-                    return (React.createElement("div", { key: optionName, className: "medplum-questionnaire-option-row" },
-                        React.createElement("div", { className: "medplum-questionnaire-option-checkbox" },
-                            React.createElement("input", { type: "radio", id: optionName, name: name, value: optionValue.value, defaultChecked: initialValue && stringify(optionValue) === stringify(initialValue), onChange: () => onChangeAnswer({ [propertyName]: optionValue.value }) })),
-                        React.createElement("div", null,
-                            React.createElement("label", { htmlFor: optionName },
-                                React.createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })))));
-                })));
         case QuestionnaireItemType.attachment:
             return (React.createElement(AttachmentInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueAttachment, onChange: (newValue) => onChangeAnswer({ valueAttachment: newValue }) }));
         case QuestionnaireItemType.reference:
             return (React.createElement(ReferenceInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueReference, onChange: (newValue) => onChangeAnswer({ valueReference: newValue }) }));
         case QuestionnaireItemType.quantity:
             return (React.createElement(QuantityInput, { name: name, defaultValue: initial === null || initial === void 0 ? void 0 : initial.valueQuantity, onChange: (newValue) => onChangeAnswer({ valueQuantity: newValue }) }));
+        case QuestionnaireItemType.choice:
+        case QuestionnaireItemType.openChoice:
+            if (isDropDownChoice(item)) {
+                return (React.createElement(QuestionnaireChoiceDropDownInput, { name: name, item: item, initial: initial, onChangeAnswer: onChangeAnswer }));
+            }
+            else {
+                return (React.createElement(QuestionnaireChoiceRadioInput, { name: name, item: item, initial: initial, onChangeAnswer: onChangeAnswer }));
+            }
     }
     return null;
 }
+function QuestionnaireChoiceDropDownInput(props) {
+    const { name, item, initial } = props;
+    const valueElementDefinition = globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
+    const initialValue = getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
+    return (React.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 = getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+            const propertyName = 'value' + capitalize(optionValue.type);
+            props.onChangeAnswer({ [propertyName]: optionValue.value });
+        } },
+        React.createElement("option", null),
+        item.answerOption &&
+            item.answerOption.map((option, index) => {
+                const optionValue = getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+                const optionName = `${name}-option-${index}`;
+                return (React.createElement("option", { key: optionName, value: optionValue.value, selected: initialValue && stringify(optionValue) === stringify(initialValue) },
+                    React.createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })));
+            })));
+}
+function QuestionnaireChoiceRadioInput(props) {
+    const { name, item, initial, onChangeAnswer } = props;
+    const valueElementDefinition = globalSchema.types['QuestionnaireItemAnswerOption'].properties['value[x]'];
+    const initialValue = getTypedPropertyValue({ type: 'QuestionnaireItemInitial', value: initial }, 'value');
+    return (React.createElement(React.Fragment, null, item.answerOption &&
+        item.answerOption.map((option, index) => {
+            const optionValue = getTypedPropertyValue({ type: 'QuestionnaireItemAnswerOption', value: option }, 'value');
+            const propertyName = 'value' + capitalize(optionValue.type);
+            const optionName = `${name}-option-${index}`;
+            return (React.createElement("div", { key: optionName, className: "medplum-questionnaire-option-row" },
+                React.createElement("div", { className: "medplum-questionnaire-option-checkbox" },
+                    React.createElement("input", { type: "radio", id: optionName, name: name, value: optionValue.value, defaultChecked: initialValue && stringify(optionValue) === stringify(initialValue), onChange: () => onChangeAnswer({ [propertyName]: optionValue.value }) })),
+                React.createElement("div", null,
+                    React.createElement("label", { htmlFor: optionName },
+                        React.createElement(ResourcePropertyDisplay, { property: valueElementDefinition, propertyType: optionValue.type, value: optionValue.value })))));
+        })));
+}
 function buildInitialResponse(questionnaire) {
     const response = {
         resourceType: 'QuestionnaireResponse',
@@ -4657,6 +4689,14 @@ function buildInitialResponseAnswer(answer) {
     // 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();
@@ -4870,7 +4910,7 @@ function RequestGroupDisplay(props) {
     const [responseBundle, setResponseBundle] = useState();
     useEffect(() => {
         if (requestGroup && !startedLoading) {
-            medplum.post('fhir/R4', buildBatchRequest(requestGroup)).then(setResponseBundle);
+            medplum.executeBatch(buildBatchRequest(requestGroup)).then(setResponseBundle);
             setStartedLoading(true);
         }
     }, [medplum, requestGroup, startedLoading]);