-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(TripPlanner): tagged itineraries + feedback form (#1879)
* refactor(TripPlanController): remove extra inputs For the remaining wheelchair accessibility checkbox, make it initially selected. * refactor(OpenTripPlanner): stop merging accessible+inaccessible Because requests without `wheelchair: true` do not compute the accessibilityScore, remove the (misleading, inaccurate) "Might not be accessible" icon from the result. * feat(OTP.Parser): improved error handling * deps(mix): add open_trip_planner_client * refactor: use OpenTripPlannerClient - deprecate `TripPlan.Api` behaviour and the modules using it (`TripPlan.Api.MockPlanner` and `TripPlan.Api.OpenTripPlanner`) in favor of using the client (`OpenTripPlannerClient` and its behaviour `OpenTripPlannerClient.Behaviour`). - remove `TripPlan.plan/4` function * deps(mix): install Mox * feat(OpenTripPlannerClient.Mock): add test stub * deps(mix): add ex_machina and faker * feat(Test.Support.Factory): trip plan data generation * feat: request itinerary tags * feat: render itinerary tags * refactor: one tag per itinerary * feat(TripPlan.Query): different tags for arrive/depart * fixup: one tag per itinerary * feat(TripPlan.Query): add new MostDirect tag * fix: preserve selected modes and wheelchair options * cleanup: remove unused component * feat(FeedbackForm): new component * chore: stop server-rendering TripPlannerResults * chore(TripPlan.Query): remove unused argument * feat(TripPlanView): add trip_plan_metadata/1 * pass trip plan metadata to frontend * feat(TripPlan.Feedback): submit response to backend
- Loading branch information
1 parent
db3b6c0
commit 9332225
Showing
74 changed files
with
2,600 additions
and
2,851 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| import { uniqueId } from "lodash"; | ||
| import React, { | ||
| ChangeEvent, | ||
| ReactElement, | ||
| useEffect, | ||
| useRef, | ||
| useState | ||
| } from "react"; | ||
| import renderFa from "../helpers/render-fa"; | ||
|
|
||
| interface VoteButtonProps { | ||
| upOrDown: "up" | "down"; | ||
| ariaLabel: string; | ||
| onPress: Function; | ||
| isActive?: boolean; | ||
| } | ||
| const VoteButton = ({ | ||
| upOrDown, | ||
| ariaLabel, | ||
| onPress, | ||
| isActive = false | ||
| }: VoteButtonProps): ReactElement<HTMLButtonElement> => { | ||
| return ( | ||
| <button | ||
| type="button" | ||
| className="btn btn-sm btn-link" | ||
| aria-pressed={isActive} | ||
| aria-label={ariaLabel} | ||
| onClick={() => onPress()} | ||
| > | ||
| {renderFa( | ||
| "", | ||
| `fa-${isActive ? "solid" : "regular"} fa-thumbs-${upOrDown}`, | ||
| true | ||
| )} | ||
| </button> | ||
| ); | ||
| }; | ||
|
|
||
| const sendFormData = ( | ||
| formEl: HTMLFormElement | null, | ||
| callback: Function | ||
| ): void => { | ||
| if (!formEl) return; | ||
| const formData = new FormData(formEl); | ||
| const formJson = Object.fromEntries(formData.entries()); | ||
| callback(formJson); | ||
| }; | ||
|
|
||
| interface FeedbackFormProps { | ||
| promptText: string; | ||
| upLabel: string; | ||
| downLabel: string; | ||
| commentPromptText: string; | ||
| commentLabel: string; | ||
| commentPlaceholder: string; | ||
| formDataCallback: (formData: Record<string, string>) => void; | ||
| } | ||
| /** | ||
| * A compact form featuring upvote/downvote button, optional comment submission, | ||
| * and invocation of a callback function on submit | ||
| */ | ||
| const FeedbackForm = ({ | ||
| promptText, | ||
| upLabel, | ||
| downLabel, | ||
| commentPromptText, | ||
| commentLabel, | ||
| commentPlaceholder, | ||
| formDataCallback | ||
| }: FeedbackFormProps): ReactElement<HTMLElement> => { | ||
| const [showComment, setShowComment] = useState(false); | ||
| const [showConfirmation, setShowConfirmation] = useState(false); | ||
| const [vote, setVote] = useState<"up" | "down" | null>(null); | ||
| const [hasComment, setHasComment] = useState(false); | ||
|
|
||
| const upVote = (): void => { | ||
| setVote(v => (v === "up" ? null : "up")); | ||
| setShowComment(false); | ||
| }; | ||
| const downVote = (): void => setVote(v => (v === "down" ? null : "down")); | ||
| const showCommentPrompt = vote === "down"; | ||
| const toggleComment = (): void => { | ||
| setShowComment(show => !show); | ||
| }; | ||
| const handleTextAreaChange = ( | ||
| event: ChangeEvent<HTMLTextAreaElement> | ||
| ): void => { | ||
| const { | ||
| target: { value } | ||
| } = event; | ||
| setHasComment(!!value && value !== ""); | ||
| }; | ||
|
|
||
| const formRef = useRef<HTMLFormElement>(null); | ||
|
|
||
| useEffect(() => { | ||
| sendFormData(formRef.current, formDataCallback); | ||
| }, [vote, formDataCallback]); | ||
|
|
||
| if (showConfirmation) | ||
| return ( | ||
| <p> | ||
| Your feedback has been submitted. Thanks for helping us improve the | ||
| website! | ||
| </p> | ||
| ); | ||
|
|
||
| const commentId = uniqueId(); | ||
| return ( | ||
| <form | ||
| ref={formRef} | ||
| aria-label="feedback" | ||
| method="post" | ||
| onSubmit={(event: React.SyntheticEvent<HTMLFormElement>) => { | ||
| event.preventDefault(); | ||
| sendFormData(event.currentTarget, formDataCallback); | ||
| setShowComment(false); | ||
| setShowConfirmation(true); | ||
| }} | ||
| > | ||
| <div className="d-inline me-8"> | ||
| {vote === null ? promptText : "Thanks for your response!"} | ||
| </div> | ||
| <div className="btn-group"> | ||
| <input type="hidden" name="feedback_vote" value={vote || ""} /> | ||
| <VoteButton | ||
| ariaLabel={upLabel} | ||
| upOrDown="up" | ||
| onPress={upVote} | ||
| isActive={vote === "up"} | ||
| /> | ||
| <VoteButton | ||
| ariaLabel={downLabel} | ||
| upOrDown="down" | ||
| onPress={downVote} | ||
| isActive={vote === "down"} | ||
| /> | ||
| </div> | ||
| <span aria-live="assertive"> | ||
| {showCommentPrompt && ( | ||
| <button | ||
| type="button" | ||
| className="btn btn-sm btn-link" | ||
| style={{ border: 0, paddingInline: "0rem" }} | ||
| aria-controls={commentId} | ||
| aria-expanded={showComment} | ||
| aria-pressed={showComment} | ||
| onClick={toggleComment} | ||
| > | ||
| {commentPromptText} | ||
| </button> | ||
| )} | ||
| </span> | ||
| {showComment && ( | ||
| <div id={commentId} className="mt-05"> | ||
| <div className="form-group"> | ||
| <label className="w-100"> | ||
| <strong>{commentLabel}</strong> | ||
| <textarea | ||
| name="feedback_long" | ||
| className="form-control" | ||
| rows={2} | ||
| maxLength={1000} | ||
| placeholder={commentPlaceholder} | ||
| onChange={handleTextAreaChange} | ||
| /> | ||
| </label> | ||
| </div> | ||
| <button | ||
| className="btn btn-sm btn-primary" | ||
| type="submit" | ||
| disabled={!hasComment} | ||
| > | ||
| Submit | ||
| </button> | ||
| <button | ||
| className="btn btn-sm btn-link" | ||
| type="button" | ||
| onClick={() => setShowComment(false)} | ||
| > | ||
| Cancel | ||
| </button> | ||
| </div> | ||
| )} | ||
| </form> | ||
| ); | ||
| }; | ||
|
|
||
| export default FeedbackForm; |
Oops, something went wrong.