MOB-1346: advanced search screen by sepeterson · Pull Request #3939 · inaturalist/iNaturalistReactNative

sepeterson · 2026-08-13T14:32:53Z

I'll follow up with tests in a second PR. This one's long enough

As it is, you can't really tell you've got an advanced search applied on the results screen but that will change in https://linear.app/inaturalist/issue/MOB-1348/advanced-search-mode

semanticdiff-com · 2026-08-13T14:32:59Z

Review changes with

Changed Files

File	Status
src/components/Explore/ExploreV2/helpers/universalSearchSubject.ts	59% smaller
src/components/Explore/ExploreV2/components/ExploreV2Header.tsx	27% smaller
src/providers/ExploreV2Context.tsx	5% smaller
src/components/Explore/ExploreV2/screens/AdvancedSearch.tsx	3% smaller
src/components/Explore/ExploreV2/helpers/advancedSearchOptions.ts	0% smaller
src/components/Explore/ExploreV2/helpers/advancedSearchReducer.ts	0% smaller
src/components/Explore/ExploreV2/helpers/filtersToApiParams.ts	0% smaller
src/components/Explore/ExploreV2/helpers/locationLabel.ts	0% smaller
tests/unit/components/Explore/ExploreV2/helpers/filtersToApiParams.test.js	0% smaller
tests/unit/components/Explore/ExploreV2/helpers/universalSearchSubject.test.js	0% smaller

…g, except unknown

sepeterson · 2026-08-13T20:57:50Z

