Skip to content

LG-8711: Do not eagerly reset foundAddress onSearch #7701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allthesignals merged 5 commits into from
Jan 26, 2023
Merged

LG-8711: Do not eagerly reset foundAddress onSearch #7701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6afb851
changelog: Bug Fixes, In-Person Proofing, Do not eagerly reset foundA…
allthesignals Jan 25, 2023
9a86674
Hide previous results when loading new locations
allthesignals Jan 25, 2023
c911963
Add test case for bug
allthesignals Jan 26, 2023
3cb4620
Merge branch 'main' into wmg/8711-search-twice-bug
allthesignals Jan 26, 2023
fc1e1e1
Move test to dedicated test spec
allthesignals Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/javascript/packages/document-capture/components/address-search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,15 @@ interface AddressSearchProps {
registerField?: RegisterFieldCallback;
onFoundAddress?: (address: LocationQuery | null) => void;
onFoundLocations?: (locations: FormattedLocation[] | null | undefined) => void;
onLoadingLocations?: (isLoading: boolean) => void;
onError?: (error: Error | null) => void;
}

function AddressSearch({
registerField = () => undefined,
onFoundAddress = () => undefined,
onFoundLocations = () => undefined,
onLoadingLocations = () => undefined,
onError = () => undefined,
}: AddressSearchProps) {
const { t } = useI18n();
Expand All @@ -189,6 +191,7 @@ function AddressSearch({

useEffect(() => {
spinnerButtonRef.current?.toggleSpinner(isLoading);
onLoadingLocations(isLoading);
}, [isLoading]);

useEffect(() => {
Expand All @@ -204,7 +207,6 @@ function AddressSearch({
const handleSearch = useCallback(
(event) => {
onError(null);
onFoundAddress(null);
onSearch(event, textInput);
},
[textInput],
Expand Down
20 changes: 20 additions & 0 deletions .../packages/document-capture/components/in-person-location-post-office-search-step.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,25 @@ describe('InPersonLocationStep', () => {
});
expect(results).not.to.exist();
});

it('clicking search again after first results do not clear results', async () => {
const { findByText, findByLabelText } = render(
<InPersonContext.Provider value={{ arcgisSearchEnabled: true }}>
<InPersonLocationPostOfficeSearchStep {...DEFAULT_PROPS} />
</InPersonContext.Provider>,
);

await userEvent.type(
await findByLabelText('in_person_proofing.body.location.po_search.address_search_label'),
'800 main',
);
await userEvent.click(
await findByText('in_person_proofing.body.location.po_search.search_button'),
);
await userEvent.click(
await findByText('in_person_proofing.body.location.po_search.search_button'),
);
await findByText('in_person_proofing.body.location.po_search.results_description');
});
});
});
4 changes: 3 additions & 1 deletion ...cript/packages/document-capture/components/in-person-location-post-office-search-step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import InPersonLocations, { FormattedLocation } from './in-person-locations';
function InPersonLocationPostOfficeSearchStep({ onChange, toPreviousStep, registerField }) {
const { t } = useI18n();
const [inProgress, setInProgress] = useState(false);
const [isLoadingLocations, setLoadingLocations] = useState(false);
const [autoSubmit, setAutoSubmit] = useState(false);
const { setSubmitEventMetadata } = useContext(AnalyticsContext);
const [locationResults, setLocationResults] = useState<FormattedLocation[] | null | undefined>(
Expand Down Expand Up @@ -89,9 +90,10 @@ function InPersonLocationPostOfficeSearchStep({ onChange, toPreviousStep, regist
registerField={registerField}
onFoundAddress={setFoundAddress}
onFoundLocations={setLocationResults}
onLoadingLocations={setLoadingLocations}
onError={setUspsError}
/>
{locationResults && foundAddress && (
{locationResults && foundAddress && !isLoadingLocations && (
Copy link
Copy Markdown
Contributor Author

@allthesignals allthesignals Jan 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a sign that <InPersonLocations/> needs to be rendered from within <AddressSearch/>? Then we can remove so much context from this component and only require a callback for handleLocationSelect...

<InPersonLocations
locations={locationResults}
onSelect={handleLocationSelect}
Expand Down