@tellescope/react-components 1.154.0 → 1.155.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellescope/react-components",
-  "version": "1.154.0",
+  "version": "1.155.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.154.0",
-    "@tellescope/sdk": "^1.154.0",
-    "@tellescope/types-client": "^1.154.0",
-    "@tellescope/types-models": "^1.154.0",
-    "@tellescope/types-utilities": "^1.154.0",
-    "@tellescope/utilities": "^1.154.0",
-    "@tellescope/validation": "^1.154.0",
+    "@tellescope/constants": "^1.155.0",
+    "@tellescope/sdk": "^1.155.0",
+    "@tellescope/types-client": "^1.155.0",
+    "@tellescope/types-models": "^1.155.0",
+    "@tellescope/types-utilities": "^1.155.0",
+    "@tellescope/utilities": "^1.155.0",
+    "@tellescope/validation": "^1.155.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": "d96f27c5787398546a644b88fe6ad75208836bad",
+  "gitHead": "be943fbead3f47347ebff8ddc8f3e21c789490a4",
   "publishConfig": {
     "access": "public"
   }

package/src/Forms/forms.tsx

@@ -254,7 +254,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 groupId={groupId} groupInsance={groupInstance} submit={submit} field={field} value={value.answer.value as any} onChange={onFieldChange as ChangeHandler<any>} form={form} />
+          <Redirect 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} />
@@ -601,7 +601,7 @@ export const TellescopeSingleQuestionFlow: typeof TellescopeForm = ({
 }
 
 export const DEFAULT_THANKS_MESSAGE = "Your response was successfully recorded";
-const ThanksMessage = ({ 
+export const ThanksMessage = ({ 
   thanksMessage, 
   htmlThanksMessage,
   showRestartAtEnd,

package/src/Forms/hooks.tsx

@@ -99,6 +99,9 @@ export const default_label_for_compound_logic = (f: CompoundFilter<string>): str
         const value = f.condition[key]
         if (value && typeof value === 'object') {
           const objectKey = Object.keys(value)[0]
+          if (objectKey === '$ne') {
+            return `${key} Does Not Equal ${value[objectKey as keyof typeof value]}`
+          }
           if (objectKey === '$gt') {
             return `${key} Greater Than ${value[objectKey as keyof typeof value]}`
           }

package/src/Forms/inputs.tsx

@@ -2735,7 +2735,7 @@ export const HeightInput = ({ field, value={} as any, onChange, ...props }: Form
   </Grid>
 )
 
-export const RedirectInput = ({ groupId, groupInsance, formResponseId, field, submit, value={} as any, onChange, ...props }: FormInputProps<'Redirect'>) => {
+export const RedirectInput = ({ groupId, groupInsance, formResponseId, field, submit, value={} as any, onChange, responses, enduser, ...props }: FormInputProps<'Redirect'>) => {
   const session = useResolvedSession()
 
   let eId = ''
@@ -2743,6 +2743,33 @@ export const RedirectInput = ({ groupId, groupInsance, formResponseId, field, su
     eId = new URL(window.location.href).searchParams.get('eId') || ''
   } 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 }
 
@@ -2751,7 +2778,15 @@ export const RedirectInput = ({ groupId, groupInsance, formResponseId, field, su
       .finally(() => {
         if (!field.options?.redirectExternalUrl) { return }
 
-        window.location.href = replace_enduser_template_values(field.options.redirectExternalUrl, session.userInfo as any)
+        window.location.href = (
+          replace_enduser_template_values(
+            field.options.redirectExternalUrl, 
+            {
+              ...session.userInfo as any,
+              email, fname, lname, state, phone, 
+            }
+          )
+        )
       })
       .catch(console.error)
       
@@ -2785,7 +2820,7 @@ export const RedirectInput = ({ groupId, groupInsance, formResponseId, field, su
       })
     ))
     .catch(console.error)
-  }, [session])
+  }, [session, email, fname, lname, state, phone])
 
   if (session.type === 'user') {
     return (