@@ -2,6 +2,7 @@ import React from 'react';
22import FileUploadComponent from '../../components/FileUploadComponent' ;
33import { getCurrentFeedbackForm } from '../flow-context-utils' ;
44import { createOptionalFieldValidator , processOptionalInput } from '../optional-field-utils' ;
5+ import { validateEmail , isValidEmail } from '../validation-utils' ;
56
67/**
78 * Creates the feedback conversation flow
@@ -31,13 +32,32 @@ export const createFeedbackFlow = ({
3132 return {
3233 feedback : {
3334 message : "We appreciate your feedback about ACCESS.\n\nFeedback submitted through this form will only be shared within the ACCESS teams. We encourage the sharing of contact information for potential follow-up, but understand that anonymity may be preferred when providing feedback on sensitive issues.\n\nPlease provide your detailed feedback:" ,
34- function : ( chatState ) => setFeedbackForm ( { ...( feedbackForm || { } ) , feedback : chatState . userInput } ) ,
35+ function : ( chatState ) => {
36+ // Clear any previous feedback form state to start fresh
37+ setFeedbackForm ( {
38+ feedback : chatState . userInput ,
39+ // Explicitly clear all other fields to prevent state persistence
40+ recommendations : undefined ,
41+ primaryRole : undefined ,
42+ needsCustomRole : false ,
43+ customRole : undefined ,
44+ communityInterest : undefined ,
45+ upload : undefined ,
46+ uploadConfirmed : false ,
47+ uploadedFiles : undefined ,
48+ wantsContact : undefined ,
49+ useCustomContactInfo : false ,
50+ customName : undefined ,
51+ customEmail : undefined ,
52+ customAccessId : undefined
53+ } ) ;
54+ } ,
3555 path : "feedback_please_tell_us_more"
3656 } ,
3757 feedback_please_tell_us_more : {
3858 message : "Please detail any recommendations for improvement:" ,
3959 function : ( chatState ) => setFeedbackForm ( { ...( feedbackForm || { } ) , recommendations : chatState . userInput } ) ,
40- path : "feedback_primary_role "
60+ path : "feedback_upload "
4161 } ,
4262 feedback_primary_role : {
4363 message : "What is your primary role pertaining to ACCESS?" ,
@@ -60,7 +80,7 @@ export const createFeedbackFlow = ({
6080 }
6181 } ,
6282 path : ( chatState ) => {
63- return chatState . userInput === "Other" ? "feedback_custom_role" : "feedback_community_interest " ;
83+ return chatState . userInput === "Other" ? "feedback_custom_role" : "feedback_contact_choice " ;
6484 }
6585 } ,
6686 feedback_custom_role : {
@@ -69,7 +89,7 @@ export const createFeedbackFlow = ({
6989 const currentForm = getCurrentFeedbackForm ( ) ;
7090 setFeedbackForm ( { ...currentForm , customRole : chatState . userInput } ) ;
7191 } ,
72- path : "feedback_community_interest "
92+ path : "feedback_contact_choice "
7393 } ,
7494 feedback_community_interest : {
7595 message : "Are you interested, or potentially interested, in serving the ACCESS community and helping us improve in any of these roles? (This is not a commitment. We'll reach out with more information.) Select all that apply:" ,
@@ -91,7 +111,7 @@ export const createFeedbackFlow = ({
91111 const currentForm = getCurrentFeedbackForm ( ) ;
92112 setFeedbackForm ( { ...currentForm , communityInterest : chatState . userInput } ) ;
93113 } ,
94- path : "feedback_upload "
114+ path : "feedback_summary "
95115 } ,
96116 feedback_upload : {
97117 message : "Would you like to upload a screenshot or file to help us better understand your feedback?" ,
@@ -102,7 +122,7 @@ export const createFeedbackFlow = ({
102122 if ( chatState . userInput === "Yes" ) {
103123 return "feedback_upload_yes" ;
104124 } else {
105- return "feedback_contact_choice " ;
125+ return "feedback_primary_role " ;
106126 }
107127 }
108128 } ,
@@ -112,7 +132,7 @@ export const createFeedbackFlow = ({
112132 options : [ "Continue" ] ,
113133 chatDisabled : true ,
114134 function : ( chatState ) => setFeedbackForm ( { ...( feedbackForm || { } ) , uploadConfirmed : true } ) ,
115- path : "feedback_contact_choice "
135+ path : "feedback_primary_role "
116136 } ,
117137 feedback_contact_choice : {
118138 message : "Would you like to provide your contact information for follow up?" ,
@@ -134,8 +154,14 @@ export const createFeedbackFlow = ({
134154 return "feedback_contact_confirm" ;
135155 }
136156 // Otherwise collect missing info - set flag to use custom info
157+ // Use the updatedForm from the function above to preserve wantsContact
137158 const currentForm = getCurrentFeedbackForm ( ) ;
138- setFeedbackForm ( { ...currentForm , useCustomContactInfo : true } ) ;
159+ const wantsContact = chatState . userInput === "Include my contact info" ;
160+ setFeedbackForm ( {
161+ ...currentForm ,
162+ useCustomContactInfo : true ,
163+ wantsContact : wantsContact ? "Yes" : "No"
164+ } ) ;
139165 if ( ! userInfo . name ) return "feedback_name" ;
140166 if ( ! userInfo . email ) return "feedback_email" ;
141167 if ( ! userInfo . username ) return "feedback_accessid" ;
@@ -163,7 +189,7 @@ export const createFeedbackFlow = ({
163189 } ,
164190 path : ( chatState ) => {
165191 if ( chatState . userInput === "Use this information" ) {
166- return "feedback_summary " ;
192+ return "feedback_community_interest " ;
167193 } else {
168194 return "feedback_name" ;
169195 }
@@ -179,6 +205,7 @@ export const createFeedbackFlow = ({
179205 } ,
180206 feedback_email : {
181207 message : "What is your email address?" ,
208+ validateTextInput : ( email ) => validateEmail ( email ) ,
182209 function : ( chatState ) => {
183210 const currentForm = getCurrentFeedbackForm ( ) ;
184211 setFeedbackForm ( { ...currentForm , customEmail : chatState . userInput } ) ;
@@ -192,7 +219,7 @@ export const createFeedbackFlow = ({
192219 const currentForm = getCurrentFeedbackForm ( ) ;
193220 setFeedbackForm ( { ...currentForm , customAccessId : processOptionalInput ( chatState . userInput ) } ) ;
194221 } ,
195- path : "feedback_summary "
222+ path : "feedback_community_interest "
196223 } ,
197224 feedback_summary : {
198225 message : ( chatState ) => {
@@ -229,7 +256,7 @@ export const createFeedbackFlow = ({
229256 `ACCESS ID: ${ finalAccessId } +
230257 '' ;
231258 } else {
232- contactInfo = `Contact Information: Not provided \n` ;
259+ contactInfo = `Contact Information: Anonymous submission \n` ;
233260 }
234261
235262 // Format primary role
@@ -238,20 +265,30 @@ export const createFeedbackFlow = ({
238265 primaryRole = `Other: ${ currentForm . customRole } ;
239266 }
240267
241- // Format community interest
242- let communityInterest = 'Not provided' ;
243- if ( currentForm . communityInterest && Array . isArray ( currentForm . communityInterest ) ) {
244- communityInterest = currentForm . communityInterest . join ( ', ' ) ;
245- } else if ( currentForm . communityInterest ) {
246- communityInterest = currentForm . communityInterest ;
268+ // Format community interest - handle timing issue like ACCESS ID (only for non-anonymous)
269+ let communityInterestLine = '' ;
270+ if ( currentForm . wantsContact === "Yes" ) {
271+ let communityInterest = 'Not provided' ;
272+
273+ // If coming directly from community interest step, use chatState.userInput
274+ if ( chatState . prevPath === 'feedback_community_interest' ) {
275+ communityInterest = chatState . userInput || 'Not provided' ;
276+ } else if ( currentForm . communityInterest && Array . isArray ( currentForm . communityInterest ) ) {
277+ communityInterest = currentForm . communityInterest . join ( ', ' ) ;
278+ } else if ( currentForm . communityInterest ) {
279+ communityInterest = currentForm . communityInterest ;
280+ }
281+
282+ communityInterestLine = `Community Interest: ${ communityInterest } ;
247283 }
248284
249285 return `Thank you for providing your feedback. Here's a summary:\n\n` +
250286 contactInfo +
251287 `Feedback: ${ currentForm . feedback || 'Not provided' } +
252288 `Recommendations: ${ currentForm . recommendations || 'Not provided' } +
253289 `Primary Role: ${ primaryRole } +
254- `Community Interest: ${ communityInterest } ${ fileInfo } +
290+ communityInterestLine +
291+ `${ fileInfo } +
255292 `Would you like to submit this feedback?` ;
256293 } ,
257294 options : [ "Submit Feedback" , "Back to Main Menu" ] ,
@@ -265,7 +302,27 @@ export const createFeedbackFlow = ({
265302 }
266303 } ,
267304 feedback_success : {
268- message : "Thank you for your feedback! If you provided your contact information, we will follow up with you shortly." ,
305+ message : ( ) => {
306+ const currentForm = getCurrentFeedbackForm ( ) ;
307+ const baseMessage = "Thank you for your feedback!" ;
308+
309+ // Determine if they provided a valid email (using same logic as summary)
310+ let finalEmail ;
311+ if ( currentForm . wantsContact === "No" ) {
312+ finalEmail = null ;
313+ } else if ( currentForm . useCustomContactInfo ) {
314+ finalEmail = currentForm . customEmail ;
315+ } else {
316+ finalEmail = userInfo . email ;
317+ }
318+
319+ // Only add follow-up message if they provided a valid email
320+ if ( finalEmail && finalEmail . trim ( ) && isValidEmail ( finalEmail ) ) {
321+ return `${ baseMessage } ;
322+ }
323+
324+ return baseMessage ;
325+ } ,
269326 options : [ "Back to Main Menu" ] ,
270327 chatDisabled : true ,
271328 path : "start"
0 commit comments