Map search bug fixes #3516

dubdabasoduba · 2024-09-23T12:06:51Z

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #3517
Fixes #3518

Engineer Checklist

I have written Unit tests for any new feature(s) and edge cases for bug fixes
I have added any strings visible on UI components to the strings.xml file
I have updated the CHANGELOG.md file for any notable changes to the codebase
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

I have verified Unit tests have been written for any new feature(s) and edge cases
I have verified any strings visible on UI components are in the strings.xml file
I have verifed the CHANGELOG.md file has any notable changes to the codebase
I have verified the solution has been implemented in a configurable and generic way for reuseable components
I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

- Updating the behaviour after clearing search bar on the maps

codecov · 2024-09-23T12:39:39Z

Codecov Report

Attention: Patch coverage is 0% with 11 lines in your changes missing coverage. Please review.

Project coverage is 27.2%. Comparing base (6014982) to head (41fecd7).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
...er/fhircore/engine/data/local/DefaultRepository.kt	0.0%	10 Missing ⚠️
...rcore/quest/ui/main/components/TopScreenSection.kt	0.0%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              main   #3516     +/-   ##
=========================================
- Coverage     27.2%   27.2%   -0.1%     
  Complexity     756     756             
=========================================
  Files          278     278             
  Lines        14239   14240      +1     
  Branches      2582    2583      +1     
=========================================
  Hits          3883    3883             
- Misses        9818    9819      +1     
  Partials       538     538

