@medplum/react 0.9.35 → 0.9.37

package/dist/cjs/QuestionnaireUtils.d.ts

@@ -1,4 +1,4 @@
-import { Questionnaire, QuestionnaireItem } from '@medplum/fhirtypes';
+import { QuestionnaireItem } from '@medplum/fhirtypes';
 export declare enum QuestionnaireItemType {
     group = "group",
     display = "display",
@@ -18,13 +18,4 @@ export declare enum QuestionnaireItemType {
     reference = "reference",
     quantity = "quantity"
 }
-/**
- * Adds initial values to a questionnaire resource from key value pairs.
- * The values map uses "linkId" as key.
- * The value depends on the questionnaire item type.
- * @param questionnaire The original questionnaire.
- * @param values Key value pairs for initial values.
- * @returns Rewritten questionnaire with initial values.
- */
-export declare function addQuestionnaireInitialValues(questionnaire: Questionnaire, values: Record<string, string>): Questionnaire;
 export declare function isChoiceQuestion(item: QuestionnaireItem): boolean;

package/dist/cjs/SearchFilterValueDisplay.d.ts

@@ -4,4 +4,4 @@ export interface SearchFilterValueDisplayProps {
     readonly resourceType: string;
     readonly filter: Filter;
 }
-export declare function SearchFilterValueDisplay(props: SearchFilterValueDisplayProps): JSX.Element | null;
+export declare function SearchFilterValueDisplay(props: SearchFilterValueDisplayProps): JSX.Element;

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

@@ -6,6 +6,7 @@ export interface AuthenticationFormProps {
     readonly scope?: string;
     readonly nonce?: string;
     readonly googleClientId?: string;
+    readonly generatePkce?: boolean;
     readonly codeChallenge?: string;
     readonly codeChallengeMethod?: string;
     readonly onForgotPassword?: () => void;

package/dist/cjs/index.js

@@ -724,9 +724,16 @@
         const googleClientId = getGoogleClientId(props.googleClientId);
         const [outcome, setOutcome] = React.useState();
         const issues = getIssuesForExpression(outcome, undefined);
+        function startPkce() {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (props.generatePkce) {
+                    yield medplum.startPkce();
+                }
+            });
+        }
         return (React__default["default"].createElement(Form, { style: { maxWidth: 400 }, onSubmit: (formData) => {
-                medplum
-                    .startLogin({
+                startPkce()
+                    .then(() => medplum.startLogin({
                     projectId: props.projectId,
                     clientId: props.clientId,
                     scope: props.scope,
@@ -736,7 +743,7 @@
                     email: formData.email,
                     password: formData.password,
                     remember: formData.remember === 'true',
-                })
+                }))
                     .then(props.handleAuthResponse)
                     .catch(setOutcome);
             } },
@@ -748,8 +755,8 @@
             googleClientId && (React__default["default"].createElement(React__default["default"].Fragment, null,
                 React__default["default"].createElement("div", { className: "medplum-signin-google-container" },
                     React__default["default"].createElement(GoogleButton, { googleClientId: googleClientId, handleGoogleCredential: (response) => {
-                            medplum
-                                .startGoogleLogin({
+                            startPkce()
+                                .then(() => medplum.startGoogleLogin({
                                 projectId: props.projectId,
                                 clientId: props.clientId,
                                 scope: props.scope,
@@ -758,7 +765,7 @@
                                 codeChallengeMethod: props.codeChallengeMethod,
                                 googleClientId: response.clientId,
                                 googleCredential: response.credential,
-                            })
+                            }))
                                 .then(props.handleAuthResponse)
                                 .catch(setOutcome);
                         } })),
@@ -909,7 +916,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, codeChallenge: props.codeChallenge, codeChallengeMethod: props.codeChallengeMethod, 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, generatePkce: !props.onCode, 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 });
@@ -1703,7 +1710,8 @@
                 React__default["default"].createElement("option", null, "pager"),
                 React__default["default"].createElement("option", null, "phone"),
                 React__default["default"].createElement("option", null, "other"),
-                React__default["default"].createElement("option", null, "sms")),
+                React__default["default"].createElement("option", null, "sms"),
+                React__default["default"].createElement("option", null, "url")),
             React__default["default"].createElement(Select, { defaultValue: contactPoint === null || contactPoint === void 0 ? void 0 : contactPoint.use, onChange: setUse, testid: "use" },
                 React__default["default"].createElement("option", null),
                 React__default["default"].createElement("option", null, "home"),
@@ -2572,9 +2580,19 @@
                     props.onClose();
                 }
             }
