@tellescope/react-components 1.233.0 → 1.233.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellescope/react-components",
-  "version": "1.233.0",
+  "version": "1.233.1",
   "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.233.0",
-    "@tellescope/sdk": "1.233.0",
-    "@tellescope/types-client": "1.233.0",
-    "@tellescope/types-models": "1.233.0",
-    "@tellescope/types-utilities": "1.233.0",
-    "@tellescope/utilities": "1.233.0",
-    "@tellescope/validation": "1.233.0",
+    "@tellescope/constants": "1.233.1",
+    "@tellescope/sdk": "1.233.1",
+    "@tellescope/types-client": "1.233.1",
+    "@tellescope/types-models": "1.233.1",
+    "@tellescope/types-utilities": "1.233.1",
+    "@tellescope/utilities": "1.233.1",
+    "@tellescope/validation": "1.233.1",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "css-to-react-native": "^3.0.0",
@@ -83,7 +83,7 @@
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-native": "^0.65.0 || ^0.66.0 || ^0.67.0 || ^0.68.0 || ^0.71.0"
   },
-  "gitHead": "2821652c6e475f2135aa6abdd7d7bb37f95f0fb0",
+  "gitHead": "455d8a11af50f3d67892e2eb90fb1d29162e2fea",
   "publishConfig": {
     "access": "public"
   }

package/src/Forms/inputs.tsx