Flag	Coverage Δ
engine	`63.7% <0.0%> (-0.1%)`	⬇️
geowidget	`15.4% <ø> (ø)`
quest	`5.6% <0.0%> (+<0.1%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
...rcore/quest/ui/main/components/TopScreenSection.kt	`0.0% <0.0%> (ø)`
...er/fhircore/engine/data/local/DefaultRepository.kt	`59.4% <0.0%> (-0.3%)`	⬇️

…nfinite_scroll_page

ndegwamartin · 2024-09-30T14:09:15Z

@dubdabasoduba do we need a unit test for this?

ndegwamartin · 2024-09-30T14:16:21Z

.../quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt

-                  onClick = {
-                    onSearchTextChanged(SearchQuery.emptyText, performSearchOnValueChanged)
-                  },
+                  onClick = { onSearchTextChanged(SearchQuery.emptyText, true) },


Might it be better to fix it by passing the value true from the line here?

Or even consider removing it entirely since the value true is the default.

@ndegwamartin We want to automatically disable search on text change for the map but enable it for the registers. This disables it for the map.

We however want to refresh the map view every time we clear data for both the register and map views hence the true. If we use performSearchOnValueChanged this is updated to false on the link you shared earlier.

ndegwamartin · 2024-09-30T14:18:11Z

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt

-            )
+          val maxSublistIndex = min(toIndex, searchResults.size)
+
+          if (fromIndex < maxSublistIndex) {


We can add an edge case unit test for when we only have one item in the searchResults (if there's none already)

…nfinite_scroll_page

…/fhircore into feature/fix_infinite_scroll_page

…nfinite_scroll_page

…/fhircore into feature/fix_infinite_scroll_page

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

…/fhircore into feature/fix_infinite_scroll_page

Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke>

* Add date service to rules engine facts map (#3519) * Add summary mode (#3500) Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor PDF config properties in QuestionnaireConfig (#3498) * Refactor to use PdfConfig Initially using QuestionnaireConfig for simplicity. * Process multi QRs in HtmlPopulator * Add new tag to check if Questionnaire has been submitted * Remove subjectType since subjectReference is used * Fix test and spotless * Address review * spotless * Cleanup * spotless * Fix test --------- Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix error validation highlighting not working when submit button is clicked bug (#3525) * Change progress bar color to blue (#3428) * update in-progress color on the map view. (#3529) Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add medication sort custom search param (#3534) * Add medication sort custom search param * Run spotlessApply * Fix failing time based test * Pld docs adjustment (#3540) * sync typo * correct heading title * update header definition for p2p * upgrade packages * Update Geowidget to only show the Set Location dialog if no Locations to sync by have been selected (#3526) * Don't show no results dialogue on map when locations selected on multiselect. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix failing tests. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add Exit Dialog (#3487) * Add exit dialog * Fix a typo * Show Dialog only when Map or Register is visible * PR feedback changes * Fix failing check * Remove incorrect test * Refactor dialog condition logic --------- Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Refactor working with bitmap images Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add the EUSM Burundi flavour and Rename the existing EUSM flavour (#3548) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * Configure submit anyway button (#3535) * Update the Burundi EUSM flavor (#3553) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * - Update the flavor naming - Update the documentation * - Update the flavors section of the documentation to clarify on the naming convention * Bum p up data capture version (#3547) * Map search bug fixes (#3516) * - Updating the infinite scroll paging - Updating the behaviour after clearing search bar on the maps * - spotless apply * - Fix breaking tests on geo widget module * - Fix tests * - Run spotless * - Import `LazyPagingItems` * - Adding tests * - Update the APK naming * Ignore test to be refactored later Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * - Run spotless * Update kujaku version. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix loading related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Rkareko <47570855+Rkareko@users.noreply.github.com> Co-authored-by: FikriMilano <fikrimilano1@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke>

* Include listRepositoryResourceDataMap to nested list widgets Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix loading related resources data for List widget Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor loading bitmap images (#3546) * Add date service to rules engine facts map (#3519) * Add summary mode (#3500) Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor PDF config properties in QuestionnaireConfig (#3498) * Refactor to use PdfConfig Initially using QuestionnaireConfig for simplicity. * Process multi QRs in HtmlPopulator * Add new tag to check if Questionnaire has been submitted * Remove subjectType since subjectReference is used * Fix test and spotless * Address review * spotless * Cleanup * spotless * Fix test --------- Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix error validation highlighting not working when submit button is clicked bug (#3525) * Change progress bar color to blue (#3428) * update in-progress color on the map view. (#3529) Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add medication sort custom search param (#3534) * Add medication sort custom search param * Run spotlessApply * Fix failing time based test * Pld docs adjustment (#3540) * sync typo * correct heading title * update header definition for p2p * upgrade packages * Update Geowidget to only show the Set Location dialog if no Locations to sync by have been selected (#3526) * Don't show no results dialogue on map when locations selected on multiselect. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix failing tests. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add Exit Dialog (#3487) * Add exit dialog * Fix a typo * Show Dialog only when Map or Register is visible * PR feedback changes * Fix failing check * Remove incorrect test * Refactor dialog condition logic --------- Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Refactor working with bitmap images Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add the EUSM Burundi flavour and Rename the existing EUSM flavour (#3548) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * Configure submit anyway button (#3535) * Update the Burundi EUSM flavor (#3553) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * - Update the flavor naming - Update the documentation * - Update the flavors section of the documentation to clarify on the naming convention * Bum p up data capture version (#3547) * Map search bug fixes (#3516) * - Updating the infinite scroll paging - Updating the behaviour after clearing search bar on the maps * - spotless apply * - Fix breaking tests on geo widget module * - Fix tests * - Run spotless * - Import `LazyPagingItems` * - Adding tests * - Update the APK naming * Ignore test to be refactored later Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * - Run spotless * Update kujaku version. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix loading related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Rkareko <47570855+Rkareko@users.noreply.github.com> Co-authored-by: FikriMilano <fikrimilano1@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix failing UI tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Interpolate conditionalFhirPathExpressions in listResource (#3538) To pass in evaluated rule variables Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix apply stack tint. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Apply opacity on view properties. (#3564) Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix duplication of List view item Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Rkareko <47570855+Rkareko@users.noreply.github.com> Co-authored-by: FikriMilano <fikrimilano1@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: L≡ZRS <12814349+LZRS@users.noreply.github.com>

- Updating the infinite scroll paging

c54d8ba

- Updating the behaviour after clearing search bar on the maps

dubdabasoduba requested a review from syedowaisali September 23, 2024 12:07

dubdabasoduba self-assigned this Sep 23, 2024

dubdabasoduba added the Bug-fix PR label for bug fix on release notes label Sep 23, 2024

- spotless apply

37a5ec8

dubdabasoduba added 5 commits September 24, 2024 10:21

- Fix breaking tests on geo widget module

0016007

- Fix tests

6d8477a

- Run spotless

552be3f

Merge branch 'main' into feature/fix_infinite_scroll_page

6b034e8

- Import LazyPagingItems

cb48a2d

dubdabasoduba requested a review from ellykits September 26, 2024 04:30

dubdabasoduba added 3 commits September 28, 2024 11:46

Merge branch 'main' of github.com:opensrp/fhircore into feature/fix_i…

2042bc1

…nfinite_scroll_page

Merge branch 'main' into feature/fix_infinite_scroll_page

3db24ca

Merge branch 'main' into feature/fix_infinite_scroll_page

7aac63f

ndegwamartin reviewed Sep 30, 2024

View reviewed changes

Merge branch 'main' into feature/fix_infinite_scroll_page

7d561d5

ellykits previously approved these changes Oct 1, 2024

View reviewed changes

dubdabasoduba added 3 commits October 2, 2024 21:59

- Adding tests

d45e555

Merge branch 'main' of github.com:opensrp/fhircore into feature/fix_i…

23c2a62

…nfinite_scroll_page

Merge branch 'feature/fix_infinite_scroll_page' of github.com:opensrp…

2150606

…/fhircore into feature/fix_infinite_scroll_page

dubdabasoduba dismissed ellykits’s stale review via 2150606 October 7, 2024 20:32

dubdabasoduba and others added 6 commits October 9, 2024 23:20

Merge branch 'main' of github.com:opensrp/fhircore into feature/fix_i…

cfcf8cb

…nfinite_scroll_page

Merge branch 'main' into feature/fix_infinite_scroll_page

eb77da0

- Update the APK naming

53939d1

Merge branch 'feature/fix_infinite_scroll_page' of github.com:opensrp…

d75f98e

…/fhircore into feature/fix_infinite_scroll_page

Ignore test to be refactored later

6a803db

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'feature/fix_infinite_scroll_page' of github.com:opensrp…

8eb4415

…/fhircore into feature/fix_infinite_scroll_page

dubdabasoduba and others added 2 commits October 14, 2024 15:02

- Run spotless

9c9533a

Update kujaku version.

41fecd7

Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke>

dubdabasoduba merged commit 156451c into main Oct 14, 2024
4 of 5 checks passed

dubdabasoduba deleted the feature/fix_infinite_scroll_page branch October 14, 2024 12:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Map search bug fixes #3516

Map search bug fixes #3516

dubdabasoduba commented Sep 23, 2024 •

edited

Loading

codecov bot commented Sep 23, 2024 •

edited

Loading

ndegwamartin commented Sep 30, 2024

ndegwamartin Sep 30, 2024 •

edited

Loading

dubdabasoduba Sep 30, 2024

ndegwamartin Sep 30, 2024

Map search bug fixes #3516

Map search bug fixes #3516

Conversation

dubdabasoduba commented Sep 23, 2024 • edited Loading

codecov bot commented Sep 23, 2024 • edited Loading

Codecov Report

ndegwamartin commented Sep 30, 2024

ndegwamartin Sep 30, 2024 • edited Loading

Choose a reason for hiding this comment

dubdabasoduba Sep 30, 2024

Choose a reason for hiding this comment

ndegwamartin Sep 30, 2024

Choose a reason for hiding this comment

dubdabasoduba commented Sep 23, 2024 •

edited

Loading

codecov bot commented Sep 23, 2024 •

edited

Loading

ndegwamartin Sep 30, 2024 •

edited

Loading