+
+// `label` / `text` are the two lines of each row in the sort sheet; `labelCaps`
+// is the single-line, all-caps version in the dropdown button
+export const getSortByValues = ( t: TFunction ) => ( {


This file is mostly copied from ExploreV1's FilterModal.tsx

sepeterson · 2026-08-13T21:03:46Z

+
+  const { state: v2State, dispatch: dispatchV2 } = useExploreV2();
+  const [initialDraft] = useState( ( ) => draftFromV2State( v2State ) );
+  const [draft, dispatch] = useReducer( advancedSearchReducer, initialDraft );


Like UniversalSearch, this screen holds a draft of future state locally and only commits it to the context when the user applies the search

sepeterson · 2026-08-13T22:12:09Z

+    case "SET_USER":
+      return {
+        ...withFilters( draft, { user: action.user, excludeUser: null } ),
+        subject: withoutSubjectOfType( draft, "user", "unobserved" ),


Lines like this only exist to translate an initial ExploreV2State set in UniversalSearch with a non-taxon subject. Not the most elegant part of this PR

Alright, I think I have understood why that is here now. Not the biggest fan of this. Thinking back I believe that was one of the reasons of the Explore V1 context to not split out any "substate" like a subject and just dump everything into a giant reducer.
It did have it's own problems it seems now: comparing V1 to your V2 reducer I can see a lo of drift in V1, meaning some of the action.keys are not even used anymore by any dispatch. So, maybe it was harder keeping track of what to pass in.
Anyway, not asking you to change anything here. Happy to move these things forward and just see where we end up with V2 once everything is tied up and we have tested the UI state for selecting and de-selecting several combinations of subject and subject-like-but-only-a-filter params.

Doesn't the comment of "only taxon is a subject" mean that when calling SET_PROJECT we also need to remove a potential user subject, and here we need to remove a project subject?
Or could we just remove the subject all together in initializing the Advanced Search?

jtklein

Only a few minor requested changes inline.

The bigger review: I have also taken some time to compare ExploreContext to the new advancedSearchReducer plus ExploreV2Context. From what I can see most funcionality has been ported successfully. One thing to point out though:

V2 has no snapshoting and discarding back to.
When building Explore V1 the ask from product was that after pressing the “Accept” buttons in Advanced filters the results ideally should not need to load visibly but are already fetched in the background. That’s why all that apparatus with makeSnapshot, differsFromSnapshot, isNotInitialState, discardChanges exists. So, contrary to V2 where you make a draft and commit on “Accept” which means we will see a loading state when coming back. V1 was only closing the filters modal on “Accept” to the results screen with already loaded results. Which then in turn necessitated the machinery to make a snapshot of the state before entering the FilterModal, so that on "Discard" we can revert back to said snapshot. There is a trade-off between results delay and number of API calls made which was decided in the past by product. I haven't looked at all ExploreV2 tickets, so I am not sure if this change now is a decided change to be made. Anyways, I am not opposed to this way, the state flow is a lot easier to comprehend. So, if we prefer this way I am fine with it. If that has not come up yet in discussion with Product, we should at least keep them informed about the change.

When setting a place, we used to store place_guess as well. Do you think this is fully taken care of with place.display_name?

Very grateful for your mapping of realm objects to plain JS objects.

Unrelated to this code, but can we rename
buildExploreV2QueryParams
viewerId to currentUserId

jtklein · 2026-08-14T10:46:19Z

+        months: null,
+      } );
+    case "SET_DATE_OBSERVED_RANGE":
+      return withFilters( draft, {


This used to have a isValidDateFormat check before settig to state. Is that something we can drop or have replaced with something else somewhere?
Also some other actions had that, I'll leave some Comments.

jtklein · 2026-08-14T10:47:04Z

+        dateObserved: DATE_OBSERVED.ALL, observed_on: null, d1: null, d2: null, months: null,
+      } );
+    case "SET_DATE_OBSERVED_EXACT":
+      return withFilters( draft, {


isValidDateFormat

jtklein · 2026-08-14T10:47:42Z

+      } );
+    case "SET_DATE_OBSERVED_ALL":
+      return withFilters( draft, {
+        dateObserved: DATE_OBSERVED.ALL, observed_on: null, d1: null, d2: null, months: null,


Please add newlines

jtklein · 2026-08-14T10:50:03Z

+      } );
+    case "SET_DATE_UPLOADED_ALL":
+      return withFilters( draft, {
+        dateUploaded: DATE_UPLOADED.ALL, created_on: null, created_d1: null, created_d2: null,


jtklein · 2026-08-14T10:50:24Z

+        months: action.months,
+      } );
+    case "SET_DATE_UPLOADED_ALL":
+      return withFilters( draft, {


isValidDateFormat

jtklein · 2026-08-16T12:15:33Z

+    <TopAndBottomInsetViewWrapper testID="AdvancedSearch">
+      <SearchHeader
+        headerText={t( "ADVANCED-SEARCH" )}
+        onClose={() => navigation.goBack()}


Haven't looked at the V2 tickets too closely. But comparing this to V1 don't we also want to copy over the WarningSheet? Meaning, if a user selects a bunch of filters here, but presses the back arrow instead of the SEARCH button we'd need to warn that all those filters will not be applied this way.

jtklein · 2026-08-16T12:20:15Z

+                const selectedTaxon = iconicTaxa
+                  ?.filtered( "name ==[c] $0", taxonName );
+                const iconicTaxon = selectedTaxon && selectedTaxon.length > 0
+                  ? Taxon.mapRealmToPojo( selectedTaxon[0] )


jtklein · 2026-08-16T12:22:14Z

+  const navigation
+    = useNavigation<ExploreStackScreenProps<"AdvancedSearch">["navigation"]>();
+  const { t } = useTranslation();
+  const iconicTaxa = useIconicTaxa();


jtklein · 2026-08-16T12:29:47Z

+    ? subject.project
+    : null;
+  const displayProject = project || subjectProject;
+  const displayUserCountText = displayUser?.observations_count === undefined


That seems like defensive overkill to me. If we don't have a user we wouldn't have to display the text. A user from the API should have an observations_count.

jtklein · 2026-08-16T13:11:43Z

+          </View>
+        </View>
+      </ScrollView>
+      <ButtonBar>


UI for this is not correct: there is no drop shadow and there is too much space at the bottom.
For a fix, I think you could copy the ButtonBar styling from the UniversalSearch screen, right?

sepeterson added 13 commits August 3, 2026 22:15

MOB-1346: state updates

34b1cb4

MOB-1346: no permissions request in ExploreV2 location search

31081e2

MOB-1346: not by me in context

0be516d

MOB-1346: advanced search subsection UI

f763af3

MOB-1346: header in AdvancedSearch

97018db

MOB-1346: subcomponent tests

2f7e41e

MOB-1346: advanced search ui

9d77efd

merge main

8e1bda1

MOB-1346: search button is gray until changes are applied

09109e9

MOB-1346: seed advanced search from plain context

2b2adb7

MOB-1346: support map area advanced search

ddce5d7

MOB-1346: support initial project and unobserved

efc3cca

Merge branch 'main' into mob-1346-screen

edf1dc5

sepeterson added 2 commits August 13, 2026 14:27

MOB-1346: switch iconic taxa to rely on general taxon subject handlin…

733908f

…g, except unknown

MOB-1346: share some sharable logic

b0a5974

sepeterson commented Aug 13, 2026

View reviewed changes

MOB-1346: tests fixed

9bd213d

sepeterson marked this pull request as ready for review August 13, 2026 22:15

Merge branch 'main' into mob-1346-screen

a9048d8

jtklein requested changes Aug 17, 2026

View reviewed changes

Uh oh!

Conversation

sepeterson commented Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

semanticdiff-com Bot commented Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sepeterson Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jtklein Aug 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jtklein Aug 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jtklein left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sepeterson commented Aug 13, 2026 •

edited

Loading

semanticdiff-com Bot commented Aug 13, 2026 •

edited

Loading

sepeterson Aug 13, 2026 •

edited

Loading

jtklein Aug 16, 2026 •

edited

Loading

jtklein Aug 16, 2026 •

edited

Loading