@tellescope/react-components 1.166.0 → 1.167.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellescope/react-components",
-  "version": "1.166.0",
+  "version": "1.167.0",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -47,13 +47,13 @@
     "@reduxjs/toolkit": "^1.6.2",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^1.52.1",
-    "@tellescope/constants": "^1.166.0",
-    "@tellescope/sdk": "^1.166.0",
-    "@tellescope/types-client": "^1.166.0",
-    "@tellescope/types-models": "^1.166.0",
-    "@tellescope/types-utilities": "^1.166.0",
-    "@tellescope/utilities": "^1.166.0",
-    "@tellescope/validation": "^1.166.0",
+    "@tellescope/constants": "^1.167.0",
+    "@tellescope/sdk": "^1.167.0",
+    "@tellescope/types-client": "^1.167.0",
+    "@tellescope/types-models": "^1.167.0",
+    "@tellescope/types-utilities": "^1.167.0",
+    "@tellescope/utilities": "^1.167.0",
+    "@tellescope/validation": "^1.167.0",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "css-to-react-native": "^3.0.0",
@@ -80,7 +80,7 @@
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-native": "^0.65.0 || ^0.66.0 || ^0.67.0 || ^0.68.0 || ^0.71.0"
   },
-  "gitHead": "55104c6078f2a5d223bcb98aebbb0cc036214b43",
+  "gitHead": "c38c1cdd092cc5a0881c68117d88e98b83daed8e",
   "publishConfig": {
     "access": "public"
   }

package/src/Forms/forms.tsx

@@ -266,7 +266,7 @@ export const QuestionForField = ({
           <Height field={field} disabled={value.disabled} value={value.answer.value as any} onChange={onFieldChange as ChangeHandler<any>} form={form} />
         )
         : field.type === 'Redirect' ? (
-          <Redirect rootResponseId={rootResponseId} formResponseId={formResponseId} responses={responses} enduser={enduser} groupId={groupId} groupInsance={groupInstance} submit={submit} field={field} value={value.answer.value as any} onChange={onFieldChange as ChangeHandler<any>} form={form} />
+          <Redirect enduserId={enduserId} rootResponseId={rootResponseId} formResponseId={formResponseId} responses={responses} enduser={enduser} groupId={groupId} groupInsance={groupInstance} submit={submit} field={field} value={value.answer.value as any} onChange={onFieldChange as ChangeHandler<any>} form={form} />
         )
         : field.type === 'Related Contacts' ? (
           <RelatedContacts field={field} value={value.answer.value as any} onChange={onFieldChange as ChangeHandler<any>} form={form} />

package/src/Forms/inputs.tsx

@@ -2177,68 +2177,18 @@ export const CanvasMedicationsInput = ({ field, value=[], onChange }: FormInputP
           </Grid>
 
           <Grid item>
-          <Grid container alignItems="center" wrap="nowrap" columnGap={0.5} justifyContent={"space-between"}>
-            <Grid item sx={{ width: '50%', mr: 1 }}>
-              <TextField type="number" InputProps={{ sx: defaultInputProps.sx }} fullWidth size="small" 
-                label="Units (e.g. capsule, table, puff) per dose?"
-                value={medication.dosage?.quantity || ''} 
-                onChange={e => (
-                  onChange((value || []).map((v, _i) => 
-                    i === _i 
-                      ? { ...v, dosage: { ...v.dosage!, quantity: e.target.value  } } 
-                      : v
-                    ), 
-                    field.id
-                  )
-                )} />
-            </Grid>
-
-            <Grid item sx={{ width: '30%' }}>
-              <StringSelector size="small" label="How many times?"
-                options={["1", "2", "3", "4", "5", "6", "As Needed"]} 
-                value={medication.dosage?.frequency ?? ''}
-                onChange={async (frequency) => {
-                  onChange(
-                    (value ?? []).map((_v, _i) => (
-                      i === _i
-                        ? { 
-                          ..._v, 
-                          dosage: {
-                            ..._v.dosage!,
-                            frequency: frequency || ''
-                          }
-                        }
-                        : _v
-                    )),
-                    field.id,
-                  )
-                }}
-              />
-            </Grid>
-
-            <Grid item sx={{ width: '20%' }}>
-              <StringSelector options={['Day', 'Week', 'Month', "Year"]} size="small" label="Per"
-                value={medication.dosage?.frequencyDescriptor || 'Day'}
-                onChange={frequencyDescriptor => (
-                  onChange((value || []).map((v, _i) => 
-                    i === _i 
-                      ? { ...v, dosage: { ...v.dosage!, frequencyDescriptor } } 
-                      : v
-                    ), 
-                    field.id
-                  )
-                )}
-                getDisplayValue={first_letter_capitalized}
-              />
-            </Grid>
-          </Grid>
-          </Grid>
-
-          <Grid item>
-            <TextField InputProps={{ sx: defaultInputProps.sx }} fullWidth size="small" label="Reason for taking medication"
-              value={medication.reasonForTaking || ''} 
-              onChange={e => onChange((value || []).map((v, _i) => i === _i ? { ...v, reasonForTaking: e.target.value } : v), field.id)}
-            />
+            <TextField InputProps={{ sx: defaultInputProps.sx }} fullWidth size="small" 
+              label="Medication instructions: how much you take, how often, and when"
+              value={medication.dosage?.description || ''} 
+              onChange={e => (
+                onChange((value || []).map((v, _i) => 
+                  i === _i 
+                    ? { ...v, dosage: { ...v.dosage!, description: e.target.value  } } 
+                    : v
+                  ), 
+                  field.id
+                )
+              )} />
           </Grid>
 
           <Grid item>
@@ -2983,14 +2933,12 @@ export const HeightInput = ({ field, value={} as any, onChange, ...props }: Form
 )
 
 export const RedirectInput = ({ enduserId, groupId, groupInsance, rootResponseId, formResponseId, field, submit, value={} as any, onChange, responses, enduser, ...props }: FormInputProps<'Redirect'>) => {
-  console.log('formResponseId', formResponseId, 'rootResponseId', rootResponseId)
   const session = useResolvedSession()
 
   let eId = ''
   try {
-    eId = new URL(window.location.href).searchParams.get('eId') || enduserId || ''
+    eId = new URL(window.location.href).searchParams.get('eId') || enduserId || enduser?.id || ''
   } catch(err) {}
-  console.log(eId)
 
   const email = (
     responses?.find(r => r.intakeField === 'email')?.answer?.value
@@ -3084,9 +3032,11 @@ export const RedirectInput = ({ enduserId, groupId, groupInsance, rootResponseId
 
 export const HiddenValueInput = ({ goToNextField, goToPreviousField, field, value, onChange, form, isSinglePage, }: FormInputProps<'email'>) => {
   let lastRef = useRef(0)
+  let lastIdRef = useRef('')
   useEffect(() => {
-    if (lastRef.current > Date.now() - 1000) return
+    if (lastRef.current > Date.now() - 1000 && lastIdRef.current === field.id) return
     lastRef.current = Date.now()
+    lastIdRef.current = field.id
 
     if (value) {
       if (isSinglePage) return