+            function handleScroll(e) {
+                var _a;
+                if ((_a = propsRef.current) === null || _a === void 0 ? void 0 : _a.visible) {
+                    killEvent(e);
+                }
+            }
             document.addEventListener('click', handleClick, true);
+            window.addEventListener('wheel', handleScroll, { passive: false });
+            window.addEventListener('touchmove', handleScroll, true);
             return () => {
                 document.removeEventListener('click', handleClick, true);
+                window.removeEventListener('wheel', handleScroll);
+                window.removeEventListener('touchmove', handleScroll, true);
             };
         }, [props]);
         // Listen for changes in the location
@@ -3734,15 +3752,16 @@
 
     function SearchFilterValueDisplay(props) {
         var _a, _b;
-        const medplum = useMedplum();
-        const schema = medplum.getSchema();
-        const searchParam = (_b = (_a = schema.types[props.resourceType]) === null || _a === void 0 ? void 0 : _a.searchParams) === null || _b === void 0 ? void 0 : _b[props.filter.code];
-        const filter = props.filter;
-        if ((searchParam === null || searchParam === void 0 ? void 0 : searchParam.type) === 'reference') {
-            return React__default["default"].createElement(ResourceName, { value: { reference: filter.value } });
-        }
-        if (props.filter.code === '_lastUpdated' || (searchParam === null || searchParam === void 0 ? void 0 : searchParam.type) === 'datetime') {
-            return React__default["default"].createElement(React__default["default"].Fragment, null, core.formatDateTime(filter.value));
+        const { resourceType, filter } = props;
+        const searchParam = (_b = (_a = core.globalSchema.types[resourceType]) === null || _a === void 0 ? void 0 : _a.searchParams) === null || _b === void 0 ? void 0 : _b[filter.code];
+        if (searchParam) {
+            if (searchParam.type === 'reference') {
+                return React__default["default"].createElement(ResourceName, { value: { reference: filter.value } });
+            }
+            const searchParamDetails = core.getSearchParameterDetails(resourceType, searchParam);
+            if (filter.code === '_lastUpdated' || searchParamDetails.type === core.SearchParameterType.DATETIME) {
+                return React__default["default"].createElement(React__default["default"].Fragment, null, core.formatDateTime(filter.value));
+            }
         }
         return React__default["default"].createElement(React__default["default"].Fragment, null, filter.value);
     }
@@ -4205,6 +4224,7 @@
             }
         }
         React.useEffect(() => {
+            setSchemaLoaded(false);
             medplum
                 .requestSchema(props.search.resourceType)
                 .then(() => setSchemaLoaded(true))
@@ -4834,6 +4854,8 @@
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
             React__default["default"].createElement(FormSection, { title: "Title", htmlFor: `actionTitle-${action.id}` },
                 React__default["default"].createElement(Input, { name: `actionTitle-${action.id}`, defaultValue: action.title, onChange: (newValue) => changeProperty('title', newValue) })),
+            React__default["default"].createElement(FormSection, { title: "Description", htmlFor: `actionDescription-${action.id}` },
+                React__default["default"].createElement(Input, { name: `actionDescription-${action.id}`, defaultValue: action.description, onChange: (newValue) => changeProperty('description', newValue) })),
             React__default["default"].createElement(FormSection, { title: "Type of Action", description: "The type of the action to be performed.", htmlFor: `actionType-${action.id}` },
                 React__default["default"].createElement(Select, { name: `actionType-${action.id}`, defaultValue: actionType, onChange: setActionType },
                     React__default["default"].createElement("option", null),
@@ -4948,81 +4970,6 @@
         QuestionnaireItemType["reference"] = "reference";
         QuestionnaireItemType["quantity"] = "quantity";
     })(exports.QuestionnaireItemType || (exports.QuestionnaireItemType = {}));
-    /**
-     * Adds initial values to a questionnaire resource from key value pairs.
-     * The values map uses "linkId" as key.
-     * The value depends on the questionnaire item type.
-     * @param questionnaire The original questionnaire.
-     * @param values Key value pairs for initial values.
-     * @returns Rewritten questionnaire with initial values.
-     */
-    function addQuestionnaireInitialValues(questionnaire, values) {
-        return Object.assign(Object.assign({}, questionnaire), { item: addInitialValuesToItemArray(questionnaire.item, values) });
-    }
-    function addInitialValuesToItemArray(items, values) {
-        if (!items) {
-            return undefined;
-        }
-        return items.map((item) => addInitialValueToItem(item, values));
-    }
-    function addInitialValueToItem(item, values) {
-        const { linkId, type } = item;
-        if (!linkId || !type) {
-            return item;
-        }
-        if (type === 'group') {
-            return Object.assign(Object.assign({}, item), { item: addInitialValuesToItemArray(item.item, values) });
-        }
-        const suppliedValue = values[linkId];
-        if (!suppliedValue) {
-            return item;
-        }
-        let initialValue = undefined;
-        switch (type) {
-            case core.PropertyType.boolean:
-                initialValue = { valueBoolean: suppliedValue === 'true' };
-                break;
-            case core.PropertyType.code:
-            case core.PropertyType.Coding:
-                initialValue = { valueCoding: { code: suppliedValue } };
-                break;
-            case core.PropertyType.date:
-                initialValue = { valueDate: suppliedValue };
-                break;
-            case core.PropertyType.dateTime:
-            case core.PropertyType.instant:
-                initialValue = { valueDateTime: suppliedValue };
-                break;
-            case core.PropertyType.decimal:
-                initialValue = { valueDecimal: parseFloat(suppliedValue) };
-                break;
-            case core.PropertyType.integer:
-            case core.PropertyType.positiveInt:
-            case core.PropertyType.unsignedInt:
-                initialValue = { valueInteger: parseInt(suppliedValue) };
-                break;
-            case core.PropertyType.SystemString:
-            case core.PropertyType.string:
-            case core.PropertyType.markdown:
-                initialValue = { valueString: suppliedValue };
-                break;
-            case core.PropertyType.time:
-                initialValue = { valueTime: suppliedValue };
-                break;
-            case core.PropertyType.uri:
-            case core.PropertyType.url:
-                initialValue = { valueUri: suppliedValue };
-                break;
-            case core.PropertyType.canonical:
-            case core.PropertyType.Reference:
-                initialValue = { valueReference: { reference: suppliedValue } };
-                break;
-        }
-        if (!initialValue) {
-            return item;
-        }
-        return Object.assign(Object.assign({}, item), { initial: [initialValue] });
-    }
     function isChoiceQuestion(item) {
         return item.type === 'choice' || item.type === 'open-choice';
     }
@@ -5456,6 +5403,15 @@
         if (!items) {
             return undefined;
         }
+        items.forEach((item) => {
+            var _a, _b;
+            if ((_a = item.id) === null || _a === void 0 ? void 0 : _a.match(/^id-\d+$/)) {
+                nextId = Math.max(nextId, parseInt(item.id.substring(3)) + 1);
+            }
+            if ((_b = item.linkId) === null || _b === void 0 ? void 0 : _b.match(/^q\d+$/)) {
+                nextLinkId = Math.max(nextLinkId, parseInt(item.linkId.substring(1)) + 1);
+            }
+        });
         return items.map((item) => (Object.assign(Object.assign({}, item), { id: item.id || generateId(), item: ensureQuestionnaireItemKeys(item.item), answerOption: ensureQuestionnaireOptionKeys(item.answerOption) })));
     }
     function ensureQuestionnaireOptionKeys(options) {
@@ -5493,6 +5449,7 @@
                 React__default["default"].createElement("div", { className: "medplum-request-group-task-checkmark" }, (task === null || task === void 0 ? void 0 : task.status) === 'completed' ? '🗹' : '☐'),
                 React__default["default"].createElement("div", { className: "medplum-request-group-task-details" },
                     React__default["default"].createElement("div", { className: "medplum-request-group-task-title" }, action.title),
+                    action.description && React__default["default"].createElement("div", null, action.description),
                     React__default["default"].createElement("div", null,
                         "Last edited by\u00A0",
                         React__default["default"].createElement(ResourceName, { value: (_e = task === null || task === void 0 ? void 0 : task.meta) === null || _e === void 0 ? void 0 : _e.author }),
@@ -6193,7 +6150,6 @@
     exports.addLastMonthFilter = addLastMonthFilter;
     exports.addMissingFilter = addMissingFilter;
     exports.addNextMonthFilter = addNextMonthFilter;
-    exports.addQuestionnaireInitialValues = addQuestionnaireInitialValues;
     exports.addThisMonthFilter = addThisMonthFilter;
     exports.addTodayFilter = addTodayFilter;
     exports.addTomorrowFilter = addTomorrowFilter;