chore: forward-ports the last two PRs

cypress/integration/SearchPage.feature

@@ -228,3 +228,12 @@ Feature: User interacts with Search page
     When you select Child Programme
     And you are in the search page with the Child Programme being preselected from the url
     And and you can see the unique identifier input
+
+  Scenario: Fallback search navigates back to main page
+    Given you are in the search page with the Child Programme and org unit being preselected from the url
+    And you expand the attributes search area
+    When you fill in the first and last name with values that will return results
+    And you click search
+    And you click the fallback search button
+    When you click the back button
+    Then you should be taken to the main page with org unit preselected

cypress/integration/SearchPage/index.js

@@ -345,3 +345,17 @@ When('and you can see the unique identifier input', () => {
         .find('[data-test="capture-ui-input"]')
         .should('exist');
 });
+
+Given('you are in the search page with the Child Programme and org unit being preselected from the url', () => {
+    cy.visit('/#/search?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8');
+});
+
+When('you click the back button', () => {
+    cy.get('[data-test="dhis2-capture-back-button"]')
+        .click();
+});
+
+Then('you should be taken to the main page with org unit preselected', () => {
+    cy.url()
+        .should('eq', `${Cypress.config().baseUrl}/#/?orgUnitId=DiszpKrYNg8`);
+});

src/core_modules/capture-core/components/Pages/Search/SearchForm/SearchForm.epics.js

@@ -59,6 +59,14 @@ const getFiltersForAttributesSearchQuery = (formValues) => {
 
     return [...stringFilters, ...rangeFilers];
 };
+
+const handleErrors = ({ httpStatusCode, message }) => {
+    if (httpStatusCode === 409 && message === 'maxteicountreached') {
+        return of(showTooManyResultsViewOnSearchPage());
+    }
+    return of(showErrorViewOnSearchPage());
+};
+
 const searchViaAttributesStream = (queryArgs, attributes, triggeredFrom) =>
     from(getTrackedEntityInstances(queryArgs, attributes)).pipe(
         map(({ trackedEntityInstanceContainers: searchResults, pagingData }) => {
@@ -79,12 +87,7 @@ const searchViaAttributesStream = (queryArgs, attributes, triggeredFrom) =>
             return showEmptyResultsViewOnSearchPage();
         }),
         startWith(showLoadingViewOnSearchPage()),
-        catchError(({ httpStatusCode, message }) => {
-            if (httpStatusCode === 409 && message === 'maxteicountreached') {
-                return of(showTooManyResultsViewOnSearchPage());
-            }
-            return of(showErrorViewOnSearchPage());
-        }),
+        catchError(handleErrors),
     );
 
 export const searchViaUniqueIdOnScopeProgramEpic: Epic = (action$, store) =>
@@ -259,7 +262,7 @@ export const fallbackSearchEpic: Epic = (action$: InputObservable) =>
                     return of(showEmptyResultsViewOnSearchPage());
                 }),
                 startWith(showLoadingViewOnSearchPage()),
-                catchError(() => of(showErrorViewOnSearchPage())),
+                catchError(handleErrors),
             );
         }),
     );

src/core_modules/capture-core/reducers/descriptions/currentSelections.reducerDescriptionGetter.js

@@ -208,6 +208,7 @@ export const getCurrentSelectionsReducerDesc = (appUpdaters: Updaters) => create
     [searchPageActionTypes.FALLBACK_SEARCH_COMPLETED]:
       (state, { payload: { trackedEntityTypeId } }) => ({
           ...state,
+          complete: false,
           programId: undefined,
           categories: undefined,
           categoriesMeta: undefined,
@@ -219,6 +220,7 @@ export const getCurrentSelectionsReducerDesc = (appUpdaters: Updaters) => create
         programId: undefined,
         categories: undefined,
         categoriesMeta: undefined,
+        complete: false,
         trackedEntityTypeId,
     }),
 }, 'currentSelections', {