@@ -3771,29 +3771,37 @@ export const RedirectInput = ({ enduserId, groupId, groupInsance, rootResponseId
     eId = new URL(window.location.href).searchParams.get('eId') || enduserId || enduser?.id || ''
   } catch(err) {}
 
+  // Helper function to find the first answered intake field response
+  // This handles cases where duplicate intake fields exist across conditional branches
+  const findAnsweredIntakeField = (intakeField: string) => {
+    return responses?.find(r => r.intakeField === intakeField && r.answer?.value)?.answer?.value
+  }
+
   const email = (
-    responses?.find(r => r.intakeField === 'email')?.answer?.value
-  || enduser?.email 
+    findAnsweredIntakeField('email')
+  || enduser?.email
   || session.userInfo.email
   )
   const phone = (
-    responses?.find(r => r.intakeField === 'phone')?.answer?.value
+    findAnsweredIntakeField('phone')
   || enduser?.phone
   || session.userInfo.phone
   )
   const fname = (
-    responses?.find(r => r.intakeField === 'fname')?.answer?.value
+    findAnsweredIntakeField('fname')
   || enduser?.fname
   || session.userInfo?.fname
   )
   const lname = (
-    responses?.find(r => r.intakeField === 'lname')?.answer?.value
+    findAnsweredIntakeField('lname')
   || enduser?.lname
   || session.userInfo?.lname
   )
   const state = (
-     responses?.find(r => r.intakeField === 'state')?.answer?.value
-  || (responses?.find(r => r.intakeField === 'Address')?.answer?.value as any)?.state
+     findAnsweredIntakeField('state')
+  // Handle Address field - find first Address with an actual state value
+  // (in case of multiple address questions where some are blank)
+  || (responses?.find(r => r.intakeField === 'Address' && r.answer?.type === 'Address' && r.answer?.value?.state)?.answer?.value as Address)?.state
   || enduser?.state
   || (session.userInfo as Enduser)?.state
   )

package/src/Forms/inputs.v2.tsx

@@ -5,14 +5,14 @@ import { FormInputProps } from "./types"
 import { useDropzone } from "react-dropzone"
 import { CANVAS_TITLE, EMOTII_TITLE, INSURANCE_RELATIONSHIPS, INSURANCE_RELATIONSHIPS_CANVAS, PRIMARY_HEX, RELATIONSHIP_TYPES, TELLESCOPE_GENDERS } from "@tellescope/constants"
 import { MM_DD_YYYY_to_YYYY_MM_DD, capture_is_supported, downloadFile, emit_gtm_event, first_letter_capitalized, form_response_value_to_string, getLocalTimezone, getPublicFileURL, mm_dd_yyyy, replace_enduser_template_values, responses_satisfy_conditions, truncate_string, update_local_storage, user_display_name } from "@tellescope/utilities"
-import { Address, DatabaseSelectResponse, Enduser, EnduserRelationship, FormResponseValue, InsuranceRelationship, MedicationResponse, MultipleChoiceOptions, TellescopeGender, TIMEZONES_USA } from "@tellescope/types-models"
+import { Enduser, EnduserRelationship, FormResponseValue, InsuranceRelationship, MedicationResponse, MultipleChoiceOptions, TellescopeGender, TIMEZONES_USA } from "@tellescope/types-models"
 import { VALID_STATES, emailValidator, phoneValidator } from "@tellescope/validation"
 import Slider from '@mui/material/Slider';
 import LinearProgress from '@mui/material/LinearProgress';
 
 import DatePicker from "react-datepicker";
 import { datepickerCSS } from "./css/react-datepicker" // avoids build issue with RN
-import { CancelIcon, FileBlob, IconButton, LabeledIconButton, LoadingButton, Styled, form_display_text_for_language, isDateString, useProducts, useResolvedSession } from ".."
+import { CancelIcon, FileBlob, IconButton, LabeledIconButton, LoadingButton, Styled, form_display_text_for_language, isDateString, useResolvedSession } from ".."
 import { CalendarEvent, DatabaseRecord, FormField } from "@tellescope/types-client"
 import { css } from '@emotion/css'
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
@@ -2919,122 +2919,8 @@ export const HeightInput = ({ field, value={} as any, onChange, ...props }: Form
   </Grid>
 )
 
-export const include_current_url_parameters_if_templated = (url: string ) => {
-  try {
-    // get parameters from the current URL, and replace all values where {{URL_PARAM.paramName}} is used
-    const params = new URL(window.location.href).searchParams
-    return url.replace(/{{URL_PARAM\.(.*?)}}/g, (_, paramName) => {
-      const value = params.get(paramName)
-      console.log(paramName, value)
-      if (value === null) return ''
-      return value
-    })
-
-  } catch(err) {
-    console.error(err)
-  }
-  return url
-}
-
-export const RedirectInput = ({ enduserId, groupId, groupInsance, rootResponseId, formResponseId, field, submit, value={} as any, onChange, responses, enduser, ...props }: FormInputProps<'Redirect'>) => {
-  const session = useResolvedSession()
-
-  let eId = ''
-  try {
-    eId = new URL(window.location.href).searchParams.get('eId') || enduserId || enduser?.id || ''
-  } catch(err) {}
-
-  const email = (
-    responses?.find(r => r.intakeField === 'email')?.answer?.value
-  || enduser?.email 
-  || session.userInfo.email
-  )
-  const phone = (
-    responses?.find(r => r.intakeField === 'phone')?.answer?.value
-  || enduser?.phone
-  || session.userInfo.phone
-  )
-  const fname = (
-    responses?.find(r => r.intakeField === 'fname')?.answer?.value
-  || enduser?.fname
-  || session.userInfo?.fname
-  )
-  const lname = (
-    responses?.find(r => r.intakeField === 'lname')?.answer?.value
-  || enduser?.lname
-  || session.userInfo?.lname
-  )
-  const state = (
-     responses?.find(r => r.intakeField === 'state')?.answer?.value
-  || (responses?.find(r => r.intakeField === 'Address')?.answer?.value as any)?.state
-  || enduser?.state
-  || (session.userInfo as Enduser)?.state
-  )
-
-  useEffect(() => {
-    if (session.type === 'user') { return }
-
-    if (field.options?.redirectExternalUrl) { 
-      submit?.() 
-      .finally(() => {
-        if (!field.options?.redirectExternalUrl) { return }
-
-        window.location.href = (
-          include_current_url_parameters_if_templated(
-            replace_enduser_template_values(
-              field.options.redirectExternalUrl, 
-              {
-                ...session.userInfo as any,
-                id: eId, email, fname, lname, state, phone, 
-              }
-            )
-          )  
-        )
-      })
-      .catch(console.error)
-      
-      return 
-    }
-
-    if (!field.options?.redirectFormId) { return }
-
-    session.api.form_responses.prepare_form_response({
-      enduserId: session.userInfo.id || eId,
-      formId: field.options.redirectFormId,
-      rootResponseId: rootResponseId || formResponseId,
-      parentResponseId: formResponseId,
-    })
-    .then(({ fullURL }) => (
-      // we should still redirect even if submission fails
-      submit?.() 
-      .catch(console.error)
-      .finally(() => {
-        // if accessing form group in portal
-        if (window.location.href.includes('/documents') && groupId && groupInsance) {
-          const toRedirect = `${window.location.origin}/documents?groupId=${groupId}&groupInstance=${groupInsance}`
-          if (fullURL.endsWith('&')) {
-            window.location.replace(fullURL + `back=${toRedirect}&`)
-          } else {
-            window.location.replace(fullURL + `&back=${toRedirect}`) 
-          }
-        } else {
-          window.location.replace(fullURL)
-        }
-      })
-    ))
-    .catch(console.error)
-  }, [session, email, fname, lname, state, phone])
-
-  if (session.type === 'user') {
-    return (
-      <Typography>
-        Redirect is for patient-facing forms only
-      </Typography>
-    )
-  }
-
-  return null
-}
+// Re-export from V1 to follow DRY principles
+export { RedirectInput } from './inputs'
 
 export const HiddenValueInput = ({ goToNextField, goToPreviousField, field, value, onChange, isSinglePage, groupFields }: FormInputProps<'email'>) => {
   let lastRef = useRef(0)