From 2c5196f9a273e6a617df33b58b64e9e3cb0b1a2d Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Fri, 10 May 2024 10:46:15 +0100
Subject: [PATCH 01/63] Catch missing SQLLocation

---
 corehq/apps/app_manager/util.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/util.py b/corehq/apps/app_manager/util.py
index 5d3c7e63daab..36c80ba31a79 100644
--- a/corehq/apps/app_manager/util.py
+++ b/corehq/apps/app_manager/util.py
@@ -672,7 +672,11 @@ def get_latest_app_release_by_location(domain, location_id, app_id):
     Child location's setting takes precedence over parent
     """
     from corehq.apps.app_manager.models import AppReleaseByLocation
-    location = SQLLocation.active_objects.get(location_id=location_id)
+
+    try:
+        location = SQLLocation.active_objects.get(location_id=location_id)
+    except SQLLocation.DoesNotExist:
+        return None
     location_and_ancestor_ids = location.get_ancestors(include_self=True).values_list(
         'location_id', flat=True).reverse()
     # get all active enabled releases and order by version desc to get one with the highest version in the end

From c84f1a25b378fe05ad6fa29b0b457c0cb2d796ae Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Fri, 10 May 2024 14:56:23 -0400
Subject: [PATCH 02/63] override query class instead of using custom `run`

This should hopefully make the profiling code a bit less obtrusive
It also means the ancestor queries will be profiled now too
---
 corehq/apps/case_search/utils.py              | 78 +++++++++----------
 .../xpath_functions/ancestor_functions.py     |  6 +-
 .../xpath_functions/subcase_functions.py      |  8 +-
 3 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/corehq/apps/case_search/utils.py b/corehq/apps/case_search/utils.py
index 595adf202f45..8a0a97e072c1 100644
--- a/corehq/apps/case_search/utils.py
+++ b/corehq/apps/case_search/utils.py
@@ -65,36 +65,32 @@ class CaseSearchProfiler:
     queries: list = field(default_factory=list)
     _query_number: int = 0
 
-    def run_query(self, slug, es_query):
-        self._query_number += 1
-        if self.debug_mode:
-            es_query = es_query.enable_profiling()
-
-        tc = self.timing_context(f'run query #{self._query_number}: {slug}')
-        timer = tc.peek()
-        with tc:
-            results = es_query.run()
-
-        if self.debug_mode:
-            self.queries.append({
-                'slug': slug,
-                'query_number': self._query_number,
-                'query': es_query.raw_query,
-                'duration': timer.duration,
-                'profile_url': self._get_profile_url(slug, self._query_number, results.raw.get('profile')),
-            })
-        return results
-
-    def add_query(self, slug, es_query):
-        self._query_number += 1
-        if self.debug_mode:
-            self.queries.append({
-                'slug': slug,
-                'query_number': self._query_number,
-                'query': es_query.raw_query,
-                'duration': None,
-                'profile_url': None,
-            })
+    def get_case_search_class(self, slug=None):
+        profiler = self
+
+        class ProfiledCaseSearchES(CaseSearchES):
+            def run(self):
+                profiler._query_number += 1
+                if profiler.debug_mode:
+                    self.es_query['profile'] = True
+
+                tc = profiler.timing_context(f'run query #{profiler._query_number}: {slug}')
+                timer = tc.peek()
+                with tc:
+                    results = super().run()
+
+                if profiler.debug_mode:
+                    profiler.queries.append({
+                        'slug': slug,
+                        'query_number': profiler._query_number,
+                        'query': self.raw_query,
+                        'duration': timer.duration,
+                        'profile_url': profiler._get_profile_url(
+                            slug, profiler._query_number, results.raw.get('profile')),
+                    })
+                return results
+
+        return ProfiledCaseSearchES
 
     @staticmethod
     def _get_profile_url(slug, query_number, profile_json):
@@ -171,7 +167,7 @@ def get_primary_case_search_results(helper, case_types, criteria, commcare_sort=
         notify_exception(None, str(e), details={'exception_type': type(e)})
         raise CaseSearchUserError(str(e))
 
-    results = helper.profiler.run_query('main', search_es)
+    results = search_es.run()
     with helper.profiler.timing_context('wrap_cases'):
         cases = [helper.wrap_case(hit, include_score=True) for hit in results.raw_hits]
     return cases
@@ -195,7 +191,9 @@ def __init__(self, domain):
         self.domain = domain
         self.profiler = CaseSearchProfiler()
 
-    def get_base_queryset(self):
+    def get_base_queryset(self, slug=None):
+        # slug is only informational, used for profiling
+        CaseSearchES = self.profiler.get_case_search_class(slug)
         return CaseSearchES(index=self.config.index_name or None).domain(self.domain)
 
     def wrap_case(self, es_hit, include_score=False):
@@ -222,7 +220,8 @@ def __init__(self, domain, couch_user, registry_helper):
         self._couch_user = couch_user
         self._registry_helper = registry_helper
 
-    def get_base_queryset(self):
+    def get_base_queryset(self, slug=None):
+        CaseSearchES = self.profiler.get_case_search_class(slug)
         return CaseSearchES().domain(self._registry_helper.visible_domains)
 
     def wrap_case(self, es_hit, include_score=False):
@@ -256,7 +255,7 @@ def _get_initial_search_es(self):
         max_results = CASE_SEARCH_MAX_RESULTS
         if toggles.INCREASED_MAX_SEARCH_RESULTS.enabled(self.request_domain):
             max_results = 1500
-        return (self.helper.get_base_queryset()
+        return (self.helper.get_base_queryset('main')
                 .case_type(self.case_types)
                 .is_closed(False)
                 .size(max_results))
@@ -522,12 +521,10 @@ def get_child_case_types(app):
 
 @time_function()
 def get_child_case_results(helper, parent_case_ids, child_case_types=None):
-    query = helper.get_base_queryset().get_child_cases(parent_case_ids, "parent")
+    query = helper.get_base_queryset('get_child_case_results').get_child_cases(parent_case_ids, "parent")
     if child_case_types:
         query = query.case_type(child_case_types)
-
-    results = helper.profiler.run_query('get_child_case_results', query)
-    return [helper.wrap_case(result) for result in results.hits]
+    return [helper.wrap_case(result) for result in query.run().hits]
 
 
 @time_function()
@@ -541,9 +538,8 @@ def get_expanded_case_results(helper, custom_related_case_property, cases):
 
 @time_function()
 def _get_case_search_cases(helper, case_ids):
-    query = helper.get_base_queryset().case_ids(case_ids)
-    results = helper.profiler.run_query('_get_case_search_cases', query)
-    return [helper.wrap_case(result) for result in results.hits]
+    query = helper.get_base_queryset('_get_case_search_cases').case_ids(case_ids)
+    return [helper.wrap_case(result) for result in query.run().hits]
 
 
 # Warning: '_tag_is_related_case' may cause the relevant user-defined properties to be overwritten.
diff --git a/corehq/apps/case_search/xpath_functions/ancestor_functions.py b/corehq/apps/case_search/xpath_functions/ancestor_functions.py
index 042b3f3fa587..985ed1f7804d 100644
--- a/corehq/apps/case_search/xpath_functions/ancestor_functions.py
+++ b/corehq/apps/case_search/xpath_functions/ancestor_functions.py
@@ -90,8 +90,7 @@ def _is_ancestor_path_expression(node):
 def _child_case_lookup(context, case_ids, identifier):
     """returns a list of all case_ids who have parents `case_id` with the relationship `identifier`
     """
-    es_query = context.helper.get_base_queryset().get_child_cases(case_ids, identifier)
-    context.profiler.add_query('_child_case_lookup', es_query)
+    es_query = context.helper.get_base_queryset('_child_case_lookup').get_child_cases(case_ids, identifier)
     return es_query.get_ids()
 
 
@@ -144,8 +143,7 @@ def _get_case_ids_from_ast_filter(context, filter_node):
     else:
         from corehq.apps.case_search.filter_dsl import build_filter_from_ast
         es_filter = build_filter_from_ast(filter_node, context)
-        es_query = context.helper.get_base_queryset().filter(es_filter)
-        context.profiler.add_query('_get_case_ids_from_ast_filter', es_query)
+        es_query = context.helper.get_base_queryset('_get_case_ids_from_ast_filter').filter(es_filter)
         if es_query.count() > MAX_RELATED_CASES:
             new_query = serialize(filter_node)
             raise TooManyRelatedCasesError(
diff --git a/corehq/apps/case_search/xpath_functions/subcase_functions.py b/corehq/apps/case_search/xpath_functions/subcase_functions.py
index b890a21465cf..b8f94b5bf5f2 100644
--- a/corehq/apps/case_search/xpath_functions/subcase_functions.py
+++ b/corehq/apps/case_search/xpath_functions/subcase_functions.py
@@ -99,8 +99,8 @@ def _run_subcase_query(subcase_query, context):
     else:
         subcase_filter = filters.match_all()
 
-    es_query = (
-        context.helper.get_base_queryset()
+    return (
+        context.helper.get_base_queryset('subcase_query')
         .nested(
             'indices',
             queries.filtered(
@@ -113,11 +113,9 @@ def _run_subcase_query(subcase_query, context):
         )
         .filter(subcase_filter)
         .source(['indices.referenced_id', 'indices.identifier'])
+        .run().hits
     )
 
-    results = context.profiler.run_query('subcase_query', es_query)
-    return results.hits
-
 
 def _parse_normalize_subcase_query(node) -> SubCaseQuery:
     """Parse the subcase query and normalize it to the form 'subcase-count > N' or 'subcase-count = N'

From c93dde89ab694093e076cb0de07f5f5933cc097a Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Fri, 10 May 2024 15:14:59 -0400
Subject: [PATCH 03/63] Move profile processing outside timing context

To avoid messing up the numbers of the actual query
---
 corehq/apps/case_search/utils.py | 15 +--------------
 corehq/apps/case_search/views.py | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/corehq/apps/case_search/utils.py b/corehq/apps/case_search/utils.py
index 8a0a97e072c1..3cdcc6085435 100644
--- a/corehq/apps/case_search/utils.py
+++ b/corehq/apps/case_search/utils.py
@@ -3,7 +3,6 @@
 from collections import defaultdict
 from dataclasses import dataclass, field
 from functools import wraps
-from io import BytesIO
 
 from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
@@ -44,13 +43,11 @@
     reverse_index_case_query,
     wrap_case_search_hit,
 )
-from corehq.apps.hqadmin.utils import get_download_url
 from corehq.apps.registry.exceptions import (
     RegistryAccessException,
     RegistryNotFound,
 )
 from corehq.apps.registry.helper import DataRegistryHelper
-from corehq.util.dates import get_timestamp_for_filename
 from corehq.util.quickcache import quickcache
 from corehq.util.timer import TimingContext
 
@@ -85,22 +82,12 @@ def run(self):
                         'query_number': profiler._query_number,
                         'query': self.raw_query,
                         'duration': timer.duration,
-                        'profile_url': profiler._get_profile_url(
-                            slug, profiler._query_number, results.raw.get('profile')),
+                        'profile_json': results.raw.pop('profile'),
                     })
                 return results
 
         return ProfiledCaseSearchES
 
-    @staticmethod
-    def _get_profile_url(slug, query_number, profile_json):
-        timestamp = get_timestamp_for_filename()
-        name = f'es_profile_{query_number}_{slug}_{timestamp}.json'
-        io = BytesIO()
-        io.write(json.dumps(profile_json).encode('utf-8'))
-        io.seek(0)
-        return get_download_url(io, name, content_type='application/json')
-
 
 def time_function():
     """Decorator to get timing information on a case search function that has `helper` as the first arg"""
diff --git a/corehq/apps/case_search/views.py b/corehq/apps/case_search/views.py
index f27170d9aa12..b0ce5fa60213 100644
--- a/corehq/apps/case_search/views.py
+++ b/corehq/apps/case_search/views.py
@@ -1,18 +1,21 @@
 import json
 import re
+from io import BytesIO
 
 from django.http import Http404
 from django.urls import reverse
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy
 
-from django.utils.decorators import method_decorator
 from dimagi.utils.web import json_response
 
 from corehq.apps.case_search.models import case_search_enabled_for_domain
 from corehq.apps.case_search.utils import get_case_search_results_from_request
 from corehq.apps.domain.decorators import cls_require_superuser_or_contractor
 from corehq.apps.domain.views.base import BaseDomainView
+from corehq.apps.hqadmin.utils import get_download_url
 from corehq.apps.hqwebapp.decorators import use_bootstrap5
+from corehq.util.dates import get_timestamp_for_filename
 from corehq.util.view_utils import BadRequest, json_error
 
 
@@ -115,5 +118,16 @@ def post(self, request, *args, **kwargs):
             'primary_count': profiler.primary_count,
             'related_count': profiler.related_count,
             'timing_data': profiler.timing_context.to_dict(),
-            'queries': profiler.queries,
+            'queries': [self._make_profile_downloadable(q) for q in profiler.queries],
         })
+
+    @staticmethod
+    def _make_profile_downloadable(query):
+        profile_json = query.pop('profile_json')
+        timestamp = get_timestamp_for_filename()
+        name = f"es_profile_{query['query_number']}_{query['slug']}_{timestamp}.json"
+        io = BytesIO()
+        io.write(json.dumps(profile_json).encode('utf-8'))
+        io.seek(0)
+        query['profile_url'] = get_download_url(io, name, content_type='application/json')
+        return query

From b1ee6aaa8436d4b67f779330909e014acfc02f5d Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Tue, 21 May 2024 17:30:24 -0700
Subject: [PATCH 04/63] prefactor: Separate out base Tableau User Form from the
 form specific to editing Web User

---
 corehq/apps/users/forms.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/corehq/apps/users/forms.py b/corehq/apps/users/forms.py
index 88b09e72c135..d942ef1213c4 100644
--- a/corehq/apps/users/forms.py
+++ b/corehq/apps/users/forms.py
@@ -1762,7 +1762,7 @@ def clean(self):
         return data
 
 
-class TableauUserForm(forms.Form):
+class BaseTableauUserForm(forms.Form):
     role = forms.ChoiceField(
         label=gettext_noop("Role"),
         choices=TableauUser.Roles.choices,
@@ -1776,27 +1776,36 @@ class TableauUserForm(forms.Form):
     )
 
     def __init__(self, *args, **kwargs):
-        readonly = kwargs.pop('readonly', True)
-        self.request = kwargs.pop('request')
         self.domain = kwargs.pop('domain', None)
-        self.username = kwargs.pop('username', None)
-        super(TableauUserForm, self).__init__(*args, **kwargs)
+        super(BaseTableauUserForm, self).__init__(*args, **kwargs)
 
         self.allowed_tableau_groups = [
             TableauGroupTuple(group.name, group.id) for group in get_all_tableau_groups(self.domain)
             if group.name in get_allowed_tableau_groups_for_domain(self.domain)]
-        user_group_names = [group.name for group in get_tableau_groups_for_user(self.domain, self.username)]
         self.fields['groups'].choices = []
         self.fields['groups'].initial = []
         for i, group in enumerate(self.allowed_tableau_groups):
             # Add a choice for each tableau group on the server
             self.fields['groups'].choices.append((i, group.name))
-            if group.name in user_group_names:
-                # Pre-choose groups that the user already belongs to
-                self.fields['groups'].initial.append(i)
         if not self.fields['groups'].choices:
             del self.fields['groups']
 
+
+class TableauUserForm(BaseTableauUserForm):
+
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop('request')
+        readonly = kwargs.pop('readonly', True)
+        self.username = kwargs.pop('username', None)
+        super(TableauUserForm, self).__init__(*args, **kwargs)
+
+        if 'groups' in self.fields:
+            user_group_names = [group.name for group in get_tableau_groups_for_user(self.domain, self.username)]
+            for i, group_name in self.fields['groups'].choices:
+                if group_name in user_group_names:
+                    # Pre-choose groups that the user already belongs to
+                    self.fields['groups'].initial.append(i)
+
         if readonly:
             self.fields['role'].widget.attrs['readonly'] = True
             self.fields['groups'].widget.attrs['disabled'] = True

From 9b2ee89216dfa414621be03cfd9b1dee39630484 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Tue, 21 May 2024 17:37:42 -0700
Subject: [PATCH 05/63] bug: save depends on 'groups' field existing. Hide
 field insted of deleting if choices is empty

---
 corehq/apps/users/forms.py                    | 21 ++++++++++++-------
 .../users/templates/users/edit_web_user.html  |  1 -
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/corehq/apps/users/forms.py b/corehq/apps/users/forms.py
index d942ef1213c4..de5f2ab59dee 100644
--- a/corehq/apps/users/forms.py
+++ b/corehq/apps/users/forms.py
@@ -1787,8 +1787,6 @@ def __init__(self, *args, **kwargs):
         for i, group in enumerate(self.allowed_tableau_groups):
             # Add a choice for each tableau group on the server
             self.fields['groups'].choices.append((i, group.name))
-        if not self.fields['groups'].choices:
-            del self.fields['groups']
 
 
 class TableauUserForm(BaseTableauUserForm):
@@ -1799,12 +1797,11 @@ def __init__(self, *args, **kwargs):
         self.username = kwargs.pop('username', None)
         super(TableauUserForm, self).__init__(*args, **kwargs)
 
-        if 'groups' in self.fields:
-            user_group_names = [group.name for group in get_tableau_groups_for_user(self.domain, self.username)]
-            for i, group_name in self.fields['groups'].choices:
-                if group_name in user_group_names:
-                    # Pre-choose groups that the user already belongs to
-                    self.fields['groups'].initial.append(i)
+        user_group_names = [group.name for group in get_tableau_groups_for_user(self.domain, self.username)]
+        for i, group_name in self.fields['groups'].choices:
+            if group_name in user_group_names:
+                # Pre-choose groups that the user already belongs to
+                self.fields['groups'].initial.append(i)
 
         if readonly:
             self.fields['role'].widget.attrs['readonly'] = True
@@ -1819,6 +1816,14 @@ def __init__(self, *args, **kwargs):
         self.helper.label_class = 'col-sm-3 col-md-2'
         self.helper.field_class = 'col-sm-9 col-md-8 col-lg-6'
 
+        self.helper.layout = crispy.Layout(
+            crispy.Fieldset(
+                _('Tableau Configuration'),
+                'role',
+                'groups' if len(self.fields['groups'].choices) > 0 else None
+            )
+        )
+
     def save(self, username, commit=True):
         if not self.request.couch_user.has_permission(self.domain, 'edit_user_tableau_config'):
             raise forms.ValidationError(_("You do not have permission to edit Tableau Configuraion."))
diff --git a/corehq/apps/users/templates/users/edit_web_user.html b/corehq/apps/users/templates/users/edit_web_user.html
index 6123b9cab1b5..ef61c98a1893 100644
--- a/corehq/apps/users/templates/users/edit_web_user.html
+++ b/corehq/apps/users/templates/users/edit_web_user.html
@@ -108,7 +108,6 @@
       {% csrf_token %}
       <input type="hidden" name="form_type" value="tableau" />
       <fieldset>
-        <legend>{% trans 'Tableau Configuration' %}</legend>
         {% crispy tableau_form %}
       </fieldset>
       {% if not request.is_view_only and edit_user_tableau_config%}

From a6732e7d2e206a03fc5e20247a6a8a707ccbdfb3 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Wed, 22 May 2024 17:09:16 -0400
Subject: [PATCH 06/63] Add case search query language docs

Copied and reformatted from here:
https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146611711/Case+Search+Query+Language+CSQL
---
 docs/case_search_query_language.rst | 449 ++++++++++++++++++++++++++++
 docs/index.rst                      |   1 +
 2 files changed, 450 insertions(+)
 create mode 100644 docs/case_search_query_language.rst

diff --git a/docs/case_search_query_language.rst b/docs/case_search_query_language.rst
new file mode 100644
index 000000000000..0e6386dd2507
--- /dev/null
+++ b/docs/case_search_query_language.rst
@@ -0,0 +1,449 @@
+=================================
+Case Search Query Language (CSQL)
+=================================
+
+Underpinning some of the advanced search capabilities of `Case Search`_ and `Case List Explorer`_ is
+the Case Search Query Language. This page describes the syntax and capabilities of the language as
+well as it's limitations.
+
+.. _Case Search: https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146606528
+.. _Case List Explorer: https://dimagi.atlassian.net/wiki/x/KTXKfw
+
+.. contents::
+   :local:
+
+Syntax
+======
+
+* **Available operators**: ``and``, ``or`` , ``=``, ``!=``, ``<``, ``<=``, ``>``, ``>=``, ``(``,
+  ``)``
+* **Brackets**: can be used to group logic and make complex expressions
+* **Dates**: dates can be filtered with format ``YYYY-MM-DD``. This must include the apostrophes
+  around the date. The ``date()`` function may be used to validate a date value:
+  ``date('2021-08-20')``
+
+Examples::
+
+    name = 'john' and age > 10
+
+    region = 'london' and registration_date < '2019-12-01'
+
+    (sex = 'm' and weight < 23) or (sex = 'f' and weight < 20)
+
+    status = 'negative' and subcase-exists('host', @case_type = 'lab_result' and result = 'positive')
+
+
+Supported Functions
+===================
+
+The following functions are supported:
+
+
+``date``
+--------
+
+* **Behavior**: Will convert a string or a number value into an equivalent date. Will throw an error
+  if the format of the string is wrong or an invalid date is passed.
+* **Return**: Returns a date
+* **Arguments**: The value to be converted (either a string in the format ``YYYY-MM-DD`` or a
+  number). Numbers are interpreted as days since Jan 01 1970.
+* **Usage**: ``date(value_to_convert)``
+
+``today``
+---------
+* **Return**:  Returns the current date according in the timezone of the project space.
+* **Arguments**: None
+* **Usage**: ``today()``
+* **Note**: When comparing the output of this function to a value with a date and a time by using
+  the ``=`` operator, this function returns the current date at midnight. For example,
+  ``last_modified=today()`` will look for an exact match between the date and time in
+  ``last_modified`` and the current date exactly at midnight.
+
+``not``
+-------
+* **Behavior**: Invert a boolean search expression
+* **Arguments**: The expression to invert
+* **Usage**: ``not(is_active = 0 and stock_level < 15)``
+
+``starts-with``
+---------------
+* **Behavior**: Match cases where a multi-select case property value begins with the given argument
+  value.
+* **Arguments**:  Two arguments, the multi-select case property and the value to check.
+* **Notes**:
+    * This filter is case sensitive
+    * Using this filter may impact the performance of your query
+* **Usage**:
+    * ``starts-with(social_security_num, "123")``
+    * ``starts-with(timezone, "Africa/")``
+
+``selected``
+------------
+* **Behavior**: Match cases where a multi-select case property contains the given value. The
+  behavior of this function matches that of the ``selected-any`` function.
+* **Return**: True if that particular value is present in the case property.  Otherwise False.
+* **Arguments**:  Two arguments, the multi-select case property and the value to check.
+* **Notes**:
+    * If the 'value to check' contains spaces, each word will be considered independently as in
+      ``select-any``
+    * `See notes on how case properties are segmented <multiselect_>`_
+* **Usage**:
+    * ``selected(tests_performed, "testA")``
+    * ``selected(tests_performed, "testA testB")``
+        * This works the same as the 'selected-any' function. Best practice would be to use
+          ``selected-any`` in this instance to make the intention clear.
+
+``selected-any``
+----------------
+* **Behavior**: Match cases where a multi-select case property contains ANY of the values in the
+  input provided
+* **Arguments**: Two arguments, the multi-select case property and the values to check represented
+  as a space separated string.
+* **Notes**: `See notes on how case properties are segmented <multiselect_>`_
+* **Usage**: ``selected-any(tests_performed, "testA testB testC")``
+
+.. list-table:: Outcomes table for ``selected-any``
+   :header-rows: 1
+
+   * - Search term
+     - Case Property Value
+     - Search Result
+     - Note
+   * - value1
+     - value2 **value1** value3
+     - Match
+     - Property contains all of the search terms
+   * - value1 value2
+     - **value2** value5 **value1** value3
+     - Match
+     - Property contains all of the search terms
+   * - value1 value2
+     - **value1** value3
+     - Match
+     - Property contains at least one of the search terms
+   * - value1 value2
+     - value3 value4
+     - No Match
+     - Property does not contain any of the search terms
+
+``selected-all``
+----------------
+
+* **Behavior**: Match cases where a multi-select case property contains ALL of the values in the
+  input provided
+* **Arguments**: Two arguments, the multi-select case property and the values to check represented
+  as a space separated string.
+* **Notes**:
+    * `See notes on how case properties are segmented <multiselect_>`_
+* **Usage**: ``selected-all(tests_performed, "testA testB testC")``
+
+.. list-table:: Outcomes table for ``selected-all``
+   :header-rows: 1
+
+   * - Search term
+     - Case Property Value
+     - Search Result
+     - Note
+   * - value1
+     - value2 **value1** value3
+     - Match
+     - Property contains all of the search terms
+   * - value1 value2
+     - **value2** value5 **value1** value3
+     - Match
+     - Property contains all of the search terms
+   * - value1 value2
+     - **value1** value3
+     - No match
+     - Property does not contain ALL of the search terms
+
+``within-distance``
+-------------------
+* **Requirements**: GPS case properties set up as described in this page: `Storing GPS Case
+  Properties in Elasticsearch as GeoPoints <geopoints_>`_
+* **Behavior**: Match cases within a certain geographic distance (as the crow flies) of the provided
+  point
+* **Return**: True if that case is within range, otherwise false
+* **Arguments**:
+    * ``property_name``: The GPS case property on the cases being searched
+    * ``coordinates``: This can be the output of a "geopoint" receiver from a geocoder question as
+      described in `Address Geocoding in Web Apps <address_geocoding_>`_
+    * ``distance``: The distance from ``coordinates`` to search
+    * ``unit``: The units for that distance. Options are: miles, yards, feet, inch, kilometers,
+      meters, centimeters, millimeters, nauticalmiles
+* **Usage**: ``within-distance(location, '42.4402967 -71.1453275', 30, 'miles')``
+
+.. _geopoints: https://dimagi.atlassian.net/wiki/x/dgf4fw
+.. _address_geocoding: https://dimagi.atlassian.net/wiki/x/dALKfw
+
+``fuzzy-match``
+---------------
+* **Behavior**: Determines if a given value is a fuzzy match for a given case property. This ignores
+  the `domain-level case search fuzziness settings <fuzziness_settings_>`_.
+* **Return**: True if that particular value matches the case property.  Otherwise False.
+* **Arguments**:  Two arguments: the case property and the value to check.
+* **Usage**: ``fuzzy-match(first_name, "Sara")``
+
+.. note::
+   ``fuzzy-match`` is backed by Elasticsearch's `Fuzzy query`_, which uses `Levenshtein distance`_
+   to gauge similarity. To consider something a match, it requires an exact prefix match and an edit
+   distance based on the length of the string (longer strings can have more edits).
+
+.. _fuzziness_settings: https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146606704/Project+Case+Search+Configuration#Configure-Fuzzy-Properties-(optional)
+.. _Fuzzy Query: https://www.elastic.co/guide/en/elasticsearch/reference/8.11/query-dsl-fuzzy-query.html
+.. _Levenshtein distance: https://en.wikipedia.org/wiki/Levenshtein_distance
+
+``phonetic-match``
+------------------
+* **Behavior**: Match cases if a given value "sounds like" (using `Soundex`_) the value of a given
+  case property. (e.g. "Joolea" will match "Julia")
+* **Return**: True if that particular value matches the case property. Otherwise False.
+* **Arguments**:  Two arguments: the case property and the value to check.
+* **Usage**: ``phonetic-match(first_name, "Julia")``
+
+.. _Soundex: https://en.wikipedia.org/wiki/Soundex#American_Soundex
+
+``match-all``
+-------------
+* **Behavior**: Matches ALL cases
+* **Arguments**: No arguments
+* **Usage**: ``match-all()``
+* **Example**: ``match-all() and first_name = "Julia"``
+    * Matches cases that have a property ``first_name`` equal to ``"Julia"``
+
+``match-none``
+--------------
+* **Behavior**:  Matches no cases at all
+* **Arguments**:  No arguments
+* **Usage**: ``match-none()``
+* **Example**: ``match-none() or first_name = "Julia"``
+    * Matches cases that have a property ``first_name`` equal to ``"Julia"``
+
+
+Filtering on parent (ancestor) cases
+====================================
+
+Searches may be performed against ancestor cases (e.g. parent cases) using the ``/`` operator
+
+.. code-block::
+
+    # search for cases that have a 'parent' case that matches the filter 'age > 55'
+    parent/age > 55
+
+    # successive steps can be added to navigate further up the case hierarchy
+    parent/parent/dod = ''
+
+``ancestor-exists``
+-------------------
+* **Behavior**: Match cases that have an ancestor with the given relation that matches the ancestor
+  filter expression.
+* **Arguments**: Two arguments, the ancestor relationship (usually one of parent or host) and the
+  ancestor filter expression.
+* **Usage**:
+    * ``ancestor-exists(parent/parent, city = 'SF')``
+    * ``ancestor-exists(parent, food_included = 'yes' and ancestor-exists(parent, city!='' and
+      selected(city, 'Boston')))``
+* **Limitation**:
+    * The arguments can't be a standalone function and must be a binary expression
+        * This will *not* work: ``ancestor-exists(parent, selected(city, 'SF'))``
+        * This will work:  ``ancestor-exists(parent, city != '' and selected(city, 'SF'))``
+    * The ancestor filter expression may not include ``subcase-exists`` or ``subcase-count``
+      * **Best Practices**:
+    * Limit multiple uses of this function in your query to avoid performance implications
+    * Add as many arguments to ``ancestor-exists()`` as possible to help narrow down results (i.e.,
+      by ``@case_type`` or ``@status``)
+
+
+Filtering on child cases (subcases)
+===================================
+
+Special functions are provided to support filtering based on the properties of subcases. These are:
+
+``subcase-exists``
+------------------
+* **Behavior**: Match cases that have a subcase with the given relation that matches the subcase
+  filter expression.
+* **Arguments**: Two arguments, the subcase relationship (usually one of 'parent' or 'host') and the
+  subcase filter expression.
+* **Usage**: ``subcase-exists('parent', lab_type = 'blood' and result = 1)``
+* **Best Practices**:
+    * Limit multiple uses of this function in your query to avoid performance implications
+    * Add as many arguments to ``subcase-exists()`` as possible to help narrow down results (i.e.,
+      by ``@case_type`` or ``@status``)
+
+``subcase-count``
+-----------------
+* **Behavior**: Match cases where the number of subcases matches the given expression.
+* **Arguments**: Two arguments, the subcase relationship (usually one of 'parent' or 'host') and the
+  subcase filter expression.
+* **Usage**: ``subcase-count('parent', lab_type = 'blood' and result = 1) > 3``
+    * The count function must be used in conjunction with a comparison operator. All operators are
+      supported (``=``, ``!=``, ``<``, ``<=``, ``>``, ``>=``)
+* **Best Practices**:
+    * Limit multiple uses of this function in your query to avoid performance implications
+
+.. warning::
+    When utilizing the special subcase function, be mindful that the *quantity of search results*
+    and the *number of subcase functions* in a single search are important factors. As the number of
+    subcase functions and search results increases, the time required to perform the search will
+    also increase.
+
+    **Performance testing is required** when using this function in your app.
+        * `Link to performance testing in HQ's case search (not Web Apps) <perf_testing_>`_
+        * `Link to performance testing in HQ's case search (WebApps - BHA) <bha_perf_testing_>`_
+
+    Keep in mind that a higher number of search results will lead to longer execution times for the
+    search query. The threshold is around 400K to 500K search results, after which a timeout error
+    may occur. It is recommended to keep your search results well below this number for optimal
+    performance.
+
+    To manage the number of search results when incorporating subcase functions in your search
+    query, you can apply required fields in the search form. For instance, requiring users to search
+    by both first and last name is more effective than just using the first name. Including more
+    required fields in the search form is likely to reduce the number of search results returned.
+
+    If you have any questions regarding the limitation usage of this subcase function, please reach
+    out to the AE team.
+
+
+.. _perf_testing: https://docs.google.com/spreadsheets/d/1T4tX1tbFaiTBFWpJoi_4p4_UtnRL3_SRoXJgADraXo8/edit#gid=1095465676
+.. _bha_perf_testing: https://docs.google.com/spreadsheets/d/1B9ySwSahf4qUKWEmX0FfdK0uArOBnJ6pXWh7eYvnaiA/edit#gid=671814666
+
+**Examples**
+
+A very common implementation of subcase-exists search queries involves utilizing the user's
+'search-input'. Please see an example of this configuration below.
+
+.. code-block::
+
+    if(count(instance("search-input:results")/input/field[@name = "clinic"]),
+       concat('subcase-exists("parent", @case_type = "service" and current_status = "active" and central_registry = "yes" and clinic_case_id = "',
+              instance("search-input:results")/input/field[@name = "clinic"],
+              '")'),
+       '@case_id != "c"')
+
+
+.. _multiselect:
+
+Multi-select case property searches
+===================================
+As shown above, the ``selected`` , ``selected-any``  and ``selected-all``  functions can be used to filter cases based on multi-select case properties.
+
+A multi-select case property is a case property whose value contains multiple 'terms'. Each 'term' in the case property value is typically separated by a space.
+tests_completed = 'math english physics'
+
+The following table illustrates how a case property value is split up into component terms. Note that some characters are removed and other are used as separators.
+
+.. list-table::
+   :header-rows: 1
+
+   * - Case property value
+     - Searchable terms
+     - Note
+   * - Case property value
+     - Searchable terms
+     - Note
+   * - word1 word2     word3
+     - [word1, word2, word3]
+     - Split on white space
+   * - word1 word-two 9-8
+     - [word1, word, two, 9, 8]
+     - Split on '-'
+   * - word1 word_2
+     - [word1, word_2]
+     - Not split on '_'
+   * - word1 5.9 word.2
+     - [word1, 5.9, word, 2]
+     - Split on 'period' between 'letters' but not between
+   * - 'word1' "word2" word3?!
+     - [word1, word2, word3]
+     - Quotes and punctuation are ignored
+   * - 你好
+     - [你, 好]
+     - Supports unicode characters
+   * - word1 🧀 🍌 word2
+     - [word1, word2]
+     - Emoji are ignored
+   * - word's
+     - [words, words]
+     - Apostrophe are removed
+   * - word"s
+     - [word, s]
+     - Split on double quote between letters
+   * - word1\\nword2
+     - [word1, word2]
+     - Split on white space ("\n" is a newline)
+   * - 12/2=6x1   4*5   98%  3^2
+     - [12, 2, 6x1, 4, 5, 98, 3, 2]
+     - Split on 'non-word' characters
+   * - start<point<end
+     - [start, point, end]
+     - Split on 'non-word' characters
+   * - you&me
+     - [you, me]
+     - Split on 'non-word' characters
+   * - (w1) ( w2 ) [w3] [ w4 ] ( [ w5
+     - [w1, w2, w3, w4, w5]
+     - Non-word characters are removed
+   * - word1,word2,word3
+     - [word1, word2, word3]
+     - Split on 'non-word' characters
+
+The process of analyzing case property values and producing terms is performed by the `Elasticsearch
+Standard Analyzer`_.
+
+.. _Elasticsearch Standard Analyzer: https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-standard-analyzer.html
+
+
+.. note::
+    Note that the CommCare functions ``selected`` and ``selected-at`` do not follow this pattern.
+    They only consider white space as the term separator and do not strip punctuation etc.
+
+
+Example Query + Tips
+====================
+
+In case lists, Default Search Filters allow you to automatically filter the results first shown in
+the list. When writing xpath query Default Search Filters, you construct a string which then gets
+passed to Elasticsearch to be evaluated as CSQL. These two layers can make it more challenging to
+write these expressions since it requires wrapping the CSQL components in quotation marks. When
+values are pulled from instances such as casedb or the session, these have to be pulled directly
+before being put into the string. Here we will explore an example to better illustrate this:
+
+In this example, we have the **service** case type as an extension of the **client** case type. The
+**service** represents that the **client** is receiving treatment at a particular clinic. We are
+going to look for clients who have open service cases associated with a clinic that is a part of the
+user’s set of clinics (as defined by a user property called clinic_case_ids). In other words, we are
+trying to find client who are receiving treatment from one of the user’s clinics.
+
+The ``_xpath_query`` in the Default Search Filter section of our client case type case list looks like this:
+
+.. code-block::
+
+    concat(
+      'subcase-exists("parent", @case_type = "service" and @status != "closed" and selected(clinic_case_id,"',
+      instance('casedb')/casedb/case[@case_type='commcare-user'][hq_user_id=instance('commcaresession')/session/context/userid]/clinic_case_ids,
+      '"))'
+    )
+
+Note that the ``instance('casedb')`` part is not in quotes initially. This is since we need to
+actually evaluate that to find its value first, not treat it as a string. However, quotes are then
+supplied in the ``concat()`` to wrap that value such that it later is properly viewed as a string.
+
+After applying the ``concat()``, here is what the string would look like:
+
+.. code-block::
+
+    'subcase-exists("parent", @case_type = "service" and @status != "closed" and selected(clinic_case_id,"228cdd5d-064b-40fa-8335-7d37761e82ce 3ba5b7a1-2c6f-4d1e-904e-24285344a819"))'
+
+This is now suited to be evaluated by Elasticsearch since it consists of only CSQL-valid functions
+from the list at the top of this page such as ``subcase-exists()`` and ``selected()``
+
+
+Limitations
+===========
+
+* Comparison between case properties is not supported
+    * e.g. ``activity_completion_date < opened_on``
+* Math is not supported
+    * e.g. ``age = 7+3 , dob = today() - 7``
diff --git a/docs/index.rst b/docs/index.rst
index 03a9871fa2be..4ae9d2f4abdc 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -46,6 +46,7 @@ Data is transmitted from the phone to the server (and vis-a-versa) over a secure
     apps/builds
     web_apps
     formplayer
+    case_search_query_language
 
 .. toctree::
     :caption: Application Data Layer

From 950b3065da5743ec5f994be2f978e0c1ebaddbcb Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Wed, 22 May 2024 13:28:02 -0700
Subject: [PATCH 07/63] feat: add tableau fields to invite form

---
 corehq/apps/registration/forms.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/registration/forms.py b/corehq/apps/registration/forms.py
index 2a110e8ca991..7a5eea497c24 100644
--- a/corehq/apps/registration/forms.py
+++ b/corehq/apps/registration/forms.py
@@ -24,7 +24,7 @@
 from corehq.apps.hqwebapp import crispy as hqcrispy
 from corehq.apps.hqwebapp.utils.translation import mark_safe_lazy
 from corehq.apps.programs.models import Program
-from corehq.apps.users.forms import BaseLocationForm
+from corehq.apps.users.forms import BaseLocationForm, BaseTableauUserForm
 from corehq.apps.users.models import CouchUser
 
 
@@ -512,6 +512,9 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                 choices = [('', '')] + list((prog.get_id, prog.name) for prog in programs)
                 self.fields['program'].choices = choices
         self.excluded_emails = excluded_emails or []
+
+        self._initialize_tableau_fields(data, domain)
+
         self.helper = FormHelper()
         self.helper.form_method = 'POST'
         self.helper.form_class = 'form-horizontal form-ko-validation'
@@ -530,6 +533,8 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                 'profile' if ('profile' in self.fields and len(self.fields['profile'].choices) > 0) else None,
                 'assigned_locations' if should_show_location else None,
                 'primary_location' if should_show_location else None,
+                'tableau_role',
+                'tableau_group_ids'
             ),
             crispy.HTML(
                 render_to_string(
@@ -569,3 +574,10 @@ def clean(self):
             if isinstance(cleaned_data[field], str):
                 cleaned_data[field] = cleaned_data[field].strip()
         return cleaned_data
+
+    def _initialize_tableau_fields(self, data, domain):
+        tableau_form = BaseTableauUserForm(data, domain=domain)
+        self.fields['tableau_group_ids'] = tableau_form.fields["groups"]
+        self.fields['tableau_group_ids'].label = _('Tableau Groups')
+        self.fields['tableau_role'] = tableau_form.fields['role']
+        self.fields['tableau_role'].label = _('Tableau Role')

From d3bf0ca33ff72a7d4d928e5b388dcce147158618 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Wed, 22 May 2024 16:43:48 -0700
Subject: [PATCH 08/63] validate for edit access and store ids of tableau
 groups

On post, the data is passed directly to create Invitation
which expects the key to be "tableau_group_ids"
---
 corehq/apps/registration/forms.py | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/registration/forms.py b/corehq/apps/registration/forms.py
index 7a5eea497c24..f2d90f5f12a3 100644
--- a/corehq/apps/registration/forms.py
+++ b/corehq/apps/registration/forms.py
@@ -493,6 +493,7 @@ class AdminInvitesUserForm(BaseLocationForm):
     def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                  role_choices=(), should_show_location=False, *, domain, **kwargs):
         super(AdminInvitesUserForm, self).__init__(domain=domain, data=data, **kwargs)
+        self.request = kwargs.get('request')
         domain_obj = Domain.get_by_name(domain)
         self.fields['role'].choices = role_choices
         if domain_obj:
@@ -513,7 +514,8 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                 self.fields['program'].choices = choices
         self.excluded_emails = excluded_emails or []
 
-        self._initialize_tableau_fields(data, domain)
+        if self.request.couch_user.has_permission(self.domain, 'edit_user_tableau_config'):
+            self._initialize_tableau_fields(data, domain)
 
         self.helper = FormHelper()
         self.helper.form_method = 'POST'
@@ -533,8 +535,8 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                 'profile' if ('profile' in self.fields and len(self.fields['profile'].choices) > 0) else None,
                 'assigned_locations' if should_show_location else None,
                 'primary_location' if should_show_location else None,
-                'tableau_role',
-                'tableau_group_ids'
+                'tableau_role' if 'tableau_role' in self.fields else None,
+                'tableau_group_indices' if 'tableau_group_indices' in self.fields else None
             ),
             crispy.HTML(
                 render_to_string(
@@ -570,14 +572,26 @@ def clean_email(self):
 
     def clean(self):
         cleaned_data = super(AdminInvitesUserForm, self).clean()
+
+        if (('tableau_role' in cleaned_data or 'tableau_group_indices' in cleaned_data)
+        and not self.request.couch_user.has_permission(self.domain, 'edit_user_tableau_config')):
+            raise forms.ValidationError(_("You do not have permission to edit Tableau Configuraion."))
+
+        if 'tableau_group_indices' in cleaned_data:
+            cleaned_data['tableau_group_ids'] = [
+                self.tableau_form.allowed_tableau_groups[int(i)].id
+                for i in cleaned_data['tableau_group_indices']
+            ]
+            del cleaned_data['tableau_group_indices']
+
         for field in cleaned_data:
             if isinstance(cleaned_data[field], str):
                 cleaned_data[field] = cleaned_data[field].strip()
         return cleaned_data
 
     def _initialize_tableau_fields(self, data, domain):
-        tableau_form = BaseTableauUserForm(data, domain=domain)
-        self.fields['tableau_group_ids'] = tableau_form.fields["groups"]
-        self.fields['tableau_group_ids'].label = _('Tableau Groups')
-        self.fields['tableau_role'] = tableau_form.fields['role']
+        self.tableau_form = BaseTableauUserForm(data, domain=domain)
+        self.fields['tableau_group_indices'] = self.tableau_form.fields["groups"]
+        self.fields['tableau_group_indices'].label = _('Tableau Groups')
+        self.fields['tableau_role'] = self.tableau_form.fields['role']
         self.fields['tableau_role'].label = _('Tableau Role')

From 0a2acd750f6d297d97521b18d6baf5e4ee92363e Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Wed, 22 May 2024 17:07:41 -0700
Subject: [PATCH 09/63] bug: profile needs to be passed for creation of webuser

this logic flow is for users who already requested access and the
submitted invitation form is for that user
---
 corehq/apps/users/views/__init__.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/users/views/__init__.py b/corehq/apps/users/views/__init__.py
index 8dac664b721c..1a3e402f2f25 100644
--- a/corehq/apps/users/views/__init__.py
+++ b/corehq/apps/users/views/__init__.py
@@ -1153,6 +1153,10 @@ def post(self, request, *args, **kwargs):
             create_invitation = True
             data = self.invite_web_user_form.cleaned_data
             domain_request = DomainRequest.by_email(self.domain, data["email"])
+            profile_id = data.get("profile", None)
+            profile = CustomDataFieldsProfile.objects.get(
+                id=profile_id,
+                definition__domain=self.domain) if profile_id else None
             if domain_request is not None:
                 domain_request.is_approved = True
                 domain_request.save()
@@ -1164,6 +1168,7 @@ def post(self, request, *args, **kwargs):
                                          primary_location_id=data.get("primary_location", None),
                                          program_id=data.get("program", None),
                                          assigned_location_ids=data.get("assigned_locations", None),
+                                         profile=profile
                                          )
                 messages.success(request, "%s added." % data["email"])
             else:
@@ -1184,10 +1189,7 @@ def post(self, request, *args, **kwargs):
                 if primary_location_id:
                     assert primary_location_id in assigned_location_ids
                 self._assert_user_has_permission_to_access_locations(assigned_location_ids)
-                profile_id = data.get("profile", None)
-                data["profile"] = CustomDataFieldsProfile.objects.get(
-                    id=profile_id,
-                    definition__domain=self.domain) if profile_id else None
+                data["profile"] = profile
                 invite = Invitation(**data)
                 invite.save()
 

From 5accbcb183a7e550d3475150d9cc42eaaa0b9509 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Wed, 22 May 2024 17:10:02 -0700
Subject: [PATCH 10/63] feat: uses tableau role and group when adding web user
 if already requested access

---
 corehq/apps/users/views/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/users/views/__init__.py b/corehq/apps/users/views/__init__.py
index 1a3e402f2f25..bde158ad5c83 100644
--- a/corehq/apps/users/views/__init__.py
+++ b/corehq/apps/users/views/__init__.py
@@ -1168,7 +1168,9 @@ def post(self, request, *args, **kwargs):
                                          primary_location_id=data.get("primary_location", None),
                                          program_id=data.get("program", None),
                                          assigned_location_ids=data.get("assigned_locations", None),
-                                         profile=profile
+                                         profile=profile,
+                                         tableau_role=data.get("tableau_role", None),
+                                         tableau_group_ids=data.get("tableau_group_ids", None)
                                          )
                 messages.success(request, "%s added." % data["email"])
             else:

From c95a2792ef42db00570615bab8b472d5faa83a52 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Wed, 22 May 2024 17:13:26 -0700
Subject: [PATCH 11/63] use tableau role and group ids from invitation for
 accepting invite via management command

---
 corehq/apps/users/management/commands/accept_invite.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/users/management/commands/accept_invite.py b/corehq/apps/users/management/commands/accept_invite.py
index c36b32ba3d10..3a44f191d5be 100644
--- a/corehq/apps/users/management/commands/accept_invite.py
+++ b/corehq/apps/users/management/commands/accept_invite.py
@@ -29,7 +29,9 @@ def handle(self, username, domain, **options):
                             assigned_location_ids=list(
                                 invitation.assigned_locations.all().values_list('location_id', flat=True)),
                             program_id=invitation.program,
-                            profile=invitation.profile)
+                            profile=invitation.profile,
+                            tableau_role=invitation.tableau_role,
+                            tableau_group_ids=invitation.tableau_group_ids)
         invitation.is_accepted = True
         invitation.save()
         print("Operation completed")

From 654781338d52c0ea3a094ad460767a9eb2324498 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Thu, 23 May 2024 11:43:42 -0700
Subject: [PATCH 12/63] bug: need to consider FF when displaying tableau cofig
 field

---
 corehq/apps/registration/forms.py   | 9 +++++----
 corehq/apps/users/views/__init__.py | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/registration/forms.py b/corehq/apps/registration/forms.py
index f2d90f5f12a3..5b0a6bc1d5f4 100644
--- a/corehq/apps/registration/forms.py
+++ b/corehq/apps/registration/forms.py
@@ -491,9 +491,10 @@ class AdminInvitesUserForm(BaseLocationForm):
     role = forms.ChoiceField(choices=(), label="Project Role")
 
     def __init__(self, data=None, excluded_emails=None, is_add_user=None,
-                 role_choices=(), should_show_location=False, *, domain, **kwargs):
+                 role_choices=(), should_show_location=False, can_edit_tableau_config=False,
+                 *, domain, **kwargs):
         super(AdminInvitesUserForm, self).__init__(domain=domain, data=data, **kwargs)
-        self.request = kwargs.get('request')
+        self.can_edit_tableau_config = can_edit_tableau_config
         domain_obj = Domain.get_by_name(domain)
         self.fields['role'].choices = role_choices
         if domain_obj:
@@ -514,7 +515,7 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                 self.fields['program'].choices = choices
         self.excluded_emails = excluded_emails or []
 
-        if self.request.couch_user.has_permission(self.domain, 'edit_user_tableau_config'):
+        if self.can_edit_tableau_config:
             self._initialize_tableau_fields(data, domain)
 
         self.helper = FormHelper()
@@ -574,7 +575,7 @@ def clean(self):
         cleaned_data = super(AdminInvitesUserForm, self).clean()
 
         if (('tableau_role' in cleaned_data or 'tableau_group_indices' in cleaned_data)
-        and not self.request.couch_user.has_permission(self.domain, 'edit_user_tableau_config')):
+        and self.can_edit_tableau_config):
             raise forms.ValidationError(_("You do not have permission to edit Tableau Configuraion."))
 
         if 'tableau_group_indices' in cleaned_data:
diff --git a/corehq/apps/users/views/__init__.py b/corehq/apps/users/views/__init__.py
index bde158ad5c83..a24a7e73fcf7 100644
--- a/corehq/apps/users/views/__init__.py
+++ b/corehq/apps/users/views/__init__.py
@@ -1107,6 +1107,8 @@ def invite_web_user_form(self):
         initial = {
             'email': domain_request.email if domain_request else None,
         }
+        can_edit_tableau_config = (self.request.couch_user.has_permission(self.domain, 'edit_user_tableau_config')
+                                and toggles.TABLEAU_USER_SYNCING.enabled(self.domain))
         if self.request.method == 'POST':
             current_users = [user.username for user in WebUser.by_domain(self.domain)]
             pending_invites = [di.email for di in Invitation.by_domain(self.domain)]
@@ -1117,6 +1119,7 @@ def invite_web_user_form(self):
                 domain=self.domain,
                 is_add_user=is_add_user,
                 should_show_location=self.request.project.uses_locations,
+                can_edit_tableau_config=can_edit_tableau_config,
                 request=self.request
             )
         return AdminInvitesUserForm(
@@ -1125,6 +1128,7 @@ def invite_web_user_form(self):
             domain=self.domain,
             is_add_user=is_add_user,
             should_show_location=self.request.project.uses_locations,
+            can_edit_tableau_config=can_edit_tableau_config,
             request=self.request
         )
 

From 33cee1c5b17c9cd21065922b3a83f60afcbe0a37 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Thu, 23 May 2024 11:58:53 -0700
Subject: [PATCH 13/63] add header labels for fields

---
 corehq/apps/registration/forms.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/registration/forms.py b/corehq/apps/registration/forms.py
index 5b0a6bc1d5f4..de68b11b57fc 100644
--- a/corehq/apps/registration/forms.py
+++ b/corehq/apps/registration/forms.py
@@ -524,7 +524,7 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
 
         self.helper.label_class = 'col-sm-3 col-md-2'
         self.helper.field_class = 'col-sm-9 col-md-8 col-lg-6'
-        self.helper.layout = crispy.Layout(
+        fields = [
             crispy.Fieldset(
                 gettext("Information for new Web User"),
                 crispy.Field(
@@ -534,11 +534,26 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                 ),
                 'role',
                 'profile' if ('profile' in self.fields and len(self.fields['profile'].choices) > 0) else None,
-                'assigned_locations' if should_show_location else None,
-                'primary_location' if should_show_location else None,
-                'tableau_role' if 'tableau_role' in self.fields else None,
-                'tableau_group_indices' if 'tableau_group_indices' in self.fields else None
-            ),
+            )
+        ]
+        if should_show_location:
+            fields.append(
+                crispy.Fieldset(
+                    gettext("Location Settings"),
+                    'assigned_locations' if should_show_location else None,
+                    'primary_location' if should_show_location else None,
+                )
+            )
+        if self.can_edit_tableau_config:
+            fields.append(
+                crispy.Fieldset(
+                    gettext("Tableau Configuration"),
+                    'tableau_role' if 'tableau_role' in self.fields else None,
+                    'tableau_group_indices' if 'tableau_group_indices' in self.fields else None
+                ),
+            )
+        self.helper.layout = crispy.Layout(
+            *fields,
             crispy.HTML(
                 render_to_string(
                     'users/partials/confirm_trust_identity_provider_message.html',

From 1ee0e50b52c7952b3beca5fed1336bbc1ac02217 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Thu, 23 May 2024 12:01:56 -0700
Subject: [PATCH 14/63] control visibility of views via fieldset

---
 corehq/apps/registration/forms.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/registration/forms.py b/corehq/apps/registration/forms.py
index de68b11b57fc..ca37472b4ea6 100644
--- a/corehq/apps/registration/forms.py
+++ b/corehq/apps/registration/forms.py
@@ -540,16 +540,16 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
             fields.append(
                 crispy.Fieldset(
                     gettext("Location Settings"),
-                    'assigned_locations' if should_show_location else None,
-                    'primary_location' if should_show_location else None,
+                    'assigned_locations',
+                    'primary_location',
                 )
             )
         if self.can_edit_tableau_config:
             fields.append(
                 crispy.Fieldset(
                     gettext("Tableau Configuration"),
-                    'tableau_role' if 'tableau_role' in self.fields else None,
-                    'tableau_group_indices' if 'tableau_group_indices' in self.fields else None
+                    'tableau_role',
+                    'tableau_group_indices' if len(self.fields['tableau_group_indices'].choices) > 0 else None
                 ),
             )
         self.helper.layout = crispy.Layout(

From 109725fb2e9a4a099685e5b4a63ab38e3d342846 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Thu, 23 May 2024 15:53:17 -0400
Subject: [PATCH 15/63] Remove links to internal-only wiki

---
 docs/case_search_query_language.rst | 35 ++++++-----------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/docs/case_search_query_language.rst b/docs/case_search_query_language.rst
index 0e6386dd2507..e9d66f4d8c04 100644
--- a/docs/case_search_query_language.rst
+++ b/docs/case_search_query_language.rst
@@ -2,12 +2,9 @@
 Case Search Query Language (CSQL)
 =================================
 
-Underpinning some of the advanced search capabilities of `Case Search`_ and `Case List Explorer`_ is
-the Case Search Query Language. This page describes the syntax and capabilities of the language as
-well as it's limitations.
-
-.. _Case Search: https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146606528
-.. _Case List Explorer: https://dimagi.atlassian.net/wiki/x/KTXKfw
+Underpinning some of the advanced search capabilities of Case Search and Case List Explorer is the
+Case Search Query Language. This page describes the syntax and capabilities of the language as well
+as it's limitations.
 
 .. contents::
    :local:
@@ -159,27 +156,21 @@ The following functions are supported:
 
 ``within-distance``
 -------------------
-* **Requirements**: GPS case properties set up as described in this page: `Storing GPS Case
-  Properties in Elasticsearch as GeoPoints <geopoints_>`_
+* **Requirements**: GPS case properties
 * **Behavior**: Match cases within a certain geographic distance (as the crow flies) of the provided
   point
 * **Return**: True if that case is within range, otherwise false
 * **Arguments**:
     * ``property_name``: The GPS case property on the cases being searched
-    * ``coordinates``: This can be the output of a "geopoint" receiver from a geocoder question as
-      described in `Address Geocoding in Web Apps <address_geocoding_>`_
+    * ``coordinates``: This can be the output of a "geopoint" receiver from a geocoder question
     * ``distance``: The distance from ``coordinates`` to search
     * ``unit``: The units for that distance. Options are: miles, yards, feet, inch, kilometers,
       meters, centimeters, millimeters, nauticalmiles
 * **Usage**: ``within-distance(location, '42.4402967 -71.1453275', 30, 'miles')``
 
-.. _geopoints: https://dimagi.atlassian.net/wiki/x/dgf4fw
-.. _address_geocoding: https://dimagi.atlassian.net/wiki/x/dALKfw
-
 ``fuzzy-match``
 ---------------
-* **Behavior**: Determines if a given value is a fuzzy match for a given case property. This ignores
-  the `domain-level case search fuzziness settings <fuzziness_settings_>`_.
+* **Behavior**: Determines if a given value is a fuzzy match for a given case property.
 * **Return**: True if that particular value matches the case property.  Otherwise False.
 * **Arguments**:  Two arguments: the case property and the value to check.
 * **Usage**: ``fuzzy-match(first_name, "Sara")``
@@ -189,7 +180,6 @@ The following functions are supported:
    to gauge similarity. To consider something a match, it requires an exact prefix match and an edit
    distance based on the length of the string (longer strings can have more edits).
 
-.. _fuzziness_settings: https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146606704/Project+Case+Search+Configuration#Configure-Fuzzy-Properties-(optional)
 .. _Fuzzy Query: https://www.elastic.co/guide/en/elasticsearch/reference/8.11/query-dsl-fuzzy-query.html
 .. _Levenshtein distance: https://en.wikipedia.org/wiki/Levenshtein_distance
 
@@ -288,10 +278,6 @@ Special functions are provided to support filtering based on the properties of s
     subcase functions and search results increases, the time required to perform the search will
     also increase.
 
-    **Performance testing is required** when using this function in your app.
-        * `Link to performance testing in HQ's case search (not Web Apps) <perf_testing_>`_
-        * `Link to performance testing in HQ's case search (WebApps - BHA) <bha_perf_testing_>`_
-
     Keep in mind that a higher number of search results will lead to longer execution times for the
     search query. The threshold is around 400K to 500K search results, after which a timeout error
     may occur. It is recommended to keep your search results well below this number for optimal
@@ -302,16 +288,9 @@ Special functions are provided to support filtering based on the properties of s
     by both first and last name is more effective than just using the first name. Including more
     required fields in the search form is likely to reduce the number of search results returned.
 
-    If you have any questions regarding the limitation usage of this subcase function, please reach
-    out to the AE team.
-
-
-.. _perf_testing: https://docs.google.com/spreadsheets/d/1T4tX1tbFaiTBFWpJoi_4p4_UtnRL3_SRoXJgADraXo8/edit#gid=1095465676
-.. _bha_perf_testing: https://docs.google.com/spreadsheets/d/1B9ySwSahf4qUKWEmX0FfdK0uArOBnJ6pXWh7eYvnaiA/edit#gid=671814666
-
 **Examples**
 
-A very common implementation of subcase-exists search queries involves utilizing the user's
+A very common implementation of ``subcase-exists`` search queries involves utilizing the user's
 'search-input'. Please see an example of this configuration below.
 
 .. code-block::

From c98633e223c61b4eaf5f4767ebe091e4c97e2912 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Thu, 23 May 2024 14:41:46 -0700
Subject: [PATCH 16/63] bug: should check if user does not have permission to
 edit tableau config

---
 corehq/apps/registration/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/registration/forms.py b/corehq/apps/registration/forms.py
index ca37472b4ea6..7ddbe3ed0ba6 100644
--- a/corehq/apps/registration/forms.py
+++ b/corehq/apps/registration/forms.py
@@ -590,7 +590,7 @@ def clean(self):
         cleaned_data = super(AdminInvitesUserForm, self).clean()
 
         if (('tableau_role' in cleaned_data or 'tableau_group_indices' in cleaned_data)
-        and self.can_edit_tableau_config):
+        and not self.can_edit_tableau_config):
             raise forms.ValidationError(_("You do not have permission to edit Tableau Configuraion."))
 
         if 'tableau_group_indices' in cleaned_data:

From 09c2d32dedb9592c14b755e661caebf9a862d234 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Thu, 23 May 2024 21:21:14 -0400
Subject: [PATCH 17/63] Merge related case query sections and move warning to
 top

---
 docs/case_search_query_language.rst | 55 +++++++++++------------------
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/docs/case_search_query_language.rst b/docs/case_search_query_language.rst
index e9d66f4d8c04..0c0b51fb7363 100644
--- a/docs/case_search_query_language.rst
+++ b/docs/case_search_query_language.rst
@@ -210,8 +210,27 @@ The following functions are supported:
     * Matches cases that have a property ``first_name`` equal to ``"Julia"``
 
 
-Filtering on parent (ancestor) cases
-====================================
+Filtering on related cases
+==========================
+
+CSQL includes utilities for searching against ancestor cases (such as parents) and subcases (such as children)
+
+.. warning::
+    When utilizing related cases function, be mindful that the *quantity of search results* and the
+    *number of subcase or ancestor functions* in a single search are important factors. As the
+    number of related case functions and search results increases, the time required to perform the
+    search will also increase.
+
+    Keep in mind that a higher number of search results will lead to longer execution times for the
+    search query. The threshold is around 400K to 500K search results, after which a timeout error
+    may occur. It is recommended to keep your search results well below this number for optimal
+    performance.
+
+    To manage the number of search results when incorporating subcase or ancestor functions in your
+    search query, you can apply required fields in the search form. For instance, requiring users to
+    search by both first and last name is more effective than just using the first name. Including
+    more required fields in the search form is likely to reduce the number of search results
+    returned.
 
 Searches may be performed against ancestor cases (e.g. parent cases) using the ``/`` operator
 
@@ -238,16 +257,6 @@ Searches may be performed against ancestor cases (e.g. parent cases) using the `
         * This will *not* work: ``ancestor-exists(parent, selected(city, 'SF'))``
         * This will work:  ``ancestor-exists(parent, city != '' and selected(city, 'SF'))``
     * The ancestor filter expression may not include ``subcase-exists`` or ``subcase-count``
-      * **Best Practices**:
-    * Limit multiple uses of this function in your query to avoid performance implications
-    * Add as many arguments to ``ancestor-exists()`` as possible to help narrow down results (i.e.,
-      by ``@case_type`` or ``@status``)
-
-
-Filtering on child cases (subcases)
-===================================
-
-Special functions are provided to support filtering based on the properties of subcases. These are:
 
 ``subcase-exists``
 ------------------
@@ -256,10 +265,6 @@ Special functions are provided to support filtering based on the properties of s
 * **Arguments**: Two arguments, the subcase relationship (usually one of 'parent' or 'host') and the
   subcase filter expression.
 * **Usage**: ``subcase-exists('parent', lab_type = 'blood' and result = 1)``
-* **Best Practices**:
-    * Limit multiple uses of this function in your query to avoid performance implications
-    * Add as many arguments to ``subcase-exists()`` as possible to help narrow down results (i.e.,
-      by ``@case_type`` or ``@status``)
 
 ``subcase-count``
 -----------------
@@ -269,24 +274,6 @@ Special functions are provided to support filtering based on the properties of s
 * **Usage**: ``subcase-count('parent', lab_type = 'blood' and result = 1) > 3``
     * The count function must be used in conjunction with a comparison operator. All operators are
       supported (``=``, ``!=``, ``<``, ``<=``, ``>``, ``>=``)
-* **Best Practices**:
-    * Limit multiple uses of this function in your query to avoid performance implications
-
-.. warning::
-    When utilizing the special subcase function, be mindful that the *quantity of search results*
-    and the *number of subcase functions* in a single search are important factors. As the number of
-    subcase functions and search results increases, the time required to perform the search will
-    also increase.
-
-    Keep in mind that a higher number of search results will lead to longer execution times for the
-    search query. The threshold is around 400K to 500K search results, after which a timeout error
-    may occur. It is recommended to keep your search results well below this number for optimal
-    performance.
-
-    To manage the number of search results when incorporating subcase functions in your search
-    query, you can apply required fields in the search form. For instance, requiring users to search
-    by both first and last name is more effective than just using the first name. Including more
-    required fields in the search form is likely to reduce the number of search results returned.
 
 **Examples**
 

From 8fade9fbf8aa8afa5c29c713c307b327f35a1a70 Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Tue, 28 May 2024 16:14:25 +0200
Subject: [PATCH 18/63] add status chart

---
 corehq/apps/app_execution/db_accessors.py     | 46 +++++++++++++++-
 ...low_timing_chart.js => workflow_charts.js} | 55 +++++++++++++++++--
 .../static/app_execution/js/workflow_logs.js  |  2 +-
 .../app_execution/workflow_list.html          | 19 +++++--
 .../app_execution/workflow_log_list.html      | 17 ++++--
 corehq/apps/app_execution/views.py            | 14 ++---
 6 files changed, 127 insertions(+), 26 deletions(-)
 rename corehq/apps/app_execution/static/app_execution/js/{workflow_timing_chart.js => workflow_charts.js} (54%)

diff --git a/corehq/apps/app_execution/db_accessors.py b/corehq/apps/app_execution/db_accessors.py
index de9ea05a9a5b..7099d8692b40 100644
--- a/corehq/apps/app_execution/db_accessors.py
+++ b/corehq/apps/app_execution/db_accessors.py
@@ -1,4 +1,6 @@
-from django.db.models import Avg, DateTimeField, DurationField, ExpressionWrapper, F, Max
+from datetime import timedelta
+
+from django.db.models import Avg, Count, DateTimeField, DurationField, ExpressionWrapper, F, Max
 from django.db.models.functions import Trunc
 
 from corehq.apps.app_execution.models import AppExecutionLog, AppWorkflowConfig
@@ -41,3 +43,45 @@ def get_avg_duration_data(domain, start, end, workflow_id=None):
     for workflow_data in data:
         workflow_data["label"] = workflow_names[workflow_data["key"]]
     return data
+
+
+def get_status_data(domain, start, end, workflow_id=None):
+    query = AppExecutionLog.objects.filter(workflow__domain=domain, started__gte=start, started__lt=end)
+    if workflow_id:
+        query = query.filter(workflow_id=workflow_id)
+
+    chart_logs = (
+        query.annotate(date=Trunc("started", "hour", output_field=DateTimeField()))
+        .values("date", "success")
+        .annotate(count=Count("success"))
+    )
+
+    success = []
+    error = []
+    seen_success_dates = set()
+    seen_error_dates = set()
+    for row in chart_logs:
+        item = {
+            "date": row["date"].isoformat(),
+            "count": row["count"],
+        }
+        if row["success"]:
+            success.append(item)
+            seen_success_dates.add(row["date"])
+        else:
+            error.append(item)
+            seen_error_dates.add(row["date"])
+
+    start = start.replace(minute=0, second=0, microsecond=0)
+    current = start
+    while current < end:
+        if current not in seen_error_dates:
+            error.append({"date": current.isoformat(), "count": 0})
+        if current not in seen_success_dates:
+            success.append({"date": current.isoformat(), "count": 0})
+        current += timedelta(hours=1)
+
+    return [
+        {"key": "Success", "values": sorted(success, key=lambda x: x["date"])},
+        {"key": "Error", "values": sorted(error, key=lambda x: x["date"])},
+    ]
diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_timing_chart.js b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
similarity index 54%
rename from corehq/apps/app_execution/static/app_execution/js/workflow_timing_chart.js
rename to corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
index 63fa7b9e7f91..0348fee4062d 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_timing_chart.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
@@ -1,5 +1,5 @@
 // /* globals moment */
-hqDefine("app_execution/js/workflow_timing_chart", [
+hqDefine("app_execution/js/workflow_charts", [
     'jquery',
     'moment/moment',
     'd3/d3.min',
@@ -12,7 +12,6 @@ hqDefine("app_execution/js/workflow_timing_chart", [
         return includeSeries.map((seriesMeta) => {
             return {
                 // include key in the label to differentiate between series with the same label
-                label: `${data.label}${seriesMeta.label}`,
                 key: `${data.label}${seriesMeta.label}[${data.key}]`,
                 values: data.values.map((item) => {
                     return {
@@ -24,7 +23,7 @@ hqDefine("app_execution/js/workflow_timing_chart", [
         });
     }
 
-    function setupLineChart(data, includeSeries) {
+    function setupTimingChart(data, includeSeries) {
         const timingSeries = data.flatMap((series) => getSeries(series, includeSeries));
         nv.addGraph(function () {
             let chart = nv.models.lineChart()
@@ -58,9 +57,53 @@ hqDefine("app_execution/js/workflow_timing_chart", [
 
     }
 
+    function setupStatusChart(data) {
+        const colors = {
+            "Success": "#6dcc66",
+            "Error": "#f44",
+        };
+        data = data.map((series) => {
+            return {
+                key: series.key,
+                values: series.values.map((item) => {
+                    return {
+                        x: moment(item.date),
+                        y: item.count,
+                    };
+                }),
+                color: colors[series.key],
+            };
+        });
+
+        nv.addGraph(function () {
+            let chart = nv.models.lineChart()
+                .showYAxis(true)
+                .showXAxis(true);
+
+            chart.yAxis
+                .axisLabel('Count');
+            chart.forceY(0);
+            chart.xScale(d3.time.scale());
+            chart.margin({left: 80, bottom: 100});
+            chart.xAxis.rotateLabels(-45)
+                .tickFormat(function (d) {
+                    return moment(d).format("MMM DD [@] HH");
+                });
+
+            d3.select('#status_barchart svg')
+                .datum(data)
+                .call(chart);
+
+            nv.utils.windowResize(chart.update);
+            return chart;
+        });
+    }
+
     $(document).ready(function () {
-        const chartData = JSON.parse(document.getElementById('chart_data').textContent);
-        const includeSeries = JSON.parse(document.getElementById('includeSeries').textContent);
-        setupLineChart(chartData, includeSeries);
+        const timingData = JSON.parse(document.getElementById('timing_chart_data').textContent);
+        const statusData = JSON.parse(document.getElementById('status_chart_data').textContent);
+        const includeSeries = JSON.parse(document.getElementById('timingSeries').textContent);
+        setupTimingChart(timingData, includeSeries);
+        setupStatusChart(statusData);
     });
 });
diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
index 0bcca816ac71..0e6cb6dcf28b 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
@@ -2,7 +2,7 @@ hqDefine("app_execution/js/workflow_logs", [
     'jquery',
     'knockout',
     'hqwebapp/js/initial_page_data',
-    'app_execution/js/workflow_timing_chart',
+    'app_execution/js/workflow_charts',
     'hqwebapp/js/bootstrap5/components.ko',
 ], function ($, ko, initialPageData) {
     let logsModel = function () {
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
index 014329d47f9f..64fea39c4475 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
@@ -12,15 +12,21 @@
   {% endcompress %}
 {% endblock %}
 
-{% requirejs_main_b5 'app_execution/js/workflow_timing_chart' %}
+{% requirejs_main_b5 'app_execution/js/workflow_charts' %}
 
 {% block page_content %}
   <div>
     <a class='btn btn-primary' href="{% url 'app_execution:new_workflow' request.domain %}">Create New</a>
   </div>
-  <div>
-    <h3>{% trans "Average Timings Per Hour" %}</h3>
-    <div id="timing_linechart"><svg height="300px"></svg></div>
+  <div class="row">
+    <div id="timing_linechart" class="col">
+      <h4 class="text-center">{% trans "Average Timings" %}</h4>
+      <svg height="300px"></svg>
+    </div>
+    <div id="status_barchart" class="col">
+      <h4 class="text-center">{% trans "Status" %}</h4>
+      <svg height="300px"></svg>
+    </div>
   </div>
   <table class="table table-striped table-hover">
   <thead>
@@ -65,8 +71,9 @@ <h3>{% trans "Average Timings Per Hour" %}</h3>
   </tbody>
 </table>
 
-{{ chart_data|json_script:"chart_data" }}
-<script id="includeSeries" type="application/json">
+{{ timing_chart_data|json_script:"timing_chart_data" }}
+{{ status_chart_data|json_script:"status_chart_data" }}
+<script id="timingSeries" type="application/json">
   [{"label": "", "key": "avg_duration"}]
 </script>
 {% endblock %}
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
index 7ed76f988007..693d10041122 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
@@ -19,9 +19,15 @@
   {% registerurl "app_execution:logs_json" request.domain workflow.id %}
 
   <h2>Logs for workflow "<a href="{% url "app_execution:edit_workflow" request.domain workflow.id %}">{{ workflow.name }}</a>"</h2>
-  <div>
-    <h3>{% trans "Average Timings Per Hour" %}</h3>
-    <div id="timing_linechart"><svg height="300px"></svg></div>
+  <div class="row">
+    <div id="timing_linechart" class="col">
+      <h4 class="text-center">{% trans "Average Timings" %}</h4>
+      <svg height="300px"></svg>
+    </div>
+    <div id="status_barchart" class="col">
+      <h4 class="text-center">{% trans "Log Status" %}</h4>
+      <svg height="300px"></svg>
+    </div>
   </div>
   <div id="workflow-logs">
     <table class="table table-striped table-hover">
@@ -50,8 +56,9 @@ <h3>{% trans "Average Timings Per Hour" %}</h3>
     <pagination data-apply-bindings="false"
                 params="goToPage: goToPage, totalItems: totalItems, perPage: perPage, onLoad: onLoad"></pagination>
 </div>
-{{ chart_data|json_script:"chart_data" }}
-<script id="includeSeries" type="application/json">
+{{ timing_chart_data|json_script:"timing_chart_data" }}
+{{ status_chart_data|json_script:"status_chart_data" }}
+<script id="timingSeries" type="application/json">
   [{"label": "- Avg Timings", "key": "avg_duration"}, {"label": "- Max Timings", "key": "max_duration"}]
 </script>
 {% endblock %}
diff --git a/corehq/apps/app_execution/views.py b/corehq/apps/app_execution/views.py
index 5d3f424d6f3b..b13a6dc49dfb 100644
--- a/corehq/apps/app_execution/views.py
+++ b/corehq/apps/app_execution/views.py
@@ -9,7 +9,7 @@
 from corehq.apps.app_execution import const
 from corehq.apps.app_execution.api import execute_workflow
 from corehq.apps.app_execution.data_model import EXAMPLE_WORKFLOW
-from corehq.apps.app_execution.db_accessors import get_avg_duration_data
+from corehq.apps.app_execution.db_accessors import get_avg_duration_data, get_status_data
 from corehq.apps.app_execution.exceptions import AppExecutionError, FormplayerException
 from corehq.apps.app_execution.forms import AppWorkflowConfigForm
 from corehq.apps.app_execution.har_parser import parse_har_from_string
@@ -24,13 +24,14 @@ def workflow_list(request, domain):
     workflows = AppWorkflowConfig.objects.filter(domain=domain)
     _augment_with_logs(workflows)
     utcnow = datetime.utcnow()
-    chart_data = get_avg_duration_data(domain, start=utcnow - relativedelta(months=1), end=utcnow)
+    start = utcnow - relativedelta(months=1)
     context = _get_context(
         request,
         "Automatically Executed App Workflows",
         reverse("app_execution:workflow_list", args=[domain]),
         workflows=workflows,
-        chart_data=chart_data
+        timing_chart_data=get_avg_duration_data(domain, start=start, end=utcnow),
+        status_chart_data=get_status_data(domain, start=start, end=utcnow)
     )
     return render(request, "app_execution/workflow_list.html", context)
 
@@ -165,9 +166,7 @@ def _get_context(request, title, url, add_parent=False, **kwargs):
 @use_bootstrap5
 def workflow_log_list(request, domain, pk):
     utcnow = datetime.utcnow()
-    chart_data = get_avg_duration_data(
-        domain, start=utcnow - relativedelta(months=1), end=utcnow, workflow_id=pk
-    )
+    start = utcnow - relativedelta(months=1)
     context = _get_context(
         request,
         "Automatically Executed App Workflow Logs",
@@ -175,7 +174,8 @@ def workflow_log_list(request, domain, pk):
         add_parent=True,
         workflow=AppWorkflowConfig.objects.get(id=pk),
         total=AppExecutionLog.objects.filter(workflow__domain=domain, workflow_id=pk).count(),
-        chart_data=chart_data
+        timing_chart_data=get_avg_duration_data(domain, start=start, end=utcnow, workflow_id=pk),
+        status_chart_data=get_status_data(domain, start=start, end=utcnow, workflow_id=pk),
     )
     return render(request, "app_execution/workflow_log_list.html", context)
 

From 3cd4e781006c82c4102a08f3adb0f81bd4175211 Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Tue, 28 May 2024 16:40:07 +0200
Subject: [PATCH 19/63] pad timing data

---
 corehq/apps/app_execution/db_accessors.py     | 36 +++++++++++--------
 .../app_execution/js/workflow_charts.js       | 13 ++++---
 .../app_execution/workflow_list.html          |  3 +-
 .../app_execution/workflow_log_list.html      |  3 +-
 corehq/apps/app_execution/views.py            | 12 ++++---
 5 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/corehq/apps/app_execution/db_accessors.py b/corehq/apps/app_execution/db_accessors.py
index 7099d8692b40..b23e281868ee 100644
--- a/corehq/apps/app_execution/db_accessors.py
+++ b/corehq/apps/app_execution/db_accessors.py
@@ -1,3 +1,4 @@
+from collections import defaultdict
 from datetime import timedelta
 
 from django.db.models import Avg, Count, DateTimeField, DurationField, ExpressionWrapper, F, Max
@@ -18,31 +19,38 @@ def get_avg_duration_data(domain, start, end, workflow_id=None):
         ).values("date", "workflow_id")
         .annotate(avg_duration=Avg('duration'))
         .annotate(max_duration=Max('duration'))
-        .order_by("workflow_id", "date")
     )
 
-    data = []
-    seen_workflows = set()
+    data = defaultdict(list)
+    seen_dates = defaultdict(set)
     for row in chart_logs:
-        if row["workflow_id"] not in seen_workflows:
-            seen_workflows.add(row["workflow_id"])
-            data.append({
-                "key": row["workflow_id"],
-                "values": []
-            })
-        data[-1]["values"].append({
+        data[row["workflow_id"]].append({
             "date": row["date"].isoformat(),
             "avg_duration": row["avg_duration"].total_seconds(),
             "max_duration": row["max_duration"].total_seconds(),
         })
+        seen_dates[row["workflow_id"]].add(row["date"])
+
+    start = start.replace(minute=0, second=0, microsecond=0)
+    current = start
+    while current < end:
+        for workflow_id, dates in seen_dates.items():
+            if current not in dates:
+                data[workflow_id].append({"date": current.isoformat(), "avg_duration": None, "max_duration": None})
+        current += timedelta(hours=1)
 
     workflow_names = {
         workflow["id"]: workflow["name"]
-        for workflow in AppWorkflowConfig.objects.filter(id__in=seen_workflows).values("id", "name")
+        for workflow in AppWorkflowConfig.objects.filter(id__in=list(data)).values("id", "name")
     }
-    for workflow_data in data:
-        workflow_data["label"] = workflow_names[workflow_data["key"]]
-    return data
+    return [
+        {
+            "key": workflow_id,
+            "label": workflow_names[workflow_id],
+            "values": sorted(data, key=lambda x: x["date"])
+        }
+        for workflow_id, data in data.items()
+    ]
 
 
 def get_status_data(domain, start, end, workflow_id=None):
diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
index 0348fee4062d..54fd33b2b3eb 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
@@ -24,7 +24,7 @@ hqDefine("app_execution/js/workflow_charts", [
     }
 
     function setupTimingChart(data, includeSeries) {
-        const timingSeries = data.flatMap((series) => getSeries(series, includeSeries));
+        const timingSeries = data.timing.flatMap((series) => getSeries(series, includeSeries));
         nv.addGraph(function () {
             let chart = nv.models.lineChart()
                 .showYAxis(true)
@@ -62,7 +62,7 @@ hqDefine("app_execution/js/workflow_charts", [
             "Success": "#6dcc66",
             "Error": "#f44",
         };
-        data = data.map((series) => {
+        let seriesData = data.status.map((series) => {
             return {
                 key: series.key,
                 values: series.values.map((item) => {
@@ -91,7 +91,7 @@ hqDefine("app_execution/js/workflow_charts", [
                 });
 
             d3.select('#status_barchart svg')
-                .datum(data)
+                .datum(seriesData)
                 .call(chart);
 
             nv.utils.windowResize(chart.update);
@@ -100,10 +100,9 @@ hqDefine("app_execution/js/workflow_charts", [
     }
 
     $(document).ready(function () {
-        const timingData = JSON.parse(document.getElementById('timing_chart_data').textContent);
-        const statusData = JSON.parse(document.getElementById('status_chart_data').textContent);
+        const data = JSON.parse(document.getElementById('chart_data').textContent);
         const includeSeries = JSON.parse(document.getElementById('timingSeries').textContent);
-        setupTimingChart(timingData, includeSeries);
-        setupStatusChart(statusData);
+        setupTimingChart(data, includeSeries);
+        setupStatusChart(data);
     });
 });
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
index 64fea39c4475..52585f63f37c 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
@@ -71,8 +71,7 @@ <h4 class="text-center">{% trans "Status" %}</h4>
   </tbody>
 </table>
 
-{{ timing_chart_data|json_script:"timing_chart_data" }}
-{{ status_chart_data|json_script:"status_chart_data" }}
+{{ chart_data|json_script:"chart_data" }}
 <script id="timingSeries" type="application/json">
   [{"label": "", "key": "avg_duration"}]
 </script>
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
index 693d10041122..40888a38bdc0 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
@@ -56,8 +56,7 @@ <h4 class="text-center">{% trans "Log Status" %}</h4>
     <pagination data-apply-bindings="false"
                 params="goToPage: goToPage, totalItems: totalItems, perPage: perPage, onLoad: onLoad"></pagination>
 </div>
-{{ timing_chart_data|json_script:"timing_chart_data" }}
-{{ status_chart_data|json_script:"status_chart_data" }}
+{{ chart_data|json_script:"chart_data" }}
 <script id="timingSeries" type="application/json">
   [{"label": "- Avg Timings", "key": "avg_duration"}, {"label": "- Max Timings", "key": "max_duration"}]
 </script>
diff --git a/corehq/apps/app_execution/views.py b/corehq/apps/app_execution/views.py
index b13a6dc49dfb..73f42877683a 100644
--- a/corehq/apps/app_execution/views.py
+++ b/corehq/apps/app_execution/views.py
@@ -30,8 +30,10 @@ def workflow_list(request, domain):
         "Automatically Executed App Workflows",
         reverse("app_execution:workflow_list", args=[domain]),
         workflows=workflows,
-        timing_chart_data=get_avg_duration_data(domain, start=start, end=utcnow),
-        status_chart_data=get_status_data(domain, start=start, end=utcnow)
+        chart_data={
+            "timing": get_avg_duration_data(domain, start=start, end=utcnow),
+            "status": get_status_data(domain, start=start, end=utcnow),
+        }
     )
     return render(request, "app_execution/workflow_list.html", context)
 
@@ -174,8 +176,10 @@ def workflow_log_list(request, domain, pk):
         add_parent=True,
         workflow=AppWorkflowConfig.objects.get(id=pk),
         total=AppExecutionLog.objects.filter(workflow__domain=domain, workflow_id=pk).count(),
-        timing_chart_data=get_avg_duration_data(domain, start=start, end=utcnow, workflow_id=pk),
-        status_chart_data=get_status_data(domain, start=start, end=utcnow, workflow_id=pk),
+        chart_data={
+            "timing": get_avg_duration_data(domain, start=start, end=utcnow, workflow_id=pk),
+            "status": get_status_data(domain, start=start, end=utcnow, workflow_id=pk),
+        }
     )
     return render(request, "app_execution/workflow_log_list.html", context)
 

From 746883239be66aac5661980194d2af6cc7b5d8cd Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Tue, 28 May 2024 17:31:55 +0200
Subject: [PATCH 20/63] add filters to log view

---
 .../static/app_execution/js/workflow_logs.js  | 24 +++++++++++++++++-
 .../app_execution/workflow_log_list.html      | 17 +++++++++++++
 corehq/apps/app_execution/views.py            | 25 ++++++++++++++++---
 corehq/apps/registry/views.py                 | 18 +++----------
 corehq/util/view_utils.py                     | 12 +++++++++
 5 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
index 0e6cb6dcf28b..8488c8c5dc51 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
@@ -2,27 +2,49 @@ hqDefine("app_execution/js/workflow_logs", [
     'jquery',
     'knockout',
     'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/tempus_dominus',,
     'app_execution/js/workflow_charts',
     'hqwebapp/js/bootstrap5/components.ko',
-], function ($, ko, initialPageData) {
+], function ($, ko, initialPageData, hqTempusDominus) {
     let logsModel = function () {
         let self = {};
 
+        self.statusFilter = ko.observable("");
+        let allDatesText = gettext("Show All Dates");
+        self.dateRange = ko.observable(allDatesText);
         self.items = ko.observableArray();
         self.totalItems = ko.observable(initialPageData.get('total_items'));
         self.perPage = ko.observable(25);
         self.goToPage = function (page) {
             let params = {page: page, per_page: self.perPage()};
             const url = initialPageData.reverse('app_execution:logs_json');
+            if (self.statusFilter()) {
+                params.status = self.statusFilter();
+            }
+            if (self.dateRange() && self.dateRange() !== allDatesText) {
+                const separator = hqTempusDominus.getDateRangeSeparator(),
+                    dates = self.dateRange().split(separator);
+                params.startDate = dates[0];
+                params.endDate = dates[1] || dates[0];
+            }
             $.getJSON(url, params, function (data) {
                 self.items(data.logs);
             });
         };
 
+        self.filter = ko.computed(() => {
+            self.statusFilter();
+            if (self.dateRange().includes(hqTempusDominus.getDateRangeSeparator())) {
+                self.goToPage(1);
+            }
+        }).extend({throttle: 500});
+
         self.onLoad = function () {
             self.goToPage(1);
         };
 
+        hqTempusDominus.createDefaultDateRangePicker(document.getElementById('id_date_range'));
+
         return self;
     };
 
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
index 40888a38bdc0..6552e6ec4bfc 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
@@ -9,6 +9,10 @@
           rel="stylesheet"
           media="all"
           href="{% static 'nvd3-1.8.6/build/nv.d3.css' %}" />
+    <link type="text/css"
+              rel="stylesheet"
+              media="screen"
+              href="{% static "@eonasdan/tempus-dominus/dist/css/tempus-dominus.min.css" %}" />
   {% endcompress %}
 {% endblock %}
 
@@ -30,6 +34,19 @@ <h4 class="text-center">{% trans "Log Status" %}</h4>
     </div>
   </div>
   <div id="workflow-logs">
+    <div class="row">
+      <label for="status" class="col-sm-1 col-form-label">Filter</label>
+      <div class="col col-sm-3">
+        <select class="form-select" name="status" data-bind="value: statusFilter">
+          <option value="">All Status</option>
+          <option value="success">Success</option>
+          <option value="error">Error</option>
+        </select>
+      </div>
+      <div class="col col-sm-3">
+        <input type="text" name="date_range" class="form-control" id="id_date_range" data-bind="value: dateRange">
+      </div>
+    </div>
     <table class="table table-striped table-hover">
     <thead>
     <tr>
diff --git a/corehq/apps/app_execution/views.py b/corehq/apps/app_execution/views.py
index 73f42877683a..b3b33fa87d16 100644
--- a/corehq/apps/app_execution/views.py
+++ b/corehq/apps/app_execution/views.py
@@ -16,6 +16,8 @@
 from corehq.apps.app_execution.models import AppExecutionLog, AppWorkflowConfig
 from corehq.apps.domain.decorators import require_superuser_or_contractor
 from corehq.apps.hqwebapp.decorators import use_bootstrap5
+from corehq.util.timezones.utils import get_timezone_for_user
+from corehq.util.view_utils import get_date_param
 
 
 @require_superuser_or_contractor
@@ -179,7 +181,7 @@ def workflow_log_list(request, domain, pk):
         chart_data={
             "timing": get_avg_duration_data(domain, start=start, end=utcnow, workflow_id=pk),
             "status": get_status_data(domain, start=start, end=utcnow, workflow_id=pk),
-        }
+        },
     )
     return render(request, "app_execution/workflow_log_list.html", context)
 
@@ -187,12 +189,27 @@ def workflow_log_list(request, domain, pk):
 @require_superuser_or_contractor
 @use_bootstrap5
 def workflow_logs_json(request, domain, pk):
+    status = request.GET.get('status', None)
     limit = int(request.GET.get('per_page', 10))
     page = int(request.GET.get('page', 1))
     skip = limit * (page - 1)
-    logs = AppExecutionLog.objects.filter(
-        workflow__domain=domain, workflow_id=pk
-    ).order_by("-started")[skip:skip + limit]
+
+    timezone = get_timezone_for_user(request.couch_user, domain)
+    try:
+        start_date = get_date_param(request, 'startDate', timezone=timezone)
+        end_date = get_date_param(request, 'endDate', timezone=timezone)
+    except ValueError:
+        return JsonResponse({"error": "Invalid date parameter"})
+
+    query = AppExecutionLog.objects.filter(workflow__domain=domain, workflow_id=pk)
+    if status:
+        query = query.filter(success=status == "success")
+    if start_date:
+        query = query.filter(started__gte=start_date)
+    if end_date:
+        query = query.filter(started__lte=datetime.combine(end_date, datetime.max.time()))
+
+    logs = query.order_by("-started")[skip:skip + limit]
     return JsonResponse({
         "logs": [
             {
diff --git a/corehq/apps/registry/views.py b/corehq/apps/registry/views.py
index 42e9ae05849e..321a18c3750d 100644
--- a/corehq/apps/registry/views.py
+++ b/corehq/apps/registry/views.py
@@ -1,6 +1,5 @@
 import json
 from collections import Counter
-from datetime import datetime
 
 from django.contrib import messages
 from django.db.models import Q
@@ -24,9 +23,9 @@
     manage_all_registries_required,
     RegistryPermissionCheck,
 )
-from corehq.util.timezones.conversions import ServerTime, UserTime
+from corehq.util.timezones.conversions import ServerTime
 from corehq.util.timezones.utils import get_timezone_for_user
-from dimagi.utils.parsing import ISO_DATE_FORMAT
+from corehq.util.view_utils import get_date_param
 
 
 @manage_some_registries_required
@@ -393,8 +392,8 @@ def registry_audit_logs(request, domain, registry_slug):
 
     timezone = get_timezone_for_user(request.couch_user, domain)
     try:
-        start_date = _get_date_param(request, 'startDate', timezone=timezone)
-        end_date = _get_date_param(request, 'endDate', timezone=timezone)
+        start_date = get_date_param(request, 'startDate', timezone=timezone)
+        end_date = get_date_param(request, 'endDate', timezone=timezone)
     except ValueError:
         return JsonResponse({"error": "Invalid date parameter"})
 
@@ -411,12 +410,3 @@ def registry_audit_logs(request, domain, registry_slug):
         "total": helper.get_total(),
         "logs": logs
     })
-
-
-def _get_date_param(request, param_name, timezone=None):
-    param = request.GET.get(param_name) or None
-    if param:
-        value = datetime.strptime(param, ISO_DATE_FORMAT)
-        if timezone:
-            value = UserTime(value, tzinfo=timezone).server_time().done()
-        return value
diff --git a/corehq/util/view_utils.py b/corehq/util/view_utils.py
index eb4229ef906c..dbe42cee3bed 100644
--- a/corehq/util/view_utils.py
+++ b/corehq/util/view_utils.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import traceback
+from datetime import datetime
 from functools import wraps
 
 from django import http
@@ -10,7 +11,9 @@
 from django.urls import reverse as _reverse
 from django.utils.http import urlencode
 
+from corehq.util.timezones.conversions import UserTime
 from dimagi.utils.logging import notify_exception
+from dimagi.utils.parsing import ISO_DATE_FORMAT
 from dimagi.utils.web import get_url_base
 
 from corehq.util import global_request
@@ -193,3 +196,12 @@ def is_ajax(request):
     https://docs.djangoproject.com/en/4.0/releases/3.1/#id2
     """
     return request.headers.get('x-requested-with') == 'XMLHttpRequest'
+
+
+def get_date_param(request, param_name, timezone=None):
+    param = request.GET.get(param_name) or None
+    if param:
+        value = datetime.strptime(param, ISO_DATE_FORMAT)
+        if timezone:
+            value = UserTime(value, tzinfo=timezone).server_time().done()
+        return value

From d700ce117b8e08cc4214996af9d5000e2804576e Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Thu, 30 May 2024 11:58:20 +0200
Subject: [PATCH 21/63] extract function

---
 .../app_execution/js/workflow_charts.js       | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
index 54fd33b2b3eb..a834cdfdbc49 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
@@ -23,24 +23,31 @@ hqDefine("app_execution/js/workflow_charts", [
         });
     }
 
+    function buildChart(yLabel) {
+        let chart = nv.models.lineChart()
+            .showYAxis(true)
+            .showXAxis(true);
+
+        chart.yAxis
+            .axisLabel(yLabel);
+        chart.forceY(0);
+        chart.xScale(d3.time.scale());
+        chart.margin({left: 80, bottom: 100});
+        chart.xAxis.rotateLabels(-45)
+            .tickFormat(function (d) {
+                return moment(d).format("MMM DD [@] HH");
+            });
+
+        nv.utils.windowResize(chart.update);
+        return chart;
+    }
+
     function setupTimingChart(data, includeSeries) {
         const timingSeries = data.timing.flatMap((series) => getSeries(series, includeSeries));
-        nv.addGraph(function () {
-            let chart = nv.models.lineChart()
-                .showYAxis(true)
-                .showXAxis(true);
-
-            chart.yAxis
-                .axisLabel('Seconds')
-                .tickFormat(d3.format(".1f"));
-            chart.forceY(0);
-            chart.xScale(d3.time.scale());
-            chart.margin({left: 80, bottom: 100});
-            chart.xAxis.rotateLabels(-45)
-                .tickFormat(function (d) {
-                    return moment(d).format("MMM DD [@] HH");
-                });
 
+        nv.addGraph(() => {
+            let chart = buildChart(gettext("Seconds"));
+            chart.yAxis.tickFormat(d3.format(".1f"));
             // remove the key from the label
             chart.legend.key((d) => d.key.split("[")[0]);
             chart.tooltip.keyFormatter((d) => {
@@ -51,10 +58,8 @@ hqDefine("app_execution/js/workflow_charts", [
                 .datum(timingSeries)
                 .call(chart);
 
-            nv.utils.windowResize(chart.update);
             return chart;
         });
-
     }
 
     function setupStatusChart(data) {
@@ -75,26 +80,13 @@ hqDefine("app_execution/js/workflow_charts", [
             };
         });
 
-        nv.addGraph(function () {
-            let chart = nv.models.lineChart()
-                .showYAxis(true)
-                .showXAxis(true);
-
-            chart.yAxis
-                .axisLabel('Count');
-            chart.forceY(0);
-            chart.xScale(d3.time.scale());
-            chart.margin({left: 80, bottom: 100});
-            chart.xAxis.rotateLabels(-45)
-                .tickFormat(function (d) {
-                    return moment(d).format("MMM DD [@] HH");
-                });
+        nv.addGraph(() => {
+            let chart = buildChart(gettext("Chart"));
 
             d3.select('#status_barchart svg')
                 .datum(seriesData)
                 .call(chart);
 
-            nv.utils.windowResize(chart.update);
             return chart;
         });
     }

From c9962c2db6615b757cfdf718b04773cc7f5bd036 Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Thu, 30 May 2024 12:20:47 +0200
Subject: [PATCH 22/63] translations

---
 corehq/apps/app_execution/forms.py            | 22 ++++++++-------
 corehq/apps/app_execution/models.py           | 14 +++++-----
 .../app_execution/components/logs.html        |  7 ++---
 .../app_execution/workflow_list.html          | 18 ++++++-------
 .../templates/app_execution/workflow_log.html | 18 +++++++------
 .../app_execution/workflow_log_list.html      | 27 ++++++++++---------
 .../app_execution/workflow_test.html          | 11 +++++---
 corehq/apps/app_execution/views.py            | 23 +++++++++-------
 8 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/corehq/apps/app_execution/forms.py b/corehq/apps/app_execution/forms.py
index 84bfc94258d2..4d5e7c491682 100644
--- a/corehq/apps/app_execution/forms.py
+++ b/corehq/apps/app_execution/forms.py
@@ -13,10 +13,10 @@
 
 
 class AppWorkflowConfigForm(forms.ModelForm):
-    run_every = forms.IntegerField(min_value=1, required=False, label="Run Every (minutes)")
-    username = forms.CharField(max_length=255, label="Username",
-                               help_text="Username of the user to run the workflow")
-    har_file = forms.FileField(label="HAR File", required=False)
+    run_every = forms.IntegerField(min_value=1, required=False, label=_("Run Every (minutes)"))
+    username = forms.CharField(max_length=255, label=_("Username"),
+                               help_text=_("Username of the user to run the workflow"))
+    har_file = forms.FileField(label=_("HAR File"), required=False)
 
     class Meta:
         model = AppWorkflowConfig
@@ -52,6 +52,7 @@ def __init__(self, request, *args, **kwargs):
         if request.user.is_superuser:
             fields += ["run_every", "notification_emails"]
 
+        har_help = _("HAR file recording should start with the selection of the app (navigate_menu_start).")
         self.helper.layout = crispy.Layout(
             crispy.Div(
                 crispy.Div(
@@ -59,23 +60,22 @@ def __init__(self, request, *args, **kwargs):
                     css_class="col",
                 ),
                 crispy.Div(
-                    crispy.HTML("<p>HAR file recording should start with the "
-                                "selection of the app (navigate_menu_start).</p>"),
+                    crispy.HTML(f"<p>{har_help}</p>"),
                     "har_file",
                     twbscrispy.StrictButton(
-                        "Populate workflow from HAR file",
+                        _("Populate workflow from HAR file"),
                         type='submit', css_class='btn-secondary', name="import_har", value="1",
                         formnovalidate=True,
                     ),
                     crispy.HTML("<p>&nbsp;</p>"),
-                    crispy.HTML("<p>Workflow:</p>"),
+                    crispy.HTML(f"<p>{_('Workflow:')}</p>"),
                     InlineField("workflow"),
                     css_class="col"
                 ),
                 css_class="row mb-3"
             ),
             hqcrispy.FormActions(
-                twbscrispy.StrictButton("Save", type='submit', css_class='btn-primary')
+                twbscrispy.StrictButton(_("Save"), type='submit', css_class='btn-primary')
             ),
         )
 
@@ -98,7 +98,9 @@ def clean_app_id(self):
         try:
             get_brief_app(domain, app_id)
         except NoResultFound:
-            raise forms.ValidationError(f"App not found in domain: {domain}:{app_id}")
+            raise forms.ValidationError(_("App not found in domain: {domain}:{app_id}").format(
+                domain=domain, app_id=app_id
+            ))
 
         return app_id
 
diff --git a/corehq/apps/app_execution/models.py b/corehq/apps/app_execution/models.py
index 12f716cae364..0a75457267b9 100644
--- a/corehq/apps/app_execution/models.py
+++ b/corehq/apps/app_execution/models.py
@@ -11,6 +11,7 @@
 from corehq.apps.app_manager.dbaccessors import get_brief_app
 from corehq.sql_db.functions import MakeInterval
 from corehq.util.jsonattrs import AttrsObject
+from django.utils.translation import gettext_lazy
 
 
 class AppWorkflowManager(models.Manager):
@@ -23,9 +24,9 @@ def get_due(self):
 
 class AppWorkflowConfig(models.Model):
     FORM_MODE_CHOICES = [
-        (const.FORM_MODE_HUMAN, "Human: Answer each question individually and submit form"),
-        (const.FORM_MODE_NO_SUBMIT, "No Submit: Answer all questions but don't submit the form"),
-        (const.FORM_MODE_IGNORE, "Ignore: Do not complete or submit forms"),
+        (const.FORM_MODE_HUMAN, gettext_lazy("Human: Answer each question individually and submit form")),
+        (const.FORM_MODE_NO_SUBMIT, gettext_lazy("No Submit: Answer all questions but don't submit the form")),
+        (const.FORM_MODE_IGNORE, gettext_lazy("Ignore: Do not complete or submit forms")),
     ]
     name = models.CharField(max_length=255)
     domain = models.CharField(max_length=255)
@@ -34,11 +35,12 @@ class AppWorkflowConfig(models.Model):
     django_user = models.ForeignKey(User, on_delete=models.CASCADE)
     workflow = AttrsObject(AppWorkflow)
     form_mode = models.CharField(max_length=255, choices=FORM_MODE_CHOICES)
-    sync_before_run = models.BooleanField(default=False, help_text="Sync user data before running")
-    run_every = models.IntegerField(help_text="Number of minutes between runs", null=True, blank=True)
+    sync_before_run = models.BooleanField(default=False, help_text=gettext_lazy("Sync user data before running"))
+    run_every = models.IntegerField(
+        help_text=gettext_lazy("Number of minutes between runs"), null=True, blank=True)
     last_run = models.DateTimeField(null=True, blank=True)
     notification_emails = ArrayField(
-        models.EmailField(), default=list, help_text="Emails to notify on failure", blank=True
+        models.EmailField(), default=list, help_text=gettext_lazy("Emails to notify on failure"), blank=True
     )
 
     objects = AppWorkflowManager()
diff --git a/corehq/apps/app_execution/templates/app_execution/components/logs.html b/corehq/apps/app_execution/templates/app_execution/components/logs.html
index 254a40b02d93..a0d174af09ca 100644
--- a/corehq/apps/app_execution/templates/app_execution/components/logs.html
+++ b/corehq/apps/app_execution/templates/app_execution/components/logs.html
@@ -1,19 +1,20 @@
+{% load i18n %}
 <div class="row">
   <div class="col">
     <h3>Logs</h3>
     <pre class="text-bg-light border rounded-3 p-3">{{ output }}</pre>
     {% if success %}
       <div class="text-bg-success p-3">
-        <strong>Success</strong>
+        <strong>{% trans "Success" %}</strong>
       </div>
     {% else %}
       <div class="text-bg-danger p-3">
-        <strong>Error:</strong> {{ error }}
+        <strong>{% trans "Error:" %}</strong> {{ error }}
       </div>
     {% endif %}
   </div>
   <div class="col">
-    <h3>Workflow</h3>
+    <h3>{% trans "Workflow" %}</h3>
     <pre class="text-bg-light border rounded-3 p-3">{{ workflow_json }}</pre>
   </div>
 </div>
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
index 52585f63f37c..6bf5333247fa 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
@@ -31,11 +31,11 @@ <h4 class="text-center">{% trans "Status" %}</h4>
   <table class="table table-striped table-hover">
   <thead>
   <tr>
-    <th>Name</th>
-    <th>App Name</th>
-    <th>User</th>
-    <th>Last Run</th>
-    <th>Last 10 Runs</th>
+    <th>{% translate 'Name' %}</th>
+    <th>{% translate 'App Name' %}</th>
+    <th>{% translate 'User' %}</th>
+    <th>{% translate 'Last Run' %}</th>
+    <th>{% translate 'Last 10 Runs' %}</th>
     <th></th>
   </tr>
   </thead>
@@ -60,10 +60,10 @@ <h4 class="text-center">{% trans "Status" %}</h4>
       </div>
     </td>
     <td>
-      <div class="btn-group" role="group" aria-label="Actions">
-        <a class="btn btn-outline-primary" href="{% url "app_execution:test_workflow" request.domain workflow.id %}">Test</a>
-        <a class="btn btn-outline-primary" href="{% url "app_execution:workflow_logs" request.domain workflow.id %}">Logs</a>
-        <a class="btn btn-outline-primary" href="{% url "app_execution:delete_workflow" request.domain workflow.id %}">Delete</a>
+      <div class="btn-group" role="group" aria-label="{% trans "Actions" %}">
+        <a class="btn btn-outline-primary" href="{% url "app_execution:test_workflow" request.domain workflow.id %}">{% translate 'Test' %}</a>
+        <a class="btn btn-outline-primary" href="{% url "app_execution:workflow_logs" request.domain workflow.id %}">{% translate 'Logs' %}</a>
+        <a class="btn btn-outline-primary" href="{% url "app_execution:delete_workflow" request.domain workflow.id %}">{% translate 'Delete' %}</a>
       </div>
     </td>
   </tr>
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_log.html b/corehq/apps/app_execution/templates/app_execution/workflow_log.html
index 9dd7e9d676c9..0114ee840793 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_log.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_log.html
@@ -2,17 +2,19 @@
 {% load i18n %}
 {% block page_content %}
   <div class="mb-3">
-    <h2>Workflow Execution Log for {{ log.config.name }}: {{ log.started|date }}</h2>
-    <a class='btn btn-primary' href="{% url 'app_execution:edit_workflow' request.domain log.workflow_id %}">Edit Workflow</a>
+    <h2>{% blocktrans with workflow_name=log.config.name date=log.started|date %}
+      Workflow Execution Log for {{ workflow_name }}: {{ date }}
+    {% endblocktrans %}</h2>
+    <a class='btn btn-primary' href="{% url 'app_execution:edit_workflow' request.domain log.workflow_id %}">{% translate 'Edit Workflow' %}</a>
   </div>
-  <h3>Details</h3>
+  <h3>{% translate 'Details' %}</h3>
   <p>
   <ul>
-    <li>Started: {{ log.started|date:"DATETIME_FORMAT" }}</li>
-    <li>Ended: {{ log.completed|date:"DATETIME_FORMAT" }}</li>
-    <li>Duration: {{ log.duration }}</li>
-    <li>Status: <span class="badge {% if log.success %}text-bg-success{% else %}text-bg-danger{% endif %}">
-      {% if log.success %}Success{% else %}Error{% endif %}
+    <li>{% blocktrans with date_started=log.started|date:"DATETIME_FORMAT" %}Started: {{ date_started }}{% endblocktrans %}</li>
+    <li>{% blocktrans with date_ended=log.completed|date:"DATETIME_FORMAT" %}Ended: {{ date_ended }}{% endblocktrans %}</li>
+    <li>{% blocktrans with duration=log.duration %}Duration: {{ duration }}{% endblocktrans %}</li>
+    <li>{% translate 'Status:' %} <span class="badge {% if log.success %}text-bg-success{% else %}text-bg-danger{% endif %}">
+      {% if log.success %}{% translate 'Success' %}{% else %}{% translate 'Error' %}{% endif %}
     </span></li>
   </ul>
   </p>
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
index 6552e6ec4bfc..9cb34e8c8041 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
@@ -22,25 +22,25 @@
   {% initial_page_data 'total_items' total %}
   {% registerurl "app_execution:logs_json" request.domain workflow.id %}
 
-  <h2>Logs for workflow "<a href="{% url "app_execution:edit_workflow" request.domain workflow.id %}">{{ workflow.name }}</a>"</h2>
+  <h2>{% translate 'Logs for workflow' %} "<a href="{% url "app_execution:edit_workflow" request.domain workflow.id %}">{{ workflow.name }}</a>"</h2>
   <div class="row">
     <div id="timing_linechart" class="col">
-      <h4 class="text-center">{% trans "Average Timings" %}</h4>
+      <h4 class="text-center">{% translate "Average Timings" %}</h4>
       <svg height="300px"></svg>
     </div>
     <div id="status_barchart" class="col">
-      <h4 class="text-center">{% trans "Log Status" %}</h4>
+      <h4 class="text-center">{% translate "Log Status" %}</h4>
       <svg height="300px"></svg>
     </div>
   </div>
   <div id="workflow-logs">
     <div class="row">
-      <label for="status" class="col-sm-1 col-form-label">Filter</label>
+      <label for="status" class="col-sm-1 col-form-label">{% translate 'Filter' %}</label>
       <div class="col col-sm-3">
         <select class="form-select" name="status" data-bind="value: statusFilter">
-          <option value="">All Status</option>
-          <option value="success">Success</option>
-          <option value="error">Error</option>
+          <option value="">{% translate 'All Status' %}</option>
+          <option value="success">{% translate 'Success' %}</option>
+          <option value="error">{% translate 'Error' %}</option>
         </select>
       </div>
       <div class="col col-sm-3">
@@ -50,9 +50,9 @@ <h4 class="text-center">{% trans "Log Status" %}</h4>
     <table class="table table-striped table-hover">
     <thead>
     <tr>
-      <th>Status</th>
-      <th>Started</th>
-      <th>Duration</th>
+      <th>{% translate 'Status' %}</th>
+      <th>{% translate 'Started' %}</th>
+      <th>{% translate 'Duration' %}</th>
       <th></th>
     </tr>
     </thead>
@@ -66,7 +66,7 @@ <h4 class="text-center">{% trans "Log Status" %}</h4>
       </span></td>
       <td data-bind="text: started"></td>
       <td data-bind="text: duration"></td>
-      <td><a class="btn btn-primary" data-bind="attr: {href: url}">Details</a></td>
+      <td><a class="btn btn-primary" data-bind="attr: {href: url}">{% translate 'Details' %}</a></td>
     </tr>
     </tbody>
     </table>
@@ -75,6 +75,9 @@ <h4 class="text-center">{% trans "Log Status" %}</h4>
 </div>
 {{ chart_data|json_script:"chart_data" }}
 <script id="timingSeries" type="application/json">
-  [{"label": "- Avg Timings", "key": "avg_duration"}, {"label": "- Max Timings", "key": "max_duration"}]
+  [
+    {"label": "- {% translate 'Avg Timings' %}", "key": "avg_duration"},
+    {"label": "- {% translate 'Max Timings' %}", "key": "max_duration"}
+  ]
 </script>
 {% endblock %}
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_test.html b/corehq/apps/app_execution/templates/app_execution/workflow_test.html
index 727dcb7be21c..3ac915e0568c 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_test.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_test.html
@@ -14,15 +14,18 @@
 {% endblock %}
 {% block page_content %}
   <div class="mb-3">
-    <h2>Testing {{ workflow.name }}</h2>
-    <a class='btn btn-primary' href="{% url 'app_execution:edit_workflow' request.domain workflow.id %}">Edit</a>
+    <h2>{% blocktrans with name=workflow.name %}Testing {{ name }}{% endblocktrans %}</h2>
+    <a class='btn btn-primary' href="{% url 'app_execution:edit_workflow' request.domain workflow.id %}">{% translate 'Edit' %}</a>
   </div>
   {% if result %}
     {% include "app_execution/components/logs.html" %}
   {% endif %}
   <form method="post" class="mt-3">
     {% csrf_token %}
-    <button id="submit-button" type="submit" class="btn btn-primary" data-loading-text="Running...">
-      Run {% if result %}Again{% endif %}</button>
+    <button id="submit-button" type="submit" class="btn btn-primary" data-loading-text="{% translate 'Running...' %}">
+      {% if result %}{% translate 'Run Again' %}
+      {% else %}{% translate 'Run' %}
+      {% endif %}
+    </button>
   </form>
 {% endblock %}
diff --git a/corehq/apps/app_execution/views.py b/corehq/apps/app_execution/views.py
index b3b33fa87d16..ff8e8c9aa96d 100644
--- a/corehq/apps/app_execution/views.py
+++ b/corehq/apps/app_execution/views.py
@@ -18,6 +18,7 @@
 from corehq.apps.hqwebapp.decorators import use_bootstrap5
 from corehq.util.timezones.utils import get_timezone_for_user
 from corehq.util.view_utils import get_date_param
+from django.utils.translation import gettext as _
 
 
 @require_superuser_or_contractor
@@ -29,7 +30,7 @@ def workflow_list(request, domain):
     start = utcnow - relativedelta(months=1)
     context = _get_context(
         request,
-        "Automatically Executed App Workflows",
+        _("Automatically Executed App Workflows"),
         reverse("app_execution:workflow_list", args=[domain]),
         workflows=workflows,
         chart_data={
@@ -77,8 +78,11 @@ def new_workflow(request, domain):
                 return redirect("app_execution:workflow_list", domain)
 
     context = _get_context(
-        request, "New App Workflow", reverse("app_execution:new_workflow", args=[domain]),
-        add_parent=True, form=form
+        request,
+        _("New App Workflow"),
+        reverse("app_execution:new_workflow", args=[domain]),
+        add_parent=True,
+        form=form
     )
     return render(request, "app_execution/workflow_form.html", context)
 
@@ -95,14 +99,15 @@ def edit_workflow(request, domain, pk):
         if import_har and har_file:
             form = _get_form_from_har(har_file.read(), request, instance=config)
         elif har_file:
-            messages.error(request, "You must use the 'Import HAR' button to upload a HAR file.")
+            messages.error(request, _("You must use the 'Import HAR' button to upload a HAR file."))
         else:
             if form.is_valid():
                 form.save()
                 return redirect("app_execution:workflow_list", domain)
 
     context = _get_context(
-        request, f"Edit App Workflow: {config.name}", reverse("app_execution:edit_workflow", args=[domain, pk]),
+        request, _("Edit App Workflow: {name}").format(name=config.name),
+        reverse("app_execution:edit_workflow", args=[domain, pk]),
         add_parent=True, form=form
     )
     return render(request, "app_execution/workflow_form.html", context)
@@ -116,7 +121,7 @@ def _get_form_from_har(har_data_string, request, instance=None):
         post_data["app_id"] = config.app_id
         post_data["workflow"] = AppWorkflowConfig.workflow_object_to_json_string(config.workflow)
     except Exception as e:
-        messages.error(request, "Unable to process HAR file: " + str(e))
+        messages.error(request, _("Unable to process HAR file: {error}").format(error=str(e)))
 
     return AppWorkflowConfigForm(request, post_data, instance=instance)
 
@@ -173,7 +178,7 @@ def workflow_log_list(request, domain, pk):
     start = utcnow - relativedelta(months=1)
     context = _get_context(
         request,
-        "Automatically Executed App Workflow Logs",
+        _("Automatically Executed App Workflow Logs"),
         reverse("app_execution:workflow_logs", args=[domain, pk]),
         add_parent=True,
         workflow=AppWorkflowConfig.objects.get(id=pk),
@@ -199,7 +204,7 @@ def workflow_logs_json(request, domain, pk):
         start_date = get_date_param(request, 'startDate', timezone=timezone)
         end_date = get_date_param(request, 'endDate', timezone=timezone)
     except ValueError:
-        return JsonResponse({"error": "Invalid date parameter"})
+        return JsonResponse({"error": _("Invalid date parameter")})
 
     query = AppExecutionLog.objects.filter(workflow__domain=domain, workflow_id=pk)
     if status:
@@ -233,7 +238,7 @@ def workflow_log(request, domain, pk):
         request, "app_execution/workflow_log.html",
         _get_context(
             request,
-            f"Workflow Log: {log.workflow.name}",
+            _("Workflow Log: {name}").format(name=log.workflow.name),
             reverse("app_execution:workflow_log", args=[domain, pk]),
             add_parent=True,
             log=log,

From f776a2cb429595976d05dd01d29dc1cb4dab1c95 Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Thu, 30 May 2024 13:15:33 +0200
Subject: [PATCH 23/63] sidebar navigation

---
 corehq/tabs/tabclasses.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/corehq/tabs/tabclasses.py b/corehq/tabs/tabclasses.py
index e4a93fa12b3a..46fe52702606 100644
--- a/corehq/tabs/tabclasses.py
+++ b/corehq/tabs/tabclasses.py
@@ -1134,6 +1134,40 @@ def dropdown_items(self):
 
         return submenu_context
 
+    @property
+    @memoized
+    def sidebar_items(self):
+        return [
+            (_("Application Test Flows"), [
+                {
+                    'title': "Workflow List",
+                    'url': reverse("app_execution:workflow_list", args=[self.domain]),
+                    'subpages': [
+                        {
+                            'title': _("New"),
+                            'urlname': "new_workflow",
+                        },
+                        {
+                            'title': _("Edit"),
+                            'urlname': "edit_workflow",
+                        },
+                        {
+                            'title': _("Run"),
+                            'urlname': "test_workflow",
+                        },
+                        {
+                            'title': _("Logs"),
+                            'urlname': "workflow_logs",
+                        },
+                        {
+                            'title': _("Log Details"),
+                            'urlname': "workflow_log",
+                        },
+                    ],
+                },
+            ]),
+        ]
+
     @property
     def _is_viewable(self):
         couch_user = self.couch_user

From 935455fe0b58095405c88dac2700f3ca29be705b Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Thu, 30 May 2024 13:37:43 +0200
Subject: [PATCH 24/63] responsive graph layout

---
 .../app_execution/templates/app_execution/workflow_list.html  | 2 +-
 .../templates/app_execution/workflow_log_list.html            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
index 6bf5333247fa..a8a9f7555658 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_list.html
@@ -18,7 +18,7 @@
   <div>
     <a class='btn btn-primary' href="{% url 'app_execution:new_workflow' request.domain %}">Create New</a>
   </div>
-  <div class="row">
+  <div class="row row-cols-lg-1 row-cols-xl-2">
     <div id="timing_linechart" class="col">
       <h4 class="text-center">{% trans "Average Timings" %}</h4>
       <svg height="300px"></svg>
diff --git a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
index 9cb34e8c8041..e36a2100ab8d 100644
--- a/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
+++ b/corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
@@ -23,7 +23,7 @@
   {% registerurl "app_execution:logs_json" request.domain workflow.id %}
 
   <h2>{% translate 'Logs for workflow' %} "<a href="{% url "app_execution:edit_workflow" request.domain workflow.id %}">{{ workflow.name }}</a>"</h2>
-  <div class="row">
+  <div class="row row-cols-lg-1 row-cols-xl-2">
     <div id="timing_linechart" class="col">
       <h4 class="text-center">{% translate "Average Timings" %}</h4>
       <svg height="300px"></svg>
@@ -34,7 +34,7 @@ <h4 class="text-center">{% translate "Log Status" %}</h4>
     </div>
   </div>
   <div id="workflow-logs">
-    <div class="row">
+    <div class="row my-3">
       <label for="status" class="col-sm-1 col-form-label">{% translate 'Filter' %}</label>
       <div class="col col-sm-3">
         <select class="form-select" name="status" data-bind="value: statusFilter">

From 3568071d14fd5ec2d95ae97c226aa0a3bcfec148 Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Thu, 30 May 2024 14:28:13 +0200
Subject: [PATCH 25/63] lint

---
 .../apps/app_execution/static/app_execution/js/workflow_logs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
index 8488c8c5dc51..f2aaf50957e2 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
@@ -2,7 +2,7 @@ hqDefine("app_execution/js/workflow_logs", [
     'jquery',
     'knockout',
     'hqwebapp/js/initial_page_data',
-    'hqwebapp/js/tempus_dominus',,
+    'hqwebapp/js/tempus_dominus',
     'app_execution/js/workflow_charts',
     'hqwebapp/js/bootstrap5/components.ko',
 ], function ($, ko, initialPageData, hqTempusDominus) {

From 92246a4d7fdc58562b4c5cd140c22372d6e47e4a Mon Sep 17 00:00:00 2001
From: Simon Kelly <skelly@dimagi.com>
Date: Thu, 30 May 2024 14:29:30 +0200
Subject: [PATCH 26/63] use strict js

---
 .../app_execution/static/app_execution/js/workflow_charts.js    | 2 +-
 .../apps/app_execution/static/app_execution/js/workflow_logs.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
index a834cdfdbc49..6312a3b44766 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_charts.js
@@ -1,4 +1,4 @@
-// /* globals moment */
+'use strict';
 hqDefine("app_execution/js/workflow_charts", [
     'jquery',
     'moment/moment',
diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
index f2aaf50957e2..c07d5b0e9527 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
@@ -1,3 +1,4 @@
+'use strict';
 hqDefine("app_execution/js/workflow_logs", [
     'jquery',
     'knockout',

From f36401f312be1a0b011039d78b8a04181cfd0924 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 16:50:03 +0100
Subject: [PATCH 27/63] Add test

---
 corehq/apps/app_manager/tests/test_views.py | 248 +++++++++++++++++---
 1 file changed, 210 insertions(+), 38 deletions(-)

diff --git a/corehq/apps/app_manager/tests/test_views.py b/corehq/apps/app_manager/tests/test_views.py
index 55134957da0a..a0da85bf1f11 100644
--- a/corehq/apps/app_manager/tests/test_views.py
+++ b/corehq/apps/app_manager/tests/test_views.py
@@ -42,26 +42,50 @@
 User = get_user_model()
 
 
-@flag_enabled('CUSTOM_PROPERTIES')
-@patch('corehq.apps.app_manager.models.validate_xform', return_value=None)
-@es_test(requires=[app_adapter], setup_class=True)
-class TestViews(TestCase):
-    app = None
-    build = None
+class ViewsBase(TestCase):
+    domain = 'test-views-base'
+    username = 'dolores.umbridge'
+    password = 'bumblesn0re'
 
     @classmethod
     def setUpClass(cls):
-        super(TestViews, cls).setUpClass()
-        cls.project = Domain.get_or_create_with_name('app-manager-testviews-domain', is_active=True)
-        cls.username = 'cornelius'
-        cls.password = 'fudge'
-        cls.user = WebUser.create(cls.project.name, cls.username, cls.password, None, None, is_active=True)
+        super().setUpClass()
+
+        cls.domain_obj = Domain.get_or_create_with_name(
+            cls.domain,
+            is_active=True,
+        )
+        cls.build = add_build(version='2.7.0', build_number=20655)
+
+        cls.user = WebUser.create(
+            cls.domain,
+            cls.username,
+            cls.password,
+            created_by=None,
+            created_via=None,
+            is_active=True,
+        )
         cls.user.is_superuser = True
         cls.user.save()
-        cls.build = add_build(version='2.7.0', build_number=20655)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.user.delete(cls.domain, deleted_by=None)
+        cls.build.delete()
+        cls.domain_obj.delete()
+        super().tearDownClass()
+
+
+@flag_enabled('CUSTOM_PROPERTIES')
+@patch('corehq.apps.app_manager.models.validate_xform', return_value=None)
+@es_test(requires=[app_adapter], setup_class=True)
+class TestViews(ViewsBase):
+    domain = 'app-manager-testviews-domain'
+    username = 'cornelius'
+    password = 'fudge'
 
     def setUp(self):
-        self.app = Application.new_app(self.project.name, "TestApp")
+        self.app = Application.new_app(self.domain, "TestApp")
         self.app.build_spec = BuildSpec.from_string('2.7.0/latest')
         self.client.login(username=self.username, password=self.password)
 
@@ -69,13 +93,6 @@ def tearDown(self):
         if self.app._id:
             self.app.delete()
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.user.delete(cls.project.name, deleted_by=None)
-        cls.build.delete()
-        cls.project.delete()
-        super(TestViews, cls).tearDownClass()
-
     def test_download_file_bad_xform_404(self, mock):
         '''
         This tests that the `download_file` view returns
@@ -96,13 +113,13 @@ def test_download_file_bad_xform_404(self, mock):
         self.app.save()
 
         mock.side_effect = XFormValidationError('')
-        response = self.client.get(reverse('app_download_file', kwargs=dict(domain=self.project.name,
+        response = self.client.get(reverse('app_download_file', kwargs=dict(domain=self.domain,
                                                                             app_id=self.app.get_id,
                                                                             path='modules-0/forms-0.xml')))
         self.assertEqual(response.status_code, 404)
 
     def test_edit_commcare_profile(self, mock):
-        app2 = Application.new_app(self.project.name, "TestApp2")
+        app2 = Application.new_app(self.domain, "TestApp2")
         app2.save()
         self.addCleanup(lambda: Application.get_db().delete_doc(app2.id))
         data = {
@@ -112,7 +129,7 @@ def test_edit_commcare_profile(self, mock):
             }
         }
 
-        response = self.client.post(reverse('edit_commcare_profile', args=[self.project.name, app2._id]),
+        response = self.client.post(reverse('edit_commcare_profile', args=[self.domain, app2._id]),
                                     json.dumps(data),
                                     content_type='application/json')
 
@@ -128,7 +145,7 @@ def test_edit_commcare_profile(self, mock):
             }
         }
 
-        response = self.client.post(reverse('edit_commcare_profile', args=[self.project.name, app2._id]),
+        response = self.client.post(reverse('edit_commcare_profile', args=[self.domain, app2._id]),
                                     json.dumps(data),
                                     content_type='application/json')
 
@@ -159,7 +176,7 @@ def test_basic_app(self, mock1, mock2):
         self._send_to_es(self.app)
 
         kwargs = {
-            'domain': self.project.name,
+            'domain': self.domain,
             'app_id': self.app.id,
         }
         self._test_status_codes([
@@ -174,7 +191,7 @@ def test_basic_app(self, mock1, mock2):
         self._send_to_es(build)
 
         content = self._json_content_from_get('current_app_version', {
-            'domain': self.project.name,
+            'domain': self.domain,
             'app_id': self.app.id,
         })
         self.assertEqual(content['currentVersion'], 1)
@@ -182,13 +199,13 @@ def test_basic_app(self, mock1, mock2):
         self._send_to_es(self.app)
 
         content = self._json_content_from_get('current_app_version', {
-            'domain': self.project.name,
+            'domain': self.domain,
             'app_id': self.app.id,
         })
         self.assertEqual(content['currentVersion'], 2)
 
         content = self._json_content_from_get('paginate_releases', {
-            'domain': self.project.name,
+            'domain': self.domain,
             'app_id': self.app.id,
         }, {'limit': 5})
         self.assertEqual(len(content['apps']), 1)
@@ -219,7 +236,7 @@ def test_advanced_module(self, mock):
         module = self.app.add_module(AdvancedModule.new_module("Module0", "en"))
         self.app.save()
         self._test_status_codes(['view_module'], {
-            'domain': self.project.name,
+            'domain': self.domain,
             'app_id': self.app.id,
             'module_unique_id': module.unique_id,
         })
@@ -228,7 +245,7 @@ def test_report_module(self, mockh):
         module = self.app.add_module(ReportModule.new_module("Module0", "en"))
         self.app.save()
         self._test_status_codes(['view_module'], {
-            'domain': self.project.name,
+            'domain': self.domain,
             'app_id': self.app.id,
             'module_unique_id': module.unique_id,
         })
@@ -237,14 +254,14 @@ def test_shadow_module(self, mockh):
         module = self.app.add_module(ShadowModule.new_module("Module0", "en"))
         self.app.save()
         self._test_status_codes(['view_module'], {
-            'domain': self.project.name,
+            'domain': self.domain,
             'app_id': self.app.id,
             'module_unique_id': module.unique_id,
         })
 
     def test_default_new_app(self, mock):
         response = self.client.get(reverse('default_new_app', kwargs={
-            'domain': self.project.name,
+            'domain': self.domain,
         }), follow=False)
 
         self.assertEqual(response.status_code, 302)
@@ -256,7 +273,7 @@ def test_default_new_app(self, mock):
 
     def test_get_apps_modules(self, mock):
         with apps_modules_setup(self):
-            apps_modules = get_apps_modules(self.project.name)
+            apps_modules = get_apps_modules(self.domain)
 
             names = sorted([a['name'] for a in apps_modules])
             self.assertEqual(
@@ -275,7 +292,7 @@ def test_get_apps_modules(self, mock):
     def test_get_apps_modules_doc_types(self, mock):
         with apps_modules_setup(self):
             apps_modules = get_apps_modules(
-                self.project.name, app_doc_types=('Application', 'LinkedApplication')
+                self.domain, app_doc_types=('Application', 'LinkedApplication')
             )
             names = sorted([a['name'] for a in apps_modules])
             self.assertEqual(names, ['LinkedApp', 'OtherApp', 'TestApp'])
@@ -439,18 +456,18 @@ def apps_modules_setup(test_case):
     test_case.app.add_module(Module.new_module("Module0", "en"))
     test_case.app.save()
 
-    test_case.other_app = Application.new_app(test_case.project.name, "OtherApp")
+    test_case.other_app = Application.new_app(test_case.domain, "OtherApp")
     test_case.other_app.add_module(Module.new_module("Module0", "en"))
     test_case.other_app.save()
 
-    test_case.deleted_app = Application.new_app(test_case.project.name, "DeletedApp")
+    test_case.deleted_app = Application.new_app(test_case.domain, "DeletedApp")
     test_case.deleted_app.add_module(Module.new_module("Module0", "en"))
     test_case.deleted_app.save()
     test_case.deleted_app.delete_app()
     test_case.deleted_app.save()  # delete_app() changes doc_type. This save() saves that.
 
-    test_case.linked_app = create_linked_app(test_case.project.name, test_case.app.id,
-                                             test_case.project.name, 'LinkedApp')
+    test_case.linked_app = create_linked_app(test_case.domain, test_case.app.id,
+                                             test_case.domain, 'LinkedApp')
     try:
         yield
     finally:
@@ -459,6 +476,161 @@ def apps_modules_setup(test_case):
         Application.get_db().delete_doc(test_case.other_app.id)
 
 
+@patch('corehq.apps.app_manager.models.validate_xform', return_value=None)
+@es_test(requires=[app_adapter], setup_class=True)
+class TestViewGeneric(ViewsBase):
+    domain = 'test-view-generic'
+
+    def setUp(self):
+        self.client.login(username=self.username, password=self.password)
+
+        self.app = Application.new_app(self.domain, "TestApp")
+        self.app.build_spec = BuildSpec.from_string('2.7.0/latest')
+        self.module = self.app.add_module(Module.new_module("Module0", "en"))
+        self.form = self.app.new_form(
+            self.module.id, "Form0", "en",
+            attachment=get_simple_form(xmlns='xmlns-0.0'))
+        self.app.save()
+        app_adapter.index(self.app, refresh=True)  # Send to ES
+
+    def tearDown(self):
+        self.app.delete()
+
+    def test_view_app(self, mock1):
+        url = reverse('view_app', kwargs={
+            'domain': self.domain,
+            'app_id': self.app.id,
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context.keys(), self.expected_keys_app)
+
+    def test_view_module(self, mock1):
+        url = reverse('view_module', kwargs={
+            'domain': self.domain,
+            'app_id': self.app.id,
+            'module_unique_id': self.module.unique_id,
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context.keys(), self.expected_keys_module)
+
+    def test_view_module_legacy(self, mock1):
+        url = reverse('view_module_legacy', kwargs={
+            'domain': self.domain,
+            'app_id': self.app.id,
+            'module_id': self.module.id,
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context.keys(), self.expected_keys_module)
+
+    def test_view_form(self, mock1):
+        url = reverse('view_form', kwargs={
+            'domain': self.domain,
+            'app_id': self.app.id,
+            'form_unique_id': self.form.unique_id,
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context.keys(), self.expected_keys_form)
+
+    def test_view_form_legacy(self, mock1):
+        url = reverse('view_form_legacy', kwargs={
+            'domain': self.domain,
+            'app_id': self.app.id,
+            'module_id': self.module.id,
+            'form_id': self.form.id,
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context.keys(), self.expected_keys_form)
+
+    expected_keys_app = {
+        'None', 'perms', 'practice_users', 'EULA_COMPLIANCE', 'bulk_ui_translation_form',
+        'latest_released_version', 'show_live_preview', 'can_view_app_diff', 'bulk_app_translation_form',
+        'sms_contacts', 'DEFAULT_MESSAGE_LEVELS', 'jquery_ui', 'PRIVACY_EMAIL', 'user', 'privileges',
+        'MAPBOX_ACCESS_TOKEN', 'release_manager', 'WS4REDIS_HEARTBEAT', 'can_send_sms', 'tabs', 'base_template',
+        'STATIC_URL', 'tab', 'smart_lang_display_enabled', 'latest_commcare_version', 'MEDIA_URL', 'element_id',
+        'app', 'ko', 'BASE_MAIN', 'prompt_settings_url', 'is_remote_app', 'show_biometric', 'linked_name',
+        'WEBSOCKET_URI', 'selected_form', 'module', 'MINIMUM_PASSWORD_LENGTH', 'MINIMUM_ZXCVBN_SCORE',
+        'SUPPORT_EMAIL', 'app_view_options', 'show_advanced', 'role_version', 'custom_assertions',
+        'is_app_settings_page', 'domain_names', 'latest_version_for_build_profiles', 'ANALYTICS_CONFIG',
+        'csrf_token', 'LANGUAGE_CODE', 'app_name', 'requirejs_main', 'sub', 'is_saas_environment',
+        'selected_module', 'add_ons_layout', 'is_dimagi_environment', 'TIME_ZONE', 'env', 'add_ons',
+        'show_shadow_forms', 'can_edit_apps', 'ANALYTICS_IDS', 'active_tab', 'current_url_name',
+        'show_release_mode', 'application_profile_url', 'linkable_domains', 'domain_links',
+        'show_all_projects_link', 'releases_active', 'settings_active', 'menu', 'allow_report_an_issue', 'app_id',
+        'INVOICING_CONTACT_EMAIL', 'False', 'show_mobile_ux_warning', 'IS_DOMAIN_BILLING_ADMIN', 'translations',
+        'hq', 'SALES_EMAIL', 'linked_version', 'confirm', 'show_report_modules', 'lang', 'can_view_cloudcare',
+        'title_block', 'CUSTOM_LOGO_URL', 'items', 'request', 'messages', 'build_profile_access', 'form', 'error',
+        'alerts', 'prompt_settings_form', 'submenu', 'domain', 'enable_update_prompts', 'show_shadow_modules',
+        'sentry', 'bulk_ui_translation_upload', 'toggles_dict', 'True', 'full_name', 'latest_build_id',
+        'previews_dict', 'copy_app_form', 'show_status_page', 'is_linked_app', 'show_shadow_module_v1',
+        'use_bootstrap5', 'limit_to_linked_domains', 'add_ons_privileges', 'LANGUAGE_BIDI', 'page_title_block',
+        'LANGUAGES', 'underscore', 'analytics', 'block', 'app_subset', 'restrict_domain_creation',
+        'login_template', 'enterprise_mode', 'mobile_ux_cookie_name', 'commcare_hq_names', 'langs',
+        'title_context_block', 'timezone', 'helpers', 'has_mobile_workers', 'multimedia_state',
+        'bulk_app_translation_upload', 'show_training_modules', 'forloop', 'secure_cookies',
+    }
+
+    expected_keys_module = {
+        'show_advanced', 'session_endpoints_enabled', 'show_advanced_settings', 'toggles_dict',
+        'show_release_mode', 'linked_name', 'linked_version', 'latest_commcare_version',
+        'nav_menu_media_specifics', 'user', 'TIME_ZONE', 'domain', 'module_brief', 'timezone', 'active_tab',
+        'data_registry_enabled', 'confirm', 'messages', 'releases_active', 'show_status_page',
+        'show_search_workflow', 'data_registries', 'label', 'underscore', 'forloop', 'show_shadow_modules',
+        'requirejs_main', 'SUPPORT_EMAIL', 'valid_parents_for_child_module', 'parent_case_modules',
+        'current_url_name', 'LANGUAGE_BIDI', 'DEFAULT_MESSAGE_LEVELS', 'show_report_modules', 'BASE_MAIN',
+        'app_id', 'request', 'MINIMUM_PASSWORD_LENGTH', 'type', 'is_saas_environment', 'show_all_projects_link',
+        'enterprise_mode', 'csrf_token', 'WS4REDIS_HEARTBEAT', 'is_dimagi_environment', 'domain_names',
+        'IS_DOMAIN_BILLING_ADMIN', 'tabs', 'perms', 'show_training_modules', 'AUDIO_LABEL',
+        'show_shadow_module_v1', 'practice_users', 'add_ons', 'module_icon', 'SALES_EMAIL', 'app', 'domain_links',
+        'app_subset', 'show_biometric', 'case_list_form_options', 'MINIMUM_ZXCVBN_SCORE', 'ICON_LABEL', 'app_name',
+        'linkable_domains', 'alerts', 'show_shadow_forms', 'data_registry_workflow_choices', 'use_bootstrap5',
+        'title_block', 'login_template', 'base_template', 'MEDIA_URL', 'lang', 'show_live_preview', 'jquery_ui',
+        'latest_version_for_build_profiles', 'edit_name_url', 'case_types', 'js_options', 'ko', 'privileges',
+        'settings_active', 'commcare_hq_names', 'add_ons_layout', 'limit_to_linked_domains', 'module', 'True',
+        'multimedia', 'MAPBOX_ACCESS_TOKEN', 'helpers', 'all_case_modules', 'LANGUAGES', 'mobile_ux_cookie_name',
+        'allow_report_an_issue', 'ANALYTICS_CONFIG', 'custom_icon', 'page_title_block', 'INVOICING_CONTACT_EMAIL',
+        'form', 'error', 'previews_dict', 'copy_app_form', 'LANGUAGE_CODE', 'menu', 'add_ons_privileges',
+        'shadow_parent', 'restrict_domain_creation', 'show_mobile_ux_warning', 'WEBSOCKET_URI', 'PRIVACY_EMAIL',
+        'custom_assertions', 'analytics', 'form_endpoint_options', 'title_context_block', 'secure_cookies',
+        'langs', 'details', 'None', 'CUSTOM_LOGO_URL', 'hq', 'selected_form', 'slug', 'env', 'False',
+        'ANALYTICS_IDS', 'STATIC_URL', 'selected_module', 'role_version', 'EULA_COMPLIANCE', 'sentry',
+        'case_list_form_not_allowed_reasons', 'child_module_enabled', 'block',
+    }
+
+    expected_keys_form = {
+        'show_advanced', 'is_module_filter_enabled', 'session_endpoints_enabled', 'toggles_dict',
+        'show_release_mode', 'linked_name', 'linked_version', 'latest_commcare_version',
+        'nav_menu_media_specifics', 'user', 'TIME_ZONE', 'domain', 'case_config_options', 'timezone',
+        'root_requires_same_case', 'active_tab', 'confirm', 'messages', 'releases_active', 'show_status_page',
+        'form_filter_patterns', 'form_workflows', 'label', 'underscore', 'forloop', 'requirejs_main',
+        'SUPPORT_EMAIL', 'current_url_name', 'LANGUAGE_BIDI', 'DEFAULT_MESSAGE_LEVELS', 'show_report_modules',
+        'BASE_MAIN', 'xform_languages', 'app_id', 'request', 'allow_usercase', 'MINIMUM_PASSWORD_LENGTH', 'type',
+        'is_saas_environment', 'show_all_projects_link', 'enterprise_mode', 'module_is_multi_select', 'csrf_token',
+        'WS4REDIS_HEARTBEAT', 'nav_form', 'xform_validation_errored', 'allow_form_filtering',
+        'is_dimagi_environment', 'domain_names', 'IS_DOMAIN_BILLING_ADMIN', 'tabs', 'perms',
+        'show_training_modules', 'AUDIO_LABEL', 'show_shadow_module_v1', 'practice_users', 'add_ons',
+        'module_icon', 'custom_instances', 'SALES_EMAIL', 'app', 'domain_links', 'form_errors', 'app_subset',
+        'show_biometric', 'MINIMUM_ZXCVBN_SCORE', 'ICON_LABEL', 'app_name', 'linkable_domains', 'alerts',
+        'show_shadow_forms', 'use_bootstrap5', 'form_icon', 'title_block', 'login_template', 'base_template',
+        'MEDIA_URL', 'lang', 'show_live_preview', 'jquery_ui', 'latest_version_for_build_profiles',
+        'edit_name_url', 'ko', 'privileges', 'settings_active', 'commcare_hq_names', 'add_ons_layout',
+        'limit_to_linked_domains', 'module', 'is_case_list_form', 'True', 'multimedia', 'MAPBOX_ACCESS_TOKEN',
+        'xform_validation_missing', 'helpers', 'LANGUAGES', 'mobile_ux_cookie_name', 'allow_report_an_issue',
+        'ANALYTICS_CONFIG', 'is_training_module', 'custom_icon', 'page_title_block', 'INVOICING_CONTACT_EMAIL',
+        'form', 'error', 'previews_dict', 'copy_app_form', 'LANGUAGE_CODE', 'menu', 'add_ons_privileges',
+        'restrict_domain_creation', 'show_mobile_ux_warning', 'WEBSOCKET_URI', 'PRIVACY_EMAIL',
+        'is_allowed_to_be_release_notes_form', 'custom_assertions', 'analytics', 'title_context_block',
+        'secure_cookies', 'langs', 'None', 'CUSTOM_LOGO_URL', 'hq', 'allow_form_copy', 'selected_form', 'slug',
+        'env', 'False', 'ANALYTICS_IDS', 'STATIC_URL', 'selected_module', 'role_version', 'is_usercase_in_use',
+        'module_loads_registry_case', 'EULA_COMPLIANCE', 'sentry', 'show_shadow_modules', 'show_custom_ref',
+        'block',
+    }
+
+
 class TestDownloadCaseSummaryViewByAPIKey(TestCase):
     """Test that the DownloadCaseSummaryView can be accessed with an API key."""
 

From 221cfbb0c3fe2a7b752e2dceacaa354f717860b1 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 16:50:30 +0100
Subject: [PATCH 28/63] Lint: Add linebreaks

---
 corehq/apps/app_manager/views/view_generic.py | 117 ++++++++++++++----
 1 file changed, 90 insertions(+), 27 deletions(-)

diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index e3a5346b074d..c3221108c2df 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -53,9 +53,17 @@
 
 
 @retry_resource(3)
-def view_generic(request, domain, app_id, module_id=None, form_id=None,
-                 copy_app_form=None, release_manager=False,
-                 module_unique_id=None, form_unique_id=None):
+def view_generic(
+    request,
+    domain,
+    app_id,
+    module_id=None,
+    form_id=None,
+    copy_app_form=None,
+    release_manager=False,
+    module_unique_id=None,
+    form_unique_id=None,
+):
     """
     This is the main view for the app. All other views redirect to here.
 
@@ -183,11 +191,24 @@ def view_generic(request, domain, app_id, module_id=None, form_id=None,
             default_file_name = '%s_form%s' % (default_file_name, form_id)
 
         specific_media = [{
-            'menu_refs': app.get_menu_media(module, form=form, form_index=form_id, to_language=lang),
-            'default_file_name': '{name}_{lang}'.format(name=default_file_name, lang=lang),
+            'menu_refs': app.get_menu_media(
+                module,
+                form=form,
+                form_index=form_id,
+                to_language=lang,
+            ),
+            'default_file_name': '{name}_{lang}'.format(
+                name=default_file_name,
+                lang=lang,
+            ),
         }]
 
-        if not form and module and not isinstance(module, ReportModule) and module.uses_media():
+        if (
+            not form
+            and module
+            and not isinstance(module, ReportModule)
+            and module.uses_media()
+        ):
             def _make_name(suffix):
                 return "{default_name}_{suffix}_{lang}".format(
                     default_name=default_file_name,
@@ -196,44 +217,73 @@ def _make_name(suffix):
                 )
 
             specific_media.append({
-                'menu_refs': app.get_case_list_form_media(module, to_language=lang),
+                'menu_refs': app.get_case_list_form_media(
+                    module,
+                    to_language=lang,
+                ),
                 'default_file_name': _make_name('case_list_form'),
                 'qualifier': 'case_list_form_',
             })
             specific_media.append({
-                'menu_refs': app.get_case_list_menu_item_media(module, to_language=lang),
+                'menu_refs': app.get_case_list_menu_item_media(
+                    module,
+                    to_language=lang,
+                ),
                 'default_file_name': _make_name('case_list_menu_item'),
                 'qualifier': 'case_list-menu_item_',
             })
-            if (module and hasattr(module, 'search_config') and module.uses_media()
-                    and toggles.USH_CASE_CLAIM_UPDATES.enabled(domain)):
+            if (
+                module
+                and hasattr(module, 'search_config')
+                and module.uses_media()
+                and toggles.USH_CASE_CLAIM_UPDATES.enabled(domain)
+            ):
                 specific_media.extend([
                     {
                         'menu_refs': app.get_case_search_label_media(
-                            module, module.search_config.search_label, to_language=lang),
-                        'default_file_name': _make_name('case_search_label_item'),
+                            module,
+                            module.search_config.search_label,
+                            to_language=lang,
+                        ),
+                        'default_file_name': _make_name(
+                            'case_search_label_item'
+                        ),
                         'qualifier': 'case_search-search_label_media_'
                     },
                     {
                         'menu_refs': app.get_case_search_label_media(
-                            module, module.search_config.search_again_label, to_language=lang),
-                        'default_file_name': _make_name('case_search_again_label_item'),
+                            module,
+                            module.search_config.search_again_label,
+                            to_language=lang,
+                        ),
+                        'default_file_name': _make_name(
+                            'case_search_again_label_item'
+                        ),
                         'qualifier': 'case_search-search_again_label_media_'
                     }
                 ])
-            if (toggles.CASE_LIST_LOOKUP.enabled(request.user.username) or
-                    toggles.CASE_LIST_LOOKUP.enabled(app.domain) or
-                    toggles.BIOMETRIC_INTEGRATION.enabled(app.domain)):
+            if (
+                toggles.CASE_LIST_LOOKUP.enabled(request.user.username)
+                or toggles.CASE_LIST_LOOKUP.enabled(app.domain)
+                or toggles.BIOMETRIC_INTEGRATION.enabled(app.domain)
+            ):
                 specific_media.append({
                     'menu_refs': app.get_case_list_lookup_image(module),
-                    'default_file_name': '{}_case_list_lookup'.format(default_file_name),
+                    'default_file_name': '{}_case_list_lookup'.format(
+                        default_file_name
+                    ),
                     'qualifier': 'case-list-lookupcase',
                 })
 
                 if hasattr(module, 'product_details'):
                     specific_media.append({
-                        'menu_refs': app.get_case_list_lookup_image(module, type='product'),
-                        'default_file_name': '{}_product_list_lookup'.format(default_file_name),
+                        'menu_refs': app.get_case_list_lookup_image(
+                            module,
+                            type='product',
+                        ),
+                        'default_file_name': '{}_product_list_lookup'.format(
+                            default_file_name
+                        ),
                         'qualifier': 'case-list-lookupproduct',
                     })
 
@@ -256,13 +306,17 @@ def _make_name(suffix):
             'multimedia': {
                 "object_map": app.get_object_map(multimedia_map=multimedia_map),
                 'upload_managers': uploaders,
-                'upload_managers_js': {type: u.js_options for type, u in uploaders.items()},
+                'upload_managers_js': {type: u.js_options
+                                       for type, u in uploaders.items()},
             }
         })
 
         context['module_icon'] = None
         if toggles.CUSTOM_ICON_BADGES.enabled(domain):
-            context['module_icon'] = module.custom_icon if module.custom_icon else CustomIcon()
+            if module.custom_icon:
+                context['module_icon'] = module.custom_icon
+            else:
+                context['module_icon'] = CustomIcon()
         context['nav_menu_media_specifics'] = specific_media
 
     error = request.GET.get('error', '')
@@ -278,15 +332,21 @@ def _make_name(suffix):
 
     domain_names = {
         d.name for d in Domain.active_for_user(request.couch_user)
-        if not (is_active_downstream_domain(request.domain)
-                and get_upstream_domain_link(request.domain).master_domain == d.name)
+        if not (
+            is_active_downstream_domain(request.domain)
+            and get_upstream_domain_link(request.domain).master_domain == d.name
+        )
     }
     domain_names.add(request.domain)
-    # NOTE: The CopyApplicationForm checks for access to linked domains before displaying
+    # NOTE: The CopyApplicationForm checks for access to linked domains
+    #       before displaying
     linkable_domains = []
     limit_to_linked_domains = True
     if can_domain_access_linked_domains(request.domain):
-        linkable_domains = get_accessible_downstream_domains(domain, request.couch_user)
+        linkable_domains = get_accessible_downstream_domains(
+            domain,
+            request.couch_user,
+        )
         limit_to_linked_domains = not request.couch_user.is_superuser
     context.update({
         'domain_names': sorted(domain_names),
@@ -341,7 +401,10 @@ def _make_name(suffix):
 
     confirm = request.session.pop('CONFIRM', False)
     context.update({'confirm': confirm})
-    context.update({'show_release_mode': AppReleaseModeSetting.get_settings(domain).is_visible})
+    context.update({
+        'show_release_mode':
+            AppReleaseModeSetting.get_settings(domain).is_visible
+    })
 
     response = render(request, template, context)
 

From 2c9d49bcac979b79a4becd56a41a01c225b62d3f Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 11:49:56 +0100
Subject: [PATCH 29/63] The template is constant

---
 corehq/apps/app_manager/views/forms.py        | 11 +++++++++--
 corehq/apps/app_manager/views/view_generic.py |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/app_manager/views/forms.py b/corehq/apps/app_manager/views/forms.py
index d5e7ba08a36f..922de0d5fe53 100644
--- a/corehq/apps/app_manager/views/forms.py
+++ b/corehq/apps/app_manager/views/forms.py
@@ -649,7 +649,14 @@ def get_apps_modules(domain, current_app_id=None, current_module_id=None, app_do
     ]
 
 
-def get_form_view_context_and_template(request, domain, form, langs, current_lang, messages=messages):
+def get_form_view_context(
+        request,
+        domain,
+        form,
+        langs,
+        current_lang,
+        messages=messages,
+):
     # HELPME
     #
     # This method has been flagged for refactoring due to its complexity and
@@ -889,7 +896,7 @@ def commtrack_programs():
         })
 
     context.update({'case_config_options': case_config_options})
-    return "app_manager/form_view.html", context
+    return context
 
 
 def _get_form_link_context(app, module, form, langs):
diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index c3221108c2df..af5ff688afad 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -24,7 +24,7 @@
     get_apps_base_context,
 )
 from corehq.apps.app_manager.views.forms import (
-    get_form_view_context_and_template,
+    get_form_view_context,
 )
 from corehq.apps.app_manager.views.modules import (
     get_module_template,
@@ -161,7 +161,8 @@ def view_generic(
         })
 
     if form:
-        template, form_context = get_form_view_context_and_template(
+        template = "app_manager/form_view.html"
+        form_context = get_form_view_context(
             request, domain, form, context['langs'], current_lang=lang
         )
         context.update(form_context)

From 28fbf1ed6fcd2d61bfa2cb1bae2dc7ac48118f9f Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 12:29:03 +0100
Subject: [PATCH 30/63] Context and bad states

---
 corehq/apps/app_manager/views/modules.py      |   3 +
 corehq/apps/app_manager/views/view_generic.py | 157 +++++++++++-------
 2 files changed, 102 insertions(+), 58 deletions(-)

diff --git a/corehq/apps/app_manager/views/modules.py b/corehq/apps/app_manager/views/modules.py
index a02ed94acd5b..5689ad1d7dc6 100644
--- a/corehq/apps/app_manager/views/modules.py
+++ b/corehq/apps/app_manager/views/modules.py
@@ -147,6 +147,9 @@ def get_module_template(user, module):
 
 
 def get_module_view_context(request, app, module, lang=None):
+    # make sure all modules have unique ids
+    app.ensure_module_unique_ids(should_save=True)
+
     context = {
         'edit_name_url': reverse('edit_module_attr', args=[app.domain, app.id, module.unique_id, 'name']),
         'show_search_workflow': (
diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index af5ff688afad..63b64e988411 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -83,59 +83,24 @@ def view_generic(
         return bail(request, domain, app_id)
 
     app = get_app(domain, app_id)
-    module = form = None
-
-    if module_id:
-        try:
-            module = app.get_module(module_id)
-        except ModuleNotFoundException:
-            raise Http404()
-        if not module.unique_id:
-            module.get_or_create_unique_id()
-            app.save()
-    elif module_unique_id:
-        try:
-            module = app.get_module_by_unique_id(module_unique_id)
-        except ModuleNotFoundException:
-            raise Http404()
+    module, form = _get_module_and_form(
+        app, module_id, form_id, module_unique_id, form_unique_id
+    )
+    if module:
         module_id = module.id
-
-    if form_id and module is not None:
-        try:
-            form = module.get_form(form_id)
-        except IndexError:
-            raise Http404()
-    elif form_unique_id:
-        try:
-            form = app.get_form(form_unique_id)
-        except FormNotFoundException:
-            raise Http404()
+    if form:
         form_id = form.id
 
-    if form is not None and module is None:
-        # this is the case where only the form_unique_id is given
-        module = form.get_module()
-        module_id = module.id
-
-    # Application states that should no longer exist
-    if app.application_version == APP_V1:
-        _assert = soft_assert()
-        _assert(False, 'App version 1.0', {'domain': domain, 'app_id': app_id})
-        return render(request, "app_manager/no_longer_supported.html", {
-            'domain': domain,
-            'app': app,
-        })
-    if (form is not None and "usercase_preload" in getattr(form, "actions", {})
-            and form.actions.usercase_preload.preload):
-        _assert = soft_assert(['dmiller' + '@' + 'dimagi.com'])
-        _assert(False, 'User property easy refs + old-style config = bad', {
-            'domain': domain,
-            'app_id': app_id,
-            'module_id': module_id,
-            'module_unique_id': module_unique_id,
-            'form_id': form_id,
-            'form_unique_id': form_unique_id,
-        })
+    _handle_bad_states(
+        request,
+        domain,
+        app_id,
+        app,
+        module,
+        form,
+        module_unique_id,
+        form_unique_id,
+    )
 
     context = get_apps_base_context(request, domain, app)
     if app.copy_of:
@@ -162,16 +127,16 @@ def view_generic(
 
     if form:
         template = "app_manager/form_view.html"
-        form_context = get_form_view_context(
-            request, domain, form, context['langs'], current_lang=lang
-        )
-        context.update(form_context)
+        context.update(get_form_view_context(
+            request,
+            domain,
+            form,
+            langs=context['langs'],
+            current_lang=lang,
+        ))
     elif module:
         template = get_module_template(request.user, module)
-        # make sure all modules have unique ids
-        app.ensure_module_unique_ids(should_save=True)
-        module_context = get_module_view_context(request, app, module, lang)
-        context.update(module_context)
+        context.update(get_module_view_context(request, app, module, lang))
     else:
         context.update(get_app_view_context(request, app))
 
@@ -411,3 +376,79 @@ def _make_name(suffix):
 
     set_lang_cookie(response, lang)
     return response
+
+
+def _get_module_and_form(
+    app,
+    module_id,
+    form_id,
+    module_unique_id,
+    form_unique_id,
+):
+    module = form = None
+
+    if module_id:
+        try:
+            module = app.get_module(module_id)
+        except ModuleNotFoundException:
+            raise Http404()
+        if not module.unique_id:
+            module.get_or_create_unique_id()
+            app.save()
+    elif module_unique_id:
+        try:
+            module = app.get_module_by_unique_id(module_unique_id)
+        except ModuleNotFoundException:
+            raise Http404()
+
+    if form_id and module is not None:
+        try:
+            form = module.get_form(form_id)
+        except IndexError:
+            raise Http404()
+    elif form_unique_id:
+        try:
+            form = app.get_form(form_unique_id)
+        except FormNotFoundException:
+            raise Http404()
+
+    if form is not None and module is None:
+        # this is the case where only the form_unique_id is given
+        module = form.get_module()
+
+    return module, form
+
+
+def _handle_bad_states(
+    request,
+    domain,
+    app_id,
+    app,
+    module,
+    form,
+    module_unique_id,
+    form_unique_id,
+):
+    # Application states that should no longer exist
+    if app.application_version == APP_V1:
+        _assert = soft_assert()
+        _assert(False, 'App version 1.0', {'domain': domain, 'app_id': app_id})
+        return render(request, "app_manager/no_longer_supported.html", {
+            'domain': domain,
+            'app': app,
+        })
+
+    if (
+        form is not None
+        and "usercase_preload" in getattr(form, "actions", {})
+        and form.actions.usercase_preload.preload
+    ):
+        _assert = soft_assert(['dmiller' + '@' + 'dimagi.com'])
+        _assert(False, 'User property easy refs + old-style config = bad', {
+            'domain': domain,
+            'app_id': app_id,
+            'module_id': module.id,
+            'module_unique_id': module_unique_id,
+            'form_id': form.id,
+            'form_unique_id': form_unique_id,
+        })

From a5ada3ec20e9b61db5f7a9950be7f8a7ad3369f6 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 12:30:12 +0100
Subject: [PATCH 31/63] Pull out `_make_file_name()`

---
 corehq/apps/app_manager/tests/test_views.py   |  8 ++++
 corehq/apps/app_manager/views/view_generic.py | 42 +++++++++++++------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/corehq/apps/app_manager/tests/test_views.py b/corehq/apps/app_manager/tests/test_views.py
index a0da85bf1f11..559763fe9aef 100644
--- a/corehq/apps/app_manager/tests/test_views.py
+++ b/corehq/apps/app_manager/tests/test_views.py
@@ -1,4 +1,5 @@
 import base64
+import doctest
 import json
 import re
 from contextlib import contextmanager
@@ -753,3 +754,10 @@ def test_correct_credentials(self):
                 self.url, HTTP_AUTHORIZATION=f"Basic {invalid_credentials}"
             )
             self.assertEqual(response.status_code, 401)
+
+
+def test_doctests():
+    import corehq.apps.app_manager.views.view_generic as module
+
+    results = doctest.testmod(module)
+    assert results.failed == 0
diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index 63b64e988411..9f3f3978bd54 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -175,19 +175,16 @@ def view_generic(
             and not isinstance(module, ReportModule)
             and module.uses_media()
         ):
-            def _make_name(suffix):
-                return "{default_name}_{suffix}_{lang}".format(
-                    default_name=default_file_name,
-                    suffix=suffix,
-                    lang=lang,
-                )
-
             specific_media.append({
                 'menu_refs': app.get_case_list_form_media(
                     module,
                     to_language=lang,
                 ),
-                'default_file_name': _make_name('case_list_form'),
+                'default_file_name': _make_file_name(
+                    default_file_name,
+                    'case_list_form',
+                    lang,
+                ),
                 'qualifier': 'case_list_form_',
             })
             specific_media.append({
@@ -195,7 +192,11 @@ def _make_name(suffix):
                     module,
                     to_language=lang,
                 ),
-                'default_file_name': _make_name('case_list_menu_item'),
+                'default_file_name': _make_file_name(
+                    default_file_name,
+                    'case_list_menu_item',
+                    lang,
+                ),
                 'qualifier': 'case_list-menu_item_',
             })
             if (
@@ -211,8 +212,10 @@ def _make_name(suffix):
                             module.search_config.search_label,
                             to_language=lang,
                         ),
-                        'default_file_name': _make_name(
-                            'case_search_label_item'
+                        'default_file_name': _make_file_name(
+                            default_file_name,
+                            'case_search_label_item',
+                            lang,
                         ),
                         'qualifier': 'case_search-search_label_media_'
                     },
@@ -222,8 +225,10 @@ def _make_name(suffix):
                             module.search_config.search_again_label,
                             to_language=lang,
                         ),
-                        'default_file_name': _make_name(
-                            'case_search_again_label_item'
+                        'default_file_name': _make_file_name(
+                            default_file_name,
+                            'case_search_again_label_item',
+                            lang,
                         ),
                         'qualifier': 'case_search-search_again_label_media_'
                     }
@@ -452,3 +457,14 @@ def _handle_bad_states(
             'form_id': form.id,
             'form_unique_id': form_unique_id,
         })
+
+
+def _make_file_name(default_name, suffix, lang):
+    """
+    Appends ``suffix`` and ``lang`` to ``default_name``
+
+    >>> _make_file_name('sir_lancelot', 'obe', 'fr')
+    'sir_lancelot_obe_fr'
+
+    """
+    return f'{default_name}_{suffix}_{lang}'

From 87fb79131e00fca5d9d516ae908e542f49cd8fa7 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 12:50:52 +0100
Subject: [PATCH 32/63] Pull out _get_specific_media()

---
 corehq/apps/app_manager/views/view_generic.py | 233 +++++++++---------
 1 file changed, 121 insertions(+), 112 deletions(-)

diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index 9f3f3978bd54..90add08a05fb 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -86,11 +86,6 @@ def view_generic(
     module, form = _get_module_and_form(
         app, module_id, form_id, module_unique_id, form_unique_id
     )
-    if module:
-        module_id = module.id
-    if form:
-        form_id = form.id
-
     _handle_bad_states(
         request,
         domain,
@@ -152,112 +147,6 @@ def view_generic(
     # update multimedia context for forms and modules.
     menu_host = form or module
     if menu_host:
-        default_file_name = 'module%s' % module_id
-        if form:
-            default_file_name = '%s_form%s' % (default_file_name, form_id)
-
-        specific_media = [{
-            'menu_refs': app.get_menu_media(
-                module,
-                form=form,
-                form_index=form_id,
-                to_language=lang,
-            ),
-            'default_file_name': '{name}_{lang}'.format(
-                name=default_file_name,
-                lang=lang,
-            ),
-        }]
-
-        if (
-            not form
-            and module
-            and not isinstance(module, ReportModule)
-            and module.uses_media()
-        ):
-            specific_media.append({
-                'menu_refs': app.get_case_list_form_media(
-                    module,
-                    to_language=lang,
-                ),
-                'default_file_name': _make_file_name(
-                    default_file_name,
-                    'case_list_form',
-                    lang,
-                ),
-                'qualifier': 'case_list_form_',
-            })
-            specific_media.append({
-                'menu_refs': app.get_case_list_menu_item_media(
-                    module,
-                    to_language=lang,
-                ),
-                'default_file_name': _make_file_name(
-                    default_file_name,
-                    'case_list_menu_item',
-                    lang,
-                ),
-                'qualifier': 'case_list-menu_item_',
-            })
-            if (
-                module
-                and hasattr(module, 'search_config')
-                and module.uses_media()
-                and toggles.USH_CASE_CLAIM_UPDATES.enabled(domain)
-            ):
-                specific_media.extend([
-                    {
-                        'menu_refs': app.get_case_search_label_media(
-                            module,
-                            module.search_config.search_label,
-                            to_language=lang,
-                        ),
-                        'default_file_name': _make_file_name(
-                            default_file_name,
-                            'case_search_label_item',
-                            lang,
-                        ),
-                        'qualifier': 'case_search-search_label_media_'
-                    },
-                    {
-                        'menu_refs': app.get_case_search_label_media(
-                            module,
-                            module.search_config.search_again_label,
-                            to_language=lang,
-                        ),
-                        'default_file_name': _make_file_name(
-                            default_file_name,
-                            'case_search_again_label_item',
-                            lang,
-                        ),
-                        'qualifier': 'case_search-search_again_label_media_'
-                    }
-                ])
-            if (
-                toggles.CASE_LIST_LOOKUP.enabled(request.user.username)
-                or toggles.CASE_LIST_LOOKUP.enabled(app.domain)
-                or toggles.BIOMETRIC_INTEGRATION.enabled(app.domain)
-            ):
-                specific_media.append({
-                    'menu_refs': app.get_case_list_lookup_image(module),
-                    'default_file_name': '{}_case_list_lookup'.format(
-                        default_file_name
-                    ),
-                    'qualifier': 'case-list-lookupcase',
-                })
-
-                if hasattr(module, 'product_details'):
-                    specific_media.append({
-                        'menu_refs': app.get_case_list_lookup_image(
-                            module,
-                            type='product',
-                        ),
-                        'default_file_name': '{}_product_list_lookup'.format(
-                            default_file_name
-                        ),
-                        'qualifier': 'case-list-lookupproduct',
-                    })
-
         uploaders = {
             'icon': MultimediaImageUploadController(
                 "hqimage",
@@ -288,7 +177,14 @@ def view_generic(
                 context['module_icon'] = module.custom_icon
             else:
                 context['module_icon'] = CustomIcon()
-        context['nav_menu_media_specifics'] = specific_media
+        context['nav_menu_media_specifics'] = _get_specific_media(
+            request.user.username,
+            domain,
+            app,
+            module,
+            form,
+            lang,
+        )
 
     error = request.GET.get('error', '')
 
@@ -459,6 +355,119 @@ def _handle_bad_states(
         })
 
 
+def _get_specific_media(
+    username,
+    domain,
+    app,
+    module,
+    form,
+    lang,
+):
+    module_id = module.id if module else None
+    form_id = form.id if form else None
+    default_file_name = f'module{module_id}'
+    if form:
+        default_file_name = f'{default_file_name}_form{form_id}'
+
+    specific_media = [{
+        'menu_refs': app.get_menu_media(
+            module,
+            form=form,
+            form_index=form_id,
+            to_language=lang,
+        ),
+        'default_file_name': f'{default_file_name}_{lang}',
+    }]
+
+    if (
+        not form
+        and module
+        and not isinstance(module, ReportModule)
+        and module.uses_media()
+    ):
+        specific_media.append({
+            'menu_refs': app.get_case_list_form_media(
+                module,
+                to_language=lang,
+            ),
+            'default_file_name': _make_file_name(
+                default_file_name,
+                'case_list_form',
+                lang,
+            ),
+            'qualifier': 'case_list_form_',
+        })
+        specific_media.append({
+            'menu_refs': app.get_case_list_menu_item_media(
+                module,
+                to_language=lang,
+            ),
+            'default_file_name': _make_file_name(
+                default_file_name,
+                'case_list_menu_item',
+                lang,
+            ),
+            'qualifier': 'case_list-menu_item_',
+        })
+        if (
+            module
+            and hasattr(module, 'search_config')
+            and module.uses_media()
+            and toggles.USH_CASE_CLAIM_UPDATES.enabled(domain)
+        ):
+            specific_media.extend([
+                {
+                    'menu_refs': app.get_case_search_label_media(
+                        module,
+                        module.search_config.search_label,
+                        to_language=lang,
+                    ),
+                    'default_file_name': _make_file_name(
+                        default_file_name,
+                        'case_search_label_item',
+                        lang,
+                    ),
+                    'qualifier': 'case_search-search_label_media_'
+                },
+                {
+                    'menu_refs': app.get_case_search_label_media(
+                        module,
+                        module.search_config.search_again_label,
+                        to_language=lang,
+                    ),
+                    'default_file_name': _make_file_name(
+                        default_file_name,
+                        'case_search_again_label_item',
+                        lang,
+                    ),
+                    'qualifier': 'case_search-search_again_label_media_'
+                }
+            ])
+
+        if (
+            toggles.CASE_LIST_LOOKUP.enabled(username)
+            or toggles.CASE_LIST_LOOKUP.enabled(app.domain)
+            or toggles.BIOMETRIC_INTEGRATION.enabled(app.domain)
+        ):
+            specific_media.append({
+                'menu_refs': app.get_case_list_lookup_image(module),
+                'default_file_name': f'{default_file_name}_case_list_lookup',
+                'qualifier': 'case-list-lookupcase',
+            })
+
+            if hasattr(module, 'product_details'):
+                specific_media.append({
+                    'menu_refs': app.get_case_list_lookup_image(
+                        module,
+                        type='product',
+                    ),
+                    'default_file_name':
+                        f'{default_file_name}_product_list_lookup',
+                    'qualifier': 'case-list-lookupproduct',
+                })
+    return specific_media
+
+
 def _make_file_name(default_name, suffix, lang):
     """
     Appends ``suffix`` and ``lang`` to ``default_name``

From 275ea21ab3e9587d9a5472d60b857a1c571116df Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 15:57:54 +0100
Subject: [PATCH 33/63] Pull out _get_multimedia_context()

---
 corehq/apps/app_manager/views/view_generic.py | 101 +++++++++++-------
 1 file changed, 62 insertions(+), 39 deletions(-)

diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index 90add08a05fb..439eb7593364 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -97,13 +97,13 @@ def view_generic(
         form_unique_id,
     )
 
-    context = get_apps_base_context(request, domain, app)
     if app.copy_of:
         # redirect to "main" app rather than specific build
         return HttpResponseRedirect(reverse(
             "view_app", args=[domain, app.copy_of]
         ))
 
+    context = get_apps_base_context(request, domain, app)
     context.update({
         'module': module,
         'form': form,
@@ -133,61 +133,28 @@ def view_generic(
         template = get_module_template(request.user, module)
         context.update(get_module_view_context(request, app, module, lang))
     else:
+        template = 'app_manager/app_view_settings.html'
         context.update(get_app_view_context(request, app))
 
-        template = 'app_manager/app_view_settings.html'
         if release_manager:
             template = 'app_manager/app_view_release_manager.html'
-        if release_manager:
             context.update(get_releases_context(request, domain, app_id))
-        context.update({
-            'is_app_settings_page': not release_manager,
-        })
 
-    # update multimedia context for forms and modules.
-    menu_host = form or module
-    if menu_host:
-        uploaders = {
-            'icon': MultimediaImageUploadController(
-                "hqimage",
-                reverse(ProcessImageFileUploadView.urlname,
-                        args=[app.domain, app.get_id])
-            ),
-            'audio': MultimediaAudioUploadController(
-                "hqaudio", reverse(ProcessAudioFileUploadView.urlname,
-                        args=[app.domain, app.get_id])
-            ),
-        }
-
-        multimedia_map = app.multimedia_map
-        if form or module:
-            multimedia_map = (form or module).get_relevant_multimedia_map(app)
         context.update({
-            'multimedia': {
-                "object_map": app.get_object_map(multimedia_map=multimedia_map),
-                'upload_managers': uploaders,
-                'upload_managers_js': {type: u.js_options
-                                       for type, u in uploaders.items()},
-            }
+            'is_app_settings_page': not release_manager,
         })
 
-        context['module_icon'] = None
-        if toggles.CUSTOM_ICON_BADGES.enabled(domain):
-            if module.custom_icon:
-                context['module_icon'] = module.custom_icon
-            else:
-                context['module_icon'] = CustomIcon()
-        context['nav_menu_media_specifics'] = _get_specific_media(
+    if form or module:
+        context.update(_get_multimedia_context(
             request.user.username,
             domain,
             app,
             module,
             form,
             lang,
-        )
+        ))
 
     error = request.GET.get('error', '')
-
     context.update({
         'error': error,
         'app': app,
@@ -355,6 +322,62 @@ def _handle_bad_states(
         })
 
 
+def _get_multimedia_context(
+    username,
+    domain,
+    app,
+    module,
+    form,
+    lang,
+):
+    """
+    Returns multimedia context for forms and modules.
+    """
+    multimedia_context = {}
+    uploaders = {
+        'icon': MultimediaImageUploadController(
+            "hqimage",
+            reverse(ProcessImageFileUploadView.urlname,
+                    args=[app.domain, app.get_id])
+        ),
+        'audio': MultimediaAudioUploadController(
+            "hqaudio",
+            reverse(ProcessAudioFileUploadView.urlname,
+                    args=[app.domain, app.get_id])
+        ),
+    }
+    multimedia_map = app.multimedia_map
+    if form or module:
+        multimedia_map = (form or module).get_relevant_multimedia_map(app)
+    multimedia_context.update({
+        'multimedia': {
+            "object_map": app.get_object_map(multimedia_map=multimedia_map),
+            'upload_managers': uploaders,
+            'upload_managers_js': {
+                type_: u.js_options for type_, u in uploaders.items()
+            },
+        }
+    })
+
+    if toggles.CUSTOM_ICON_BADGES.enabled(domain):
+        if module.custom_icon:
+            multimedia_context['module_icon'] = module.custom_icon
+        else:
+            multimedia_context['module_icon'] = CustomIcon()
+    else:
+        multimedia_context['module_icon'] = None
+
+    multimedia_context['nav_menu_media_specifics'] = _get_specific_media(
+        username,
+        domain,
+        app,
+        module,
+        form,
+        lang,
+    )
+    return multimedia_context
+
+
 def _get_specific_media(
     username,
     domain,

From b27a5e583194c540005b4994917bec482e0d7018 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 15:58:48 +0100
Subject: [PATCH 34/63] `app` already added by `get_apps_base_context()`

---
 corehq/apps/app_manager/views/view_generic.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index 439eb7593364..83ba418b3b22 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -157,7 +157,6 @@ def view_generic(
     error = request.GET.get('error', '')
     context.update({
         'error': error,
-        'app': app,
     })
 
     # Pass form for Copy Application to template

From f54d0d234afe1b487d99d68f449bb8c80eec60f3 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 16:16:33 +0100
Subject: [PATCH 35/63] Pull out `_get_domain_context()`

---
 corehq/apps/app_manager/views/view_generic.py | 78 ++++++++++---------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index 83ba418b3b22..9cdab158f708 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -154,50 +154,35 @@ def view_generic(
             lang,
         ))
 
-    error = request.GET.get('error', '')
+    context.update(_get_domain_context(
+        domain,
+        request.domain,
+        request.couch_user,
+    ))
+
     context.update({
-        'error': error,
+        'error': request.GET.get('error', ''),
     })
 
     # Pass form for Copy Application to template
     if copy_app_form is None:
         copy_app_form = CopyApplicationForm(domain, app)
-
-    domain_names = {
-        d.name for d in Domain.active_for_user(request.couch_user)
-        if not (
-            is_active_downstream_domain(request.domain)
-            and get_upstream_domain_link(request.domain).master_domain == d.name
-        )
-    }
-    domain_names.add(request.domain)
-    # NOTE: The CopyApplicationForm checks for access to linked domains
-    #       before displaying
-    linkable_domains = []
-    limit_to_linked_domains = True
-    if can_domain_access_linked_domains(request.domain):
-        linkable_domains = get_accessible_downstream_domains(
-            domain,
-            request.couch_user,
-        )
-        limit_to_linked_domains = not request.couch_user.is_superuser
-    context.update({
-        'domain_names': sorted(domain_names),
-        'linkable_domains': sorted(linkable_domains),
-        'limit_to_linked_domains': limit_to_linked_domains
-    })
     context.update({
         'copy_app_form': copy_app_form,
-    })
 
-    context['latest_commcare_version'] = get_commcare_versions(request.user)[-1]
+        'latest_commcare_version': get_commcare_versions(request.user)[-1],
+    })
 
-    if not is_remote_app(app) and has_privilege(request, privileges.COMMCARE_LOGO_UPLOADER):
-        uploader_slugs = list(ANDROID_LOGO_PROPERTY_MAPPING.keys())
+    if (
+        not is_remote_app(app)
+        and has_privilege(request, privileges.COMMCARE_LOGO_UPLOADER)
+    ):
         from corehq.apps.hqmedia.controller import (
             MultimediaLogoUploadController,
         )
         from corehq.apps.hqmedia.views import ProcessLogoFileUploadView
+
+        uploader_slugs = list(ANDROID_LOGO_PROPERTY_MAPPING.keys())
         uploaders = [
             MultimediaLogoUploadController(
                 slug,
@@ -230,17 +215,14 @@ def view_generic(
             app,
             request.couch_user.username
         ),
-    })
 
-    confirm = request.session.pop('CONFIRM', False)
-    context.update({'confirm': confirm})
-    context.update({
+        'confirm': request.session.pop('CONFIRM', False),
+
         'show_release_mode':
             AppReleaseModeSetting.get_settings(domain).is_visible
     })
 
     response = render(request, template, context)
-
     set_lang_cookie(response, lang)
     return response
 
@@ -490,6 +472,32 @@ def _get_specific_media(
     return specific_media
 
 
+def _get_domain_context(domain, request_domain, couch_user):
+    domain_names = {
+        d.name for d in Domain.active_for_user(couch_user)
+        if not (
+            is_active_downstream_domain(request_domain)
+            and get_upstream_domain_link(request_domain).master_domain == d.name
+        )
+    }
+    domain_names.add(request_domain)
+    # NOTE: The CopyApplicationForm checks for access to linked domains
+    #       before displaying
+    linkable_domains = []
+    limit_to_linked_domains = True
+    if can_domain_access_linked_domains(request_domain):
+        linkable_domains = get_accessible_downstream_domains(
+            domain,
+            couch_user,
+        )
+        limit_to_linked_domains = not couch_user.is_superuser
+    return {
+        'domain_names': sorted(domain_names),
+        'linkable_domains': sorted(linkable_domains),
+        'limit_to_linked_domains': limit_to_linked_domains,
+    }
+
+
 def _make_file_name(default_name, suffix, lang):
     """
     Appends ``suffix`` and ``lang`` to ``default_name``

From 84c2bf2fcd743cae3d2a3866a1f95f50f5812606 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 16:20:31 +0100
Subject: [PATCH 36/63] Pull out `_get_logo_uploader_context()`

---
 corehq/apps/app_manager/views/view_generic.py | 66 ++++++++++---------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index 9cdab158f708..1a71b6737b2c 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -177,37 +177,7 @@ def view_generic(
         not is_remote_app(app)
         and has_privilege(request, privileges.COMMCARE_LOGO_UPLOADER)
     ):
-        from corehq.apps.hqmedia.controller import (
-            MultimediaLogoUploadController,
-        )
-        from corehq.apps.hqmedia.views import ProcessLogoFileUploadView
-
-        uploader_slugs = list(ANDROID_LOGO_PROPERTY_MAPPING.keys())
-        uploaders = [
-            MultimediaLogoUploadController(
-                slug,
-                reverse(
-                    ProcessLogoFileUploadView.urlname,
-                    args=[domain, app_id, slug],
-                )
-            )
-            for slug in uploader_slugs
-        ]
-        context.update({
-            "uploaders": uploaders,
-            "uploaders_js": [u.js_options for u in uploaders],
-            "refs": {
-                slug: ApplicationMediaReference(
-                    app.logo_refs.get(slug, {}).get("path", slug),
-                    media_class=CommCareImage,
-                ).as_dict()
-                for slug in uploader_slugs
-            },
-            "media_info": {
-                slug: app.logo_refs.get(slug)
-                for slug in uploader_slugs if app.logo_refs.get(slug)
-            },
-        })
+        context.update(_get_logo_uploader_context(domain, app_id, app))
 
     context.update({
         'show_live_preview': should_show_preview_app(
@@ -498,6 +468,40 @@ def _get_domain_context(domain, request_domain, couch_user):
     }
 
 
+def _get_logo_uploader_context(domain, app_id, app):
+    from corehq.apps.hqmedia.controller import (
+        MultimediaLogoUploadController,
+    )
+    from corehq.apps.hqmedia.views import ProcessLogoFileUploadView
+
+    uploader_slugs = list(ANDROID_LOGO_PROPERTY_MAPPING.keys())
+    uploaders = [
+        MultimediaLogoUploadController(
+            slug,
+            reverse(
+                ProcessLogoFileUploadView.urlname,
+                args=[domain, app_id, slug],
+            )
+        )
+        for slug in uploader_slugs
+    ]
+    return {
+        "uploaders": uploaders,
+        "uploaders_js": [u.js_options for u in uploaders],
+        "refs": {
+            slug: ApplicationMediaReference(
+                app.logo_refs.get(slug, {}).get("path", slug),
+                media_class=CommCareImage,
+            ).as_dict()
+            for slug in uploader_slugs
+        },
+        "media_info": {
+            slug: app.logo_refs.get(slug)
+            for slug in uploader_slugs if app.logo_refs.get(slug)
+        },
+    }
+
+
 def _make_file_name(default_name, suffix, lang):
     """
     Appends ``suffix`` and ``lang`` to ``default_name``

From e2ba6ed76d9c671644993363a8edfd57cc7e4443 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Thu, 30 May 2024 16:26:51 +0100
Subject: [PATCH 37/63] Consolidate context updates

---
 corehq/apps/app_manager/views/view_generic.py | 41 ++++---------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/corehq/apps/app_manager/views/view_generic.py b/corehq/apps/app_manager/views/view_generic.py
index 1a71b6737b2c..634b79bce7bd 100644
--- a/corehq/apps/app_manager/views/view_generic.py
+++ b/corehq/apps/app_manager/views/view_generic.py
@@ -66,19 +66,7 @@ def view_generic(
 ):
     """
     This is the main view for the app. All other views redirect to here.
-
     """
-    # HELPME
-    #
-    # This method has been flagged for refactoring due to its complexity and
-    # frequency of touches in changesets
-    #
-    # If you are writing code that touches this method, your changeset
-    # should leave the method better than you found it.
-    #
-    # Please remove this flag when this method no longer triggers an 'E' or 'F'
-    # classification from the radon code static analysis
-
     if form_id and not module_id and module_unique_id is None:
         return bail(request, domain, app_id)
 
@@ -103,6 +91,9 @@ def view_generic(
             "view_app", args=[domain, app.copy_of]
         ))
 
+    if copy_app_form is None:
+        copy_app_form = CopyApplicationForm(domain, app)
+
     context = get_apps_base_context(request, domain, app)
     context.update({
         'module': module,
@@ -111,7 +102,7 @@ def view_generic(
 
     lang = context['lang']
     if not module and hasattr(app, 'translations'):
-        context.update({"translations": app.translations.get(lang, {})})
+        context["translations"] = app.translations.get(lang, {})
 
     if not app.is_remote_app():
         context.update({
@@ -140,9 +131,7 @@ def view_generic(
             template = 'app_manager/app_view_release_manager.html'
             context.update(get_releases_context(request, domain, app_id))
 
-        context.update({
-            'is_app_settings_page': not release_manager,
-        })
+        context['is_app_settings_page'] = not release_manager
 
     if form or module:
         context.update(_get_multimedia_context(
@@ -160,19 +149,6 @@ def view_generic(
         request.couch_user,
     ))
 
-    context.update({
-        'error': request.GET.get('error', ''),
-    })
-
-    # Pass form for Copy Application to template
-    if copy_app_form is None:
-        copy_app_form = CopyApplicationForm(domain, app)
-    context.update({
-        'copy_app_form': copy_app_form,
-
-        'latest_commcare_version': get_commcare_versions(request.user)[-1],
-    })
-
     if (
         not is_remote_app(app)
         and has_privilege(request, privileges.COMMCARE_LOGO_UPLOADER)
@@ -180,14 +156,15 @@ def view_generic(
         context.update(_get_logo_uploader_context(domain, app_id, app))
 
     context.update({
+        'error': request.GET.get('error', ''),
+        'confirm': request.session.pop('CONFIRM', False),
+        'copy_app_form': copy_app_form,
+        'latest_commcare_version': get_commcare_versions(request.user)[-1],
         'show_live_preview': should_show_preview_app(
             request,
             app,
             request.couch_user.username
         ),
-
-        'confirm': request.session.pop('CONFIRM', False),
-
         'show_release_mode':
             AppReleaseModeSetting.get_settings(domain).is_visible
     })

From 63b3ab69db818f0652f783122657a0711549ba39 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Mon, 3 Jun 2024 10:25:18 -0700
Subject: [PATCH 38/63] set the default as intiial value for Tableau Role

---
 corehq/apps/users/forms.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/corehq/apps/users/forms.py b/corehq/apps/users/forms.py
index de5f2ab59dee..e9a574af305e 100644
--- a/corehq/apps/users/forms.py
+++ b/corehq/apps/users/forms.py
@@ -50,6 +50,7 @@
     get_allowed_tableau_groups_for_domain,
     get_tableau_groups_for_user,
     update_tableau_user,
+    DEFAULT_TABLEAU_ROLE,
 )
 from corehq.apps.sso.models import IdentityProvider
 from corehq.apps.sso.utils.request_helpers import is_request_using_sso
@@ -1767,6 +1768,7 @@ class BaseTableauUserForm(forms.Form):
         label=gettext_noop("Role"),
         choices=TableauUser.Roles.choices,
         required=True,
+        initial=DEFAULT_TABLEAU_ROLE,
     )
     groups = forms.MultipleChoiceField(
         label=gettext_noop("Groups"),

From 135cd6c3182f3a15344beac67197df79802344fd Mon Sep 17 00:00:00 2001
From: Amit Phulera <amitphulera999@gmail.com>
Date: Tue, 4 Jun 2024 18:13:22 +0530
Subject: [PATCH 39/63] update get_all_expected_es_indices to support ignoring
 subindices

---
 corehq/pillows/utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/corehq/pillows/utils.py b/corehq/pillows/utils.py
index a619a3937b84..f43067aeda1a 100644
--- a/corehq/pillows/utils.py
+++ b/corehq/pillows/utils.py
@@ -82,8 +82,11 @@ def get_user_type_deep_cache_for_unknown_users(user_id):
     return get_user_type(user_id)
 
 
-def get_all_expected_es_indices():
-    yield from CANONICAL_NAME_ADAPTER_MAP.values()
+def get_all_expected_es_indices(ignore_subindices=False):
+    all_es_adapters = CANONICAL_NAME_ADAPTER_MAP.values()
+    if ignore_subindices:
+        return [adapter for adapter in all_es_adapters if not adapter.parent_index_cname]
+    return all_es_adapters
 
 
 def format_form_meta_for_es(form_metadata):

From dd7c856861f35102ed21ef2b9ccb779ff8213105 Mon Sep 17 00:00:00 2001
From: Amit Phulera <amitphulera999@gmail.com>
Date: Tue, 4 Jun 2024 18:14:16 +0530
Subject: [PATCH 40/63] ignore subindices in ptop_preindex command

---
 corehq/apps/hqcase/management/commands/ptop_preindex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/hqcase/management/commands/ptop_preindex.py b/corehq/apps/hqcase/management/commands/ptop_preindex.py
index e04496a19519..be999c07a0c4 100644
--- a/corehq/apps/hqcase/management/commands/ptop_preindex.py
+++ b/corehq/apps/hqcase/management/commands/ptop_preindex.py
@@ -84,7 +84,7 @@ def add_arguments(self, parser):
 
     def handle(self, **options):
         runs = []
-        all_es_index_adapters = list(get_all_expected_es_indices())
+        all_es_index_adapters = get_all_expected_es_indices(ignore_subindices=True)
 
         if options['reset']:
             indices_needing_reindex = all_es_index_adapters

From 4f2ef433f22305e1171c10cf0e0037898a09a273 Mon Sep 17 00:00:00 2001
From: Amit Phulera <amitphulera999@gmail.com>
Date: Tue, 4 Jun 2024 18:15:07 +0530
Subject: [PATCH 41/63] remove wrapping to list which is not required now

---
 .../pillowtop/management/commands/update_es_settings.py         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/ex-submodules/pillowtop/management/commands/update_es_settings.py b/corehq/ex-submodules/pillowtop/management/commands/update_es_settings.py
index 7d448f698b45..dfb15341f902 100644
--- a/corehq/ex-submodules/pillowtop/management/commands/update_es_settings.py
+++ b/corehq/ex-submodules/pillowtop/management/commands/update_es_settings.py
@@ -19,7 +19,7 @@ def add_arguments(self, parser):
 
     def handle(self, **options):
         noinput = options.pop('noinput')
-        es_indices = list(get_all_expected_es_indices())
+        es_indices = get_all_expected_es_indices()
 
         to_update = []
 

From 29ca3fafd05495dd1048c5b2af4a933771eee28c Mon Sep 17 00:00:00 2001
From: AddisonDunn <dunnaddisonw@gmail.com>
Date: Tue, 4 Jun 2024 14:03:22 -0400
Subject: [PATCH 42/63] dont show column if not advanced mode or FF is off

---
 .../templates/locations/location_types.html   | 43 +++++++++++--------
 corehq/apps/locations/views.py                |  2 +
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/corehq/apps/locations/templates/locations/location_types.html b/corehq/apps/locations/templates/locations/location_types.html
index 1c1abcec3f40..1e33c8e01292 100644
--- a/corehq/apps/locations/templates/locations/location_types.html
+++ b/corehq/apps/locations/templates/locations/location_types.html
@@ -7,6 +7,7 @@
 {% block page_content %}
   {% initial_page_data 'location_types' location_types %}
   {% initial_page_data 'commtrack_enabled' commtrack_enabled %}
+  {% initial_page_data 'location_case_sync_restriction_enabled' location_case_sync_restriction_enabled %}
   {% initial_page_data 'suggest_orphan_case_alerts_setting' suggest_orphan_case_alerts_setting %}
   {% initial_page_data 'project_settings_url' project_settings_url %}
   <div class="row">
@@ -157,15 +158,17 @@ <h2>{% trans "Organization Levels" %}</h2>
                                           {% endblocktrans %}">
                                     </span>
               </th>
-              <th>
-                {% trans "View Child Data to Level" %}
-                <span class="hq-help-template"
-                      data-title="{% trans "View Child Data to Level" %}"
-                      data-content="{% blocktrans %}
-                          <p>Only include cases that show up in the user's restore file down to this level (inclusive).</p>
-                      {% endblocktrans %}">
-                </span>
-              </th>
+              {% if location_case_sync_restriction_enabled %}
+                <th data-bind="visible: advanced_mode">
+                  {% trans "View Child Data to Level" %}
+                  <span class="hq-help-template"
+                        data-title="{% trans "View Child Data to Level" %}"
+                        data-content="{% blocktrans %}
+                            <p>Only include cases that show up in the user's restore file down to this level (inclusive).</p>
+                        {% endblocktrans %}">
+                  </span>
+                </th>
+              {% endif %}
               <th></th>
             </tr>
             </thead>
@@ -243,16 +246,18 @@ <h2>{% trans "Organization Levels" %}</h2>
               <td>
                 <input data-bind="checked: view_descendants" type="checkbox" />
               </td>
-              <td>
-                <select class="form-control"
-                        data-bind="options: $data.child_loc_types(),
-                                   optionsText: 'name',
-                                   optionsValue: 'pk',
-                                   value: expand_view_child_data_to,
-                                   optionsCaption: '\u2013{% trans 'none' %}\u2013',
-                                   enable: view_descendants">
-                </select>
-              </td>
+              {% if location_case_sync_restriction_enabled %}
+                <td data-bind="visible: $parent.advanced_mode">
+                  <select class="form-control"
+                          data-bind="options: $data.child_loc_types(),
+                                    optionsText: 'name',
+                                    optionsValue: 'pk',
+                                    value: expand_view_child_data_to,
+                                    optionsCaption: '\u2013{% trans 'none' %}\u2013',
+                                    enable: view_descendants">
+                  </select>
+                </td>
+              {% endif %}
               <td>
                 <button type="button" class="btn btn-danger" data-bind="click: $root.remove_loctype">
                   <i class="fa-regular fa-trash-can"></i> {% trans "Remove" %}
diff --git a/corehq/apps/locations/views.py b/corehq/apps/locations/views.py
index fa84c4f2c615..8e236da63c99 100644
--- a/corehq/apps/locations/views.py
+++ b/corehq/apps/locations/views.py
@@ -310,6 +310,8 @@ def page_context(self):
         return {
             'location_types': self._location_types,
             'commtrack_enabled': self.domain_object.commtrack_enabled,
+            'location_case_sync_restriction_enabled':
+                toggles.USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION.enabled(self.domain),
             'suggest_orphan_case_alerts_setting': self._suggest_orphan_case_alerts_setting,
             'project_settings_url': reverse('domain_settings_default', args=[self.domain])
         }

From ff14a38e9e1f8d7d3d2babf475af137ba6e8dbc0 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Tue, 4 Jun 2024 16:11:20 -0400
Subject: [PATCH 43/63] Rename to avoid overriding real one

---
 corehq/apps/case_search/utils.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/case_search/utils.py b/corehq/apps/case_search/utils.py
index e6cc2e6ece01..35bcb71b0402 100644
--- a/corehq/apps/case_search/utils.py
+++ b/corehq/apps/case_search/utils.py
@@ -180,9 +180,9 @@ def __init__(self, domain):
 
     def get_base_queryset(self, slug=None):
         # slug is only informational, used for profiling
-        CaseSearchES = self.profiler.get_case_search_class(slug)
+        _CaseSearchES = self.profiler.get_case_search_class(slug)
         # See case_search_bha.py docstring for context on index_name
-        return CaseSearchES(index=self.config.index_name or None).domain(self.domain)
+        return _CaseSearchES(index=self.config.index_name or None).domain(self.domain)
 
     def wrap_case(self, es_hit, include_score=False):
         return wrap_case_search_hit(es_hit, include_score=include_score)
@@ -209,8 +209,8 @@ def __init__(self, domain, couch_user, registry_helper):
         self._registry_helper = registry_helper
 
     def get_base_queryset(self, slug=None):
-        CaseSearchES = self.profiler.get_case_search_class(slug)
-        return CaseSearchES().domain(self._registry_helper.visible_domains)
+        _CaseSearchES = self.profiler.get_case_search_class(slug)
+        return _CaseSearchES().domain(self._registry_helper.visible_domains)
 
     def wrap_case(self, es_hit, include_score=False):
         case = super().wrap_case(es_hit, include_score)

From 752398e5bd151f091700f1f122323965cfbee5f6 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Tue, 4 Jun 2024 16:51:38 -0400
Subject: [PATCH 44/63] Update fuzzy-match note

---
 docs/case_search_query_language.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/case_search_query_language.rst b/docs/case_search_query_language.rst
index 0c0b51fb7363..eb81b096ed8c 100644
--- a/docs/case_search_query_language.rst
+++ b/docs/case_search_query_language.rst
@@ -177,8 +177,9 @@ The following functions are supported:
 
 .. note::
    ``fuzzy-match`` is backed by Elasticsearch's `Fuzzy query`_, which uses `Levenshtein distance`_
-   to gauge similarity. To consider something a match, it requires an exact prefix match and an edit
-   distance based on the length of the string (longer strings can have more edits).
+   to gauge similarity. Parameters for searches are tuned in implementation to balance matching with
+   performance, but to consider something a match it generally requires matching initial prefix and
+   an edit distance based on the length of the string (longer strings can have more edits).
 
 .. _Fuzzy Query: https://www.elastic.co/guide/en/elasticsearch/reference/8.11/query-dsl-fuzzy-query.html
 .. _Levenshtein distance: https://en.wikipedia.org/wiki/Levenshtein_distance

From f0b07297d29793fbed54485aee2da90fa48227e9 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 4 Jun 2024 17:01:36 -0500
Subject: [PATCH 45/63] USH-4358: Set cc_breadcrumbs_enabled

* Add separate property for adding breacrumbs information
  so we can set it separately later if we want to.
---
 corehq/apps/app_manager/templates/app_manager/profile.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/templates/app_manager/profile.xml b/corehq/apps/app_manager/templates/app_manager/profile.xml
index 9b970b705540..4e31489b4562 100644
--- a/corehq/apps/app_manager/templates/app_manager/profile.xml
+++ b/corehq/apps/app_manager/templates/app_manager/profile.xml
@@ -28,7 +28,9 @@
     {% if support_email %}
     <property key="support-email-address" value="{{ support_email }}" force="true"/>
     {% endif %}
-    <property key="cc_persistent_menu" value="{{ app.persistent_menu }}" force="true"/>
+
+    <property key="cc_persistent_menu" value="{{ app.persistent_menu|yesno:"yes,no" }}" force="true"/>
+    <property key="cc_breadcrumbs_enabled" value="{{ app.persistent_menu|yesno:"no,yes" }}" force="true"/>
 
     <!-- Properties configured on CommCare HQ 1.0 -->
     {% for key, value in app_profile.properties.items %}{% if value != None %}

From e32640cb64de43b5a3a3f0cc647d2e8f8cc4c936 Mon Sep 17 00:00:00 2001
From: minhaminha <minhaminha@users.noreply.github.com>
Date: Wed, 5 Jun 2024 06:06:55 +0000
Subject: [PATCH 46/63] Update translations

---
 locale/en/LC_MESSAGES/django.po    | 255 +++++++++++++-----------
 locale/en/LC_MESSAGES/djangojs.po  |  18 +-
 locale/es/LC_MESSAGES/django.po    | 303 ++++++++++++++++-------------
 locale/es/LC_MESSAGES/djangojs.po  |  18 +-
 locale/fr/LC_MESSAGES/django.po    | 255 +++++++++++++-----------
 locale/fr/LC_MESSAGES/djangojs.po  |  18 +-
 locale/fra/LC_MESSAGES/django.po   | 303 ++++++++++++++++-------------
 locale/fra/LC_MESSAGES/djangojs.po |  18 +-
 locale/hi/LC_MESSAGES/django.po    | 255 +++++++++++++-----------
 locale/hi/LC_MESSAGES/djangojs.po  |  18 +-
 locale/hin/LC_MESSAGES/django.po   | 255 +++++++++++++-----------
 locale/hin/LC_MESSAGES/djangojs.po |  18 +-
 locale/por/LC_MESSAGES/django.po   | 281 ++++++++++++++------------
 locale/por/LC_MESSAGES/djangojs.po |  18 +-
 locale/pt/LC_MESSAGES/django.po    | 255 +++++++++++++-----------
 locale/pt/LC_MESSAGES/djangojs.po  |  18 +-
 locale/sw/LC_MESSAGES/django.po    | 255 +++++++++++++-----------
 locale/sw/LC_MESSAGES/djangojs.po  |  18 +-
 18 files changed, 1459 insertions(+), 1120 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 62a882e11586..15ea77b2d58c 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: corehq/motech/repeaters/forms.py
 #, fuzzy
 msgid ""
 msgstr ""
@@ -1051,8 +1052,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr ""
@@ -2933,7 +2935,6 @@ msgstr ""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -4747,7 +4748,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr ""
@@ -5216,7 +5218,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr ""
@@ -6024,7 +6027,8 @@ msgstr ""
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr ""
 
@@ -8285,7 +8289,9 @@ msgstr ""
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -9984,7 +9990,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr ""
 
@@ -12159,7 +12165,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr ""
@@ -12863,8 +12869,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -21825,8 +21831,20 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Location Data Properties"
 msgstr ""
 
 #: corehq/apps/geospatial/forms.py
@@ -21846,18 +21864,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -21946,11 +21952,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -21997,6 +21998,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -27095,7 +27100,6 @@ msgstr ""
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr ""
@@ -29372,6 +29376,10 @@ msgstr ""
 msgid "over-stock"
 msgstr ""
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -32231,11 +32239,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr ""
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr ""
@@ -36776,7 +36779,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -36860,6 +36863,16 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -43386,19 +43399,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -43442,11 +43455,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -43807,11 +43820,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -43902,6 +43915,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr ""
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr ""
@@ -43989,11 +44006,88 @@ msgstr ""
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -44061,67 +44155,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -44227,10 +44260,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -44566,6 +44595,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
diff --git a/locale/en/LC_MESSAGES/djangojs.po b/locale/en/LC_MESSAGES/djangojs.po
index 9f238867e445..02e5aeb19680 100644
--- a/locale/en/LC_MESSAGES/djangojs.po
+++ b/locale/en/LC_MESSAGES/djangojs.po
@@ -4268,14 +4268,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr ""
 
@@ -5161,19 +5163,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 9dd72af62e54..6f0407f1ed87 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -10,6 +10,7 @@
 # Michelle B. Sultan <msultan@dimagi.com>, 2016-2017
 # Nick Pellegrino <npellegrino@dimagi.com>, 2018
 # Sravan Reddy <sreddy@dimagi.com>, 2017
+#: corehq/motech/repeaters/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: CommCare HQ\n"
@@ -1148,8 +1149,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr "Cancelar"
@@ -3177,7 +3179,6 @@ msgstr "Razón de \"No Facturar\""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -3678,10 +3679,8 @@ msgid "Cannot parse datetime '{val}'"
 msgstr ""
 
 #: corehq/apps/app_execution/forms.py
-#, fuzzy
-#| msgid "Rule not found."
 msgid "User not found"
-msgstr "Regla no encontrada."
+msgstr ""
 
 #: corehq/apps/app_execution/templates/app_execution/workflow_list.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
@@ -5083,7 +5082,8 @@ msgstr "No Validación"
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr "No"
@@ -5266,10 +5266,8 @@ msgid "Show a persistent menu instead of breadcrumbs."
 msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid "Parent Menu"
 msgid "Show Persistent Menu"
-msgstr "Menú Padre"
+msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 msgid ""
@@ -5456,10 +5454,8 @@ msgid "Web Apps Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid "Apposit Settings"
 msgid "Web Apps Settings"
-msgstr "Configuraciones Apposit"
+msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 msgid "Weekly Log Sending Frequency"
@@ -5631,7 +5627,8 @@ msgstr "Densidad XXX-Alta"
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr "Sí"
@@ -6462,7 +6459,8 @@ msgstr "Instale CommCare"
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr "Cerrar"
 
@@ -8783,7 +8781,9 @@ msgstr "Formulario de Registro Accesible desde la Lista de Casos"
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -10512,7 +10512,7 @@ msgid "Add-ons"
 msgstr "Complementos"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr "Configuraciones Avanzadas"
 
@@ -12780,7 +12780,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr "Borrar"
@@ -13493,8 +13493,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -22643,10 +22643,24 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+#, fuzzy
+#| msgid "Save Questions to Case Properties"
+msgid "Location Data Properties"
+msgstr "Guardar Preguntas a Propiedades de Caso"
+
 #: corehq/apps/geospatial/forms.py
 msgid ""
 "The currently used \"{{ config.case_location_property_name }}\" case "
@@ -22664,18 +22678,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -22764,11 +22766,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -22815,6 +22812,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -28085,7 +28086,6 @@ msgstr "¡Aquí están sus llaves!"
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr "URL"
@@ -30439,6 +30439,10 @@ msgstr "adecuado"
 msgid "over-stock"
 msgstr "exceso de existencias"
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -33371,11 +33375,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr "Agregar %(case_type)s"
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr "Reporte Agendado"
@@ -38027,7 +38026,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -38111,6 +38110,22 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+#, fuzzy
+#| msgid ""
+#| "Illegal report filter type: {0}, must be one of the following choice: "
+#| "({1})"
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+"Tipo de filtro de reporte ilegal:  {0}, debe ser una de las opciones "
+"siguientes: ({1})"
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -38164,18 +38179,14 @@ msgid "When '{}' is True for an existing user, {}."
 msgstr ""
 
 #: corehq/apps/user_importer/validation.py
-#, fuzzy
-#| msgid "Sorry, you don't have permission to do this action!"
 msgid ""
 "Based on your locations do not have permission to edit this user or user "
 "invitation"
-msgstr "Lo siento, ¡usted no tiene permiso para realizar esta acción!"
+msgstr ""
 
 #: corehq/apps/user_importer/validation.py
-#, fuzzy
-#| msgid "You don't have permission to access this page."
 msgid "You do not have permission to assign or remove these locations: {}"
-msgstr "Usted no tiene permiso para acceder a esta página."
+msgstr ""
 
 #: corehq/apps/userreports/columns.py
 #, python-brace-format
@@ -40482,10 +40493,8 @@ msgid "Security"
 msgstr "Manejo de Casos"
 
 #: corehq/apps/users/templates/users/edit_commcare_user.html
-#, fuzzy
-#| msgid "Suppress"
 msgid "Support"
-msgstr "Suprimir"
+msgstr "Soporte"
 
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 msgid "User Location"
@@ -42192,20 +42201,16 @@ msgid "File Size"
 msgstr "Tamaño del Archivo"
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
-#, fuzzy
-#| msgid "Index name"
 msgid "Index"
-msgstr "Nombre de Índice"
+msgstr "Índice"
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 msgid "Parent case not found"
 msgstr "No se encuentra el caso padre"
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
-#, fuzzy
-#| msgid "Current Use"
 msgid "(current case)"
-msgstr "Uso Actual"
+msgstr ""
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 msgid "No related cases"
@@ -44830,19 +44835,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -44886,11 +44891,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -45251,11 +45256,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -45346,6 +45351,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr "Empezar Reenvío"
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr "Usuarios a excluir"
@@ -45437,11 +45446,88 @@ msgstr "XML"
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr "Reenviar"
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr "Carga útil"
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr "Error de Carga útil"
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -45509,67 +45595,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr "Reenviar"
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr "Carga útil"
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr "Error de Carga útil"
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -45678,10 +45703,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -46018,6 +46039,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
@@ -46035,10 +46060,8 @@ msgid "New Application"
 msgstr "Aplicación Nueva"
 
 #: corehq/tabs/tabclasses.py
-#, fuzzy
-#| msgid "Application Version"
 msgid "Application Testing"
-msgstr "Versión de la Aplicación"
+msgstr ""
 
 #: corehq/tabs/tabclasses.py
 msgid "Test Inbound SMS"
@@ -47150,3 +47173,7 @@ msgstr ""
 #: manage.py
 msgid "Enter valid JSON"
 msgstr ""
+
+#, python-format
+#~ msgid "Add %(case_type)s"
+#~ msgstr "Agregar %(case_type)s"
diff --git a/locale/es/LC_MESSAGES/djangojs.po b/locale/es/LC_MESSAGES/djangojs.po
index ff51c551a11c..2618ad2b91c8 100644
--- a/locale/es/LC_MESSAGES/djangojs.po
+++ b/locale/es/LC_MESSAGES/djangojs.po
@@ -4451,14 +4451,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr "¡Éxito!"
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr "Falló"
 
@@ -5367,19 +5369,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 0924a7fa2a06..51b9b43f088a 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: corehq/motech/repeaters/forms.py
 #, fuzzy
 msgid ""
 msgstr ""
@@ -1052,8 +1053,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr ""
@@ -2934,7 +2936,6 @@ msgstr ""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -4748,7 +4749,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr ""
@@ -5217,7 +5219,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr ""
@@ -6025,7 +6028,8 @@ msgstr ""
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr ""
 
@@ -8286,7 +8290,9 @@ msgstr ""
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -9985,7 +9991,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr ""
 
@@ -12160,7 +12166,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr ""
@@ -12864,8 +12870,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -21826,8 +21832,20 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Location Data Properties"
 msgstr ""
 
 #: corehq/apps/geospatial/forms.py
@@ -21847,18 +21865,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -21947,11 +21953,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -21998,6 +21999,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -27096,7 +27101,6 @@ msgstr ""
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr ""
@@ -29373,6 +29377,10 @@ msgstr ""
 msgid "over-stock"
 msgstr ""
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -32232,11 +32240,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr ""
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr ""
@@ -36773,7 +36776,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -36857,6 +36860,16 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -43383,19 +43396,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -43439,11 +43452,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -43804,11 +43817,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -43899,6 +43912,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr ""
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr ""
@@ -43986,11 +44003,88 @@ msgstr ""
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -44058,67 +44152,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -44224,10 +44257,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -44563,6 +44592,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po
index 246c819d2778..09e7b73caf2c 100644
--- a/locale/fr/LC_MESSAGES/djangojs.po
+++ b/locale/fr/LC_MESSAGES/djangojs.po
@@ -4269,14 +4269,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr ""
 
@@ -5162,19 +5164,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/fra/LC_MESSAGES/django.po b/locale/fra/LC_MESSAGES/django.po
index bf39fca14db2..9dd5db086002 100644
--- a/locale/fra/LC_MESSAGES/django.po
+++ b/locale/fra/LC_MESSAGES/django.po
@@ -34,6 +34,7 @@
 # Rowena Luk <rluk@dimagi.com>, 2015
 # Sarah Sagan <ssagan@dimagi.com>, 2015
 # Tyler Wymer <twymer@dimagi.com>, 2014
+#: corehq/motech/repeaters/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: CommCare HQ\n"
@@ -1168,8 +1169,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr "Annuler"
@@ -3193,7 +3195,6 @@ msgstr "Raison de \"Non Facturation\""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -3696,10 +3697,8 @@ msgid "Cannot parse datetime '{val}'"
 msgstr ""
 
 #: corehq/apps/app_execution/forms.py
-#, fuzzy
-#| msgid "Rule not found."
 msgid "User not found"
-msgstr "Règle introuvable."
+msgstr ""
 
 #: corehq/apps/app_execution/templates/app_execution/workflow_list.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
@@ -5067,7 +5066,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr "Non"
@@ -5236,10 +5236,8 @@ msgid "Show a persistent menu instead of breadcrumbs."
 msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid "Parent Menu"
 msgid "Show Persistent Menu"
-msgstr "Menu parent"
+msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 msgid ""
@@ -5401,10 +5399,8 @@ msgid "Web Apps Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid "Web Apps Permissions"
 msgid "Web Apps Settings"
-msgstr "Permissions pour applications web"
+msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 msgid "Weekly Log Sending Frequency"
@@ -5540,7 +5536,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr "Oui"
@@ -6382,7 +6379,8 @@ msgstr "Installer CommCare"
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr "Fermer"
 
@@ -8704,7 +8702,9 @@ msgstr "Formulaire d'enregistrement est accessible de la liste de dossiers"
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -10438,7 +10438,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
@@ -12693,7 +12693,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr "Effacer"
@@ -13407,8 +13407,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -22561,10 +22561,24 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+#, fuzzy
+#| msgid "Save Questions to Case Properties"
+msgid "Location Data Properties"
+msgstr "Enregistrer les questions dans les propriétés de dossier."
+
 #: corehq/apps/geospatial/forms.py
 msgid ""
 "The currently used \"{{ config.case_location_property_name }}\" case "
@@ -22582,18 +22596,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -22682,11 +22684,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -22733,6 +22730,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr "Afficher tous les groupes"
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -28017,7 +28018,6 @@ msgstr "Voici vos clés !"
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr "URL"
@@ -30395,6 +30395,10 @@ msgstr "adéquat"
 msgid "over-stock"
 msgstr "Surstock"
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -33331,11 +33335,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr "Ajouter %(case_type)s"
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr "Rapport planifié"
@@ -37998,7 +37997,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -38082,6 +38081,22 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+#, fuzzy
+#| msgid ""
+#| "Illegal report filter type: {0}, must be one of the following choice: "
+#| "({1})"
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+"Type de filtre de rapports non permis ou manquant \"{0}\" doit être un des "
+"choix suivants: ({1})"
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -38135,18 +38150,14 @@ msgid "When '{}' is True for an existing user, {}."
 msgstr ""
 
 #: corehq/apps/user_importer/validation.py
-#, fuzzy
-#| msgid "Sorry, you don't have permission to do this action!"
 msgid ""
 "Based on your locations do not have permission to edit this user or user "
 "invitation"
-msgstr "Désolé, vous n'avez pas la permission de réaliser cette action!"
+msgstr ""
 
 #: corehq/apps/user_importer/validation.py
-#, fuzzy
-#| msgid "You don't have permission to access this page."
 msgid "You do not have permission to assign or remove these locations: {}"
-msgstr "Vous n'avez pas la permission pour accéder à cette page."
+msgstr ""
 
 #: corehq/apps/userreports/columns.py
 #, python-brace-format
@@ -40439,10 +40450,8 @@ msgid "Security"
 msgstr "Sécurité"
 
 #: corehq/apps/users/templates/users/edit_commcare_user.html
-#, fuzzy
-#| msgid "Suppress"
 msgid "Support"
-msgstr "Supprimer"
+msgstr "Appui"
 
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 msgid "User Location"
@@ -42155,20 +42164,16 @@ msgid "File Size"
 msgstr "Taille de fichier"
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
-#, fuzzy
-#| msgid "Index name"
 msgid "Index"
-msgstr "Nom d'Index"
+msgstr "Index"
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 msgid "Parent case not found"
 msgstr "Dossier parent pas trouvé"
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
-#, fuzzy
-#| msgid "Current Use"
 msgid "(current case)"
-msgstr "Utilisation actuelle "
+msgstr ""
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 msgid "No related cases"
@@ -44790,19 +44795,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -44846,11 +44851,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -45211,11 +45216,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -45306,6 +45311,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr "Démarrer le transfert"
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr "Utilisateurs à exclure"
@@ -45397,11 +45406,88 @@ msgstr "XML"
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr "Renvoyer "
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr "Charge utile"
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr "Erreur de charge utile"
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -45469,67 +45555,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr "Renvoyer "
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr "Charge utile"
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr "Erreur de charge utile"
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -45637,10 +45662,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -45978,6 +45999,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
@@ -45995,10 +46020,8 @@ msgid "New Application"
 msgstr "Nouvelle application"
 
 #: corehq/tabs/tabclasses.py
-#, fuzzy
-#| msgid "Application Version"
 msgid "Application Testing"
-msgstr "Version de l'application"
+msgstr ""
 
 #: corehq/tabs/tabclasses.py
 msgid "Test Inbound SMS"
@@ -47145,3 +47168,7 @@ msgstr "Le Score à la Fonctionnalité"
 #: manage.py
 msgid "Enter valid JSON"
 msgstr "Saisir un JSON valide"
+
+#, python-format
+#~ msgid "Add %(case_type)s"
+#~ msgstr "Ajouter %(case_type)s"
diff --git a/locale/fra/LC_MESSAGES/djangojs.po b/locale/fra/LC_MESSAGES/djangojs.po
index 8f58c354d946..e8de155a15e9 100644
--- a/locale/fra/LC_MESSAGES/djangojs.po
+++ b/locale/fra/LC_MESSAGES/djangojs.po
@@ -4322,14 +4322,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr "Succès!"
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr "Échoué "
 
@@ -5221,19 +5223,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/hi/LC_MESSAGES/django.po b/locale/hi/LC_MESSAGES/django.po
index 8ecb8cf8d59b..61d6984b64dc 100644
--- a/locale/hi/LC_MESSAGES/django.po
+++ b/locale/hi/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: corehq/motech/repeaters/forms.py
 #, fuzzy
 msgid ""
 msgstr ""
@@ -1052,8 +1053,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr ""
@@ -2934,7 +2936,6 @@ msgstr ""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -4748,7 +4749,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr ""
@@ -5217,7 +5219,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr ""
@@ -6025,7 +6028,8 @@ msgstr ""
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr ""
 
@@ -8286,7 +8290,9 @@ msgstr ""
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -9985,7 +9991,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr ""
 
@@ -12160,7 +12166,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr ""
@@ -12864,8 +12870,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -21826,8 +21832,20 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Location Data Properties"
 msgstr ""
 
 #: corehq/apps/geospatial/forms.py
@@ -21847,18 +21865,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -21947,11 +21953,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -21998,6 +21999,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -27096,7 +27101,6 @@ msgstr ""
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr ""
@@ -29373,6 +29377,10 @@ msgstr ""
 msgid "over-stock"
 msgstr ""
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -32232,11 +32240,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr ""
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr ""
@@ -36773,7 +36776,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -36857,6 +36860,16 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -43383,19 +43396,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -43439,11 +43452,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -43804,11 +43817,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -43899,6 +43912,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr ""
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr ""
@@ -43986,11 +44003,88 @@ msgstr ""
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -44058,67 +44152,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -44224,10 +44257,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -44563,6 +44592,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
diff --git a/locale/hi/LC_MESSAGES/djangojs.po b/locale/hi/LC_MESSAGES/djangojs.po
index 71cda9de2c43..e06997ce9edc 100644
--- a/locale/hi/LC_MESSAGES/djangojs.po
+++ b/locale/hi/LC_MESSAGES/djangojs.po
@@ -4269,14 +4269,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr ""
 
@@ -5162,19 +5164,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/hin/LC_MESSAGES/django.po b/locale/hin/LC_MESSAGES/django.po
index 4b355792ba62..ca293bd680bf 100644
--- a/locale/hin/LC_MESSAGES/django.po
+++ b/locale/hin/LC_MESSAGES/django.po
@@ -17,6 +17,7 @@
 # Marcel Hilzinger <marcel.hilzinger@suselinux.hu>, 2004
 # Zé <ze@mandriva.org>, 2010-2011
 # Zsolt Bölöny <bolony.zsolt@gmail.com>, 2013
+#: corehq/motech/repeaters/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: CommCare HQ\n"
@@ -1066,8 +1067,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr ""
@@ -2948,7 +2950,6 @@ msgstr ""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -4762,7 +4763,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr "नहीं"
@@ -5231,7 +5233,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr "हॉ"
@@ -6039,7 +6042,8 @@ msgstr ""
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr ""
 
@@ -8300,7 +8304,9 @@ msgstr ""
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -9999,7 +10005,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr ""
 
@@ -12174,7 +12180,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr ""
@@ -12878,8 +12884,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -21840,8 +21846,20 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Location Data Properties"
 msgstr ""
 
 #: corehq/apps/geospatial/forms.py
@@ -21861,18 +21879,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -21961,11 +21967,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -22012,6 +22013,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -27110,7 +27115,6 @@ msgstr ""
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr ""
@@ -29387,6 +29391,10 @@ msgstr ""
 msgid "over-stock"
 msgstr ""
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -32246,11 +32254,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr ""
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr ""
@@ -36787,7 +36790,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -36871,6 +36874,16 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -43397,19 +43410,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -43453,11 +43466,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -43818,11 +43831,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -43913,6 +43926,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr ""
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr ""
@@ -44000,11 +44017,88 @@ msgstr ""
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -44072,67 +44166,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -44238,10 +44271,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -44577,6 +44606,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
diff --git a/locale/hin/LC_MESSAGES/djangojs.po b/locale/hin/LC_MESSAGES/djangojs.po
index 0b9814cbda64..f9e96d8a57d9 100644
--- a/locale/hin/LC_MESSAGES/djangojs.po
+++ b/locale/hin/LC_MESSAGES/djangojs.po
@@ -4272,14 +4272,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr ""
 
@@ -5165,19 +5167,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/por/LC_MESSAGES/django.po b/locale/por/LC_MESSAGES/django.po
index 5c412217444b..a5a6a3440093 100644
--- a/locale/por/LC_MESSAGES/django.po
+++ b/locale/por/LC_MESSAGES/django.po
@@ -33,6 +33,7 @@
 # Sarah Sagan <ssagan@dimagi.com>, 2015
 # Séfora Vazirna <seforan@gmail.com>, 2020-2021
 # Tyler Wymer <twymer@dimagi.com>, 2014
+#: corehq/motech/repeaters/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: CommCare HQ\n"
@@ -1112,8 +1113,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr "Cancelar"
@@ -2994,7 +2996,6 @@ msgstr ""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -4814,7 +4815,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr ""
@@ -5146,10 +5148,8 @@ msgid "Web Apps Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid "Settings"
 msgid "Web Apps Settings"
-msgstr "Definições"
+msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 msgid "Weekly Log Sending Frequency"
@@ -5285,7 +5285,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr ""
@@ -6096,7 +6097,8 @@ msgstr ""
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr ""
 
@@ -8357,7 +8359,9 @@ msgstr ""
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -10056,7 +10060,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr ""
 
@@ -12243,7 +12247,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr ""
@@ -12944,11 +12948,15 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
-#, python-format
+#, fuzzy, python-format
+#| msgid ""
+#| "\n"
+#| "          Welcome Back to %(cc_name)s\n"
+#| "        "
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 "\n"
 "Bem-vindo de volta ao %(cc_name)s"
@@ -21955,10 +21963,24 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+#, fuzzy
+#| msgid "Location Filter"
+msgid "Location Data Properties"
+msgstr "Filtro por Localização"
+
 #: corehq/apps/geospatial/forms.py
 msgid ""
 "The currently used \"{{ config.case_location_property_name }}\" case "
@@ -21976,18 +21998,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -22076,11 +22086,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -22127,6 +22132,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -27257,7 +27266,6 @@ msgstr ""
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr ""
@@ -29536,6 +29544,12 @@ msgstr ""
 msgid "over-stock"
 msgstr ""
 
+#: corehq/apps/reports/const.py
+#, fuzzy
+#| msgid "Case List Explorer"
+msgid "Explorer"
+msgstr "Explorador de Lista de Casos"
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -32421,11 +32435,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr ""
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr ""
@@ -36969,7 +36978,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -37053,6 +37062,16 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -39311,10 +39330,8 @@ msgid "Security"
 msgstr "Manejo de Casos"
 
 #: corehq/apps/users/templates/users/edit_commcare_user.html
-#, fuzzy
-#| msgid "Email Supported"
 msgid "Support"
-msgstr "E-mail Suportado"
+msgstr ""
 
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 msgid "User Location"
@@ -41009,10 +41026,8 @@ msgid "Parent case not found"
 msgstr ""
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
-#, fuzzy
-#| msgid "Current Users"
 msgid "(current case)"
-msgstr "Usuários Atuais"
+msgstr ""
 
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 msgid "No related cases"
@@ -43613,19 +43628,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -43669,11 +43684,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -44034,11 +44049,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -44129,6 +44144,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr ""
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr ""
@@ -44216,11 +44235,88 @@ msgstr ""
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -44288,67 +44384,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -44454,10 +44489,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -44793,6 +44824,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
@@ -44810,10 +44845,8 @@ msgid "New Application"
 msgstr "Nova Aplicação"
 
 #: corehq/tabs/tabclasses.py
-#, fuzzy
-#| msgid "Application Version"
 msgid "Application Testing"
-msgstr "Versão da Aplicação"
+msgstr ""
 
 #: corehq/tabs/tabclasses.py
 msgid "Test Inbound SMS"
diff --git a/locale/por/LC_MESSAGES/djangojs.po b/locale/por/LC_MESSAGES/djangojs.po
index ffbb16e2b0c2..a5351b307b85 100644
--- a/locale/por/LC_MESSAGES/djangojs.po
+++ b/locale/por/LC_MESSAGES/djangojs.po
@@ -4281,14 +4281,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr ""
 
@@ -5174,19 +5176,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po
index 8ecb8cf8d59b..61d6984b64dc 100644
--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: corehq/motech/repeaters/forms.py
 #, fuzzy
 msgid ""
 msgstr ""
@@ -1052,8 +1053,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr ""
@@ -2934,7 +2936,6 @@ msgstr ""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -4748,7 +4749,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr ""
@@ -5217,7 +5219,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr ""
@@ -6025,7 +6028,8 @@ msgstr ""
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr ""
 
@@ -8286,7 +8290,9 @@ msgstr ""
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -9985,7 +9991,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr ""
 
@@ -12160,7 +12166,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr ""
@@ -12864,8 +12870,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -21826,8 +21832,20 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Location Data Properties"
 msgstr ""
 
 #: corehq/apps/geospatial/forms.py
@@ -21847,18 +21865,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -21947,11 +21953,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -21998,6 +21999,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -27096,7 +27101,6 @@ msgstr ""
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr ""
@@ -29373,6 +29377,10 @@ msgstr ""
 msgid "over-stock"
 msgstr ""
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -32232,11 +32240,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr ""
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr ""
@@ -36773,7 +36776,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -36857,6 +36860,16 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -43383,19 +43396,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -43439,11 +43452,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -43804,11 +43817,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -43899,6 +43912,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr ""
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr ""
@@ -43986,11 +44003,88 @@ msgstr ""
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -44058,67 +44152,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -44224,10 +44257,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -44563,6 +44592,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
diff --git a/locale/pt/LC_MESSAGES/djangojs.po b/locale/pt/LC_MESSAGES/djangojs.po
index 71cda9de2c43..e06997ce9edc 100644
--- a/locale/pt/LC_MESSAGES/djangojs.po
+++ b/locale/pt/LC_MESSAGES/djangojs.po
@@ -4269,14 +4269,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr ""
 
@@ -5162,19 +5164,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 
diff --git a/locale/sw/LC_MESSAGES/django.po b/locale/sw/LC_MESSAGES/django.po
index 68b78640afa5..c5a82fb83035 100644
--- a/locale/sw/LC_MESSAGES/django.po
+++ b/locale/sw/LC_MESSAGES/django.po
@@ -7,6 +7,7 @@
 # esoergel, 2015
 # esoergel, 2015
 # Kamil Krampa <kkrampa@soldevelo.com>, 2015-2016
+#: corehq/motech/repeaters/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: CommCare HQ\n"
@@ -1056,8 +1057,9 @@ msgstr ""
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/forms.py
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
 #: corehq/motech/templates/motech/connection_settings.html
 msgid "Cancel"
 msgstr ""
@@ -2938,7 +2940,6 @@ msgstr ""
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
-#: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_hierarchy.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_update.html
 #: corehq/motech/generic_inbound/templates/generic_inbound/api_list.html
 #: corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -4752,7 +4753,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "No"
 msgstr ""
@@ -5221,7 +5223,8 @@ msgstr ""
 #: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
 #: corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 #: custom/inddex/filters.py
 msgid "Yes"
 msgstr ""
@@ -6029,7 +6032,8 @@ msgstr ""
 #: corehq/apps/users/templates/users/roles_and_permissions.html
 #: corehq/apps/users/templates/users/web_users.html
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/case_property_modal.html
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
 msgid "Close"
 msgstr ""
 
@@ -8290,7 +8294,9 @@ msgstr ""
 msgid ""
 "Minimize duplicate registrations by requiring mobile workers to search the "
 "case list before registering a new case. Read more on the <a href='https://"
-"help.commcarehq.org/pages/viewpage.action?pageId=30605985'>Help Site</a>."
+"dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143951603/"
+"Case+List+and+Case+Detail+Configuration#Minimize-Duplicates:-Registration-"
+"From-the-Case-List'>Help Site</a>."
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_form_setting.html
@@ -9989,7 +9995,7 @@ msgid "Add-ons"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
-#: corehq/apps/commtrack/views.py
+#: corehq/apps/commtrack/views.py corehq/apps/geospatial/forms.py
 msgid "Advanced Settings"
 msgstr ""
 
@@ -12164,7 +12170,7 @@ msgstr ""
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/domain/forms.py
-#: corehq/apps/geospatial/templates/case_grouping_map.html
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 #: corehq/apps/sms/templates/sms/chat_contacts.html
 msgid "Clear"
 msgstr ""
@@ -12868,8 +12874,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Welcome Back to %(cc_name)s\n"
-"        "
+"        Welcome Back to %(cc_name)s\n"
+"      "
 msgstr ""
 
 #: corehq/apps/dashboard/templates/dashboard/base.html
@@ -21830,8 +21836,20 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py corehq/tabs/tabclasses.py
-msgid "Configure Geospatial Settings"
+#: corehq/apps/geospatial/forms.py
+msgid "Case Grouping Parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Algorithms"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Test API Key"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid "Location Data Properties"
 msgstr ""
 
 #: corehq/apps/geospatial/forms.py
@@ -21851,18 +21869,6 @@ msgid ""
 "case property for all users that capture location data.</li></ul>"
 msgstr ""
 
-#: corehq/apps/geospatial/forms.py
-msgid "Case Grouping Parameters"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Algorithms"
-msgstr ""
-
-#: corehq/apps/geospatial/forms.py
-msgid "Test API Key"
-msgstr ""
-
 #: corehq/apps/geospatial/forms.py
 msgid "Value for maximum group size required"
 msgstr ""
@@ -21951,11 +21957,6 @@ msgstr ""
 msgid "Export Groups"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/case_grouping_map.html
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Filter by Saved Area"
-msgstr ""
-
 #: corehq/apps/geospatial/templates/case_grouping_map.html
 msgid ""
 "\n"
@@ -22002,6 +22003,10 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
+msgid "Filter by Saved Area"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/gps_capture.html
 msgid ""
 "\n"
@@ -27100,7 +27105,6 @@ msgstr ""
 #: corehq/apps/notifications/forms.py
 #: corehq/ex-submodules/casexml/apps/case/templates/case/partials/repeat_records.html
 #: corehq/messaging/smsbackends/http/forms.py corehq/motech/forms.py
-#: corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
 #: corehq/motech/generic_inbound/views.py corehq/motech/views.py
 msgid "URL"
 msgstr ""
@@ -29377,6 +29381,10 @@ msgstr ""
 msgid "over-stock"
 msgstr ""
 
+#: corehq/apps/reports/const.py
+msgid "Explorer"
+msgstr ""
+
 #: corehq/apps/reports/const.py
 msgid "Explorer - Can Publish"
 msgstr ""
@@ -32236,11 +32244,6 @@ msgstr ""
 msgid "Project Data"
 msgstr ""
 
-#: corehq/apps/reports/view_helpers.py
-#, python-format
-msgid "Add %(case_type)s"
-msgstr ""
-
 #: corehq/apps/reports/views.py
 msgid "Scheduled Report"
 msgstr ""
@@ -36777,7 +36780,7 @@ msgstr ""
 
 #: corehq/apps/user_importer/importer.py
 msgid ""
-"The email has bounced for this user's invite. Please try again with a "
+"The email has bounced for this user's invite: {}. Please try again with a "
 "different username"
 msgstr ""
 
@@ -36861,6 +36864,16 @@ msgstr ""
 msgid "Upload of web users requires 'username' and 'role' for each user"
 msgstr ""
 
+#: corehq/apps/user_importer/validation.py
+msgid "Invalid tableau role: '{}'. Please choose one of the following: {}"
+msgstr ""
+
+#: corehq/apps/user_importer/validation.py
+msgid ""
+"These groups, {}, are not valid for this domain. Please choose from the "
+"following: {}"
+msgstr ""
+
 #: corehq/apps/user_importer/validation.py
 #, python-brace-format
 msgid "'{field}' values must be unique"
@@ -43387,19 +43400,19 @@ msgid "FHIR version"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient registration"
+msgid "Register new patients on the remote FHIR service?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Register new patients on the remote FHIR service?"
+msgid "Enable patient registration"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Enable patient search"
+msgid "Search the remote FHIR service for matching patients?"
 msgstr ""
 
 #: corehq/motech/fhir/forms.py
-msgid "Search the remote FHIR service for matching patients?"
+msgid "Enable patient search"
 msgstr ""
 
 #: corehq/motech/fhir/repeaters.py corehq/motech/fhir/views.py
@@ -43443,11 +43456,11 @@ msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Skip certificate verification"
+msgid "Do not use in a production environment"
 msgstr ""
 
 #: corehq/motech/forms.py
-msgid "Do not use in a production environment"
+msgid "Skip certificate verification"
 msgstr ""
 
 #: corehq/motech/forms.py corehq/motech/openmrs/forms.py
@@ -43808,11 +43821,11 @@ msgid ""
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Atom feed enabled"
+msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
-msgid "Poll Atom feed for changes made in OpenMRS/Bahmni"
+msgid "Atom feed enabled"
 msgstr ""
 
 #: corehq/motech/openmrs/forms.py
@@ -43903,6 +43916,10 @@ msgstr ""
 msgid "Start Forwarding"
 msgstr ""
 
+#: corehq/motech/repeaters/forms.py
+msgid "Include 'app_id' URL query parameter."
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Users to exclude"
 msgstr ""
@@ -43990,11 +44007,88 @@ msgstr ""
 msgid "Python dictionary"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Resend selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Resend"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Cancel selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue selected records"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Requeue"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select all %(total)s payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_pending)s pending payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#, python-format
+msgid "Select %(total_cancelled)s cancelled payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Please select at least one payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "This action is not allowed for some of the selected payloads"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Confirmation"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Are you sure?"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/templates/motech/logs.html
+msgid "Payload"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+msgid "Payload Error"
+msgstr ""
+
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/partials/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+#: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "Diagnosis:"
 msgstr ""
 
@@ -44062,67 +44156,6 @@ msgid ""
 "                                "
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Resend selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Resend"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Cancel selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue selected records"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Requeue"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select all %(total)s payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_pending)s pending payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#, python-format
-msgid "Select %(total_cancelled)s cancelled payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Please select at least one payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "This action is not allowed for some of the selected payloads"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Confirmation"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Are you sure?"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-#: corehq/motech/templates/motech/logs.html
-msgid "Payload"
-msgstr ""
-
-#: corehq/motech/repeaters/templates/repeaters/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 #, python-format
 msgid ""
@@ -44228,10 +44261,6 @@ msgstr ""
 msgid "Delete Connection Settings"
 msgstr ""
 
-#: corehq/motech/templates/motech/connection_settings.html
-msgid "Deleting Connection Settings"
-msgstr ""
-
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/motech/templates/motech/connection_settings_detail.html
 msgid "Add Connection Settings"
@@ -44567,6 +44596,10 @@ msgstr ""
 msgid "Data Manipulation"
 msgstr ""
 
+#: corehq/tabs/tabclasses.py
+msgid "Configure Geospatial Settings"
+msgstr ""
+
 #: corehq/tabs/tabclasses.py
 msgid "Remote"
 msgstr ""
diff --git a/locale/sw/LC_MESSAGES/djangojs.po b/locale/sw/LC_MESSAGES/djangojs.po
index bb3491ba8e70..b780335e6876 100644
--- a/locale/sw/LC_MESSAGES/djangojs.po
+++ b/locale/sw/LC_MESSAGES/djangojs.po
@@ -4272,14 +4272,16 @@ msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Success!"
 msgstr ""
 
 #: corehq/apps/reports/static/reports/js/bootstrap3/submission_error_report.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/submission_error_report.js
 #: corehq/ex-submodules/casexml/apps/case/static/case/js/repeat_records.js
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed"
 msgstr ""
 
@@ -5165,19 +5167,23 @@ msgstr ""
 msgid "Failed to schedule task to import from OpenMRS."
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch attempts"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to fetch payload"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to send"
 msgstr ""
 
-#: corehq/motech/repeaters/static/repeaters/js/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+#: corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
 msgid "Failed to cancel"
 msgstr ""
 

From 65c762459f199b9128f4709d6d1072adeba066a7 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 08:14:23 -0400
Subject: [PATCH 47/63] Updated base  value for B5

---
 .../hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss    | 2 +-
 .../imports/includes_variables._variables.style.diff.txt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
index 240872a81194..01ac9da72d0c 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
@@ -118,7 +118,7 @@ $dimagi-mango: #FC5F36;
 // Base color overrides
 $blue: #5D70D2;
 $green: #3FA12A;
-$red: $dimagi-sunset;
+$red: darken($dimagi-sunset, 20%);
 $teal: #01A2A9;
 $yellow: $dimagi-marigold;
 $indigo: $dimagi-indigo;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
index 35ee6f00e6c9..b63da5f3eb5a 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
@@ -225,7 +225,7 @@
 +// Base color overrides
 +$blue: #5D70D2;
 +$green: #3FA12A;
-+$red: $dimagi-sunset;
++$red: darken($dimagi-sunset, 20%);
 +$teal: #01A2A9;
 +$yellow: $dimagi-marigold;
 +$indigo: $dimagi-indigo;

From 4855bcf6064198a8d3d64eb8ec456ff46cb40ff9 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 12:36:24 -0400
Subject: [PATCH 48/63] Darkened primary blue and lightened success green

---
 .../hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
index 01ac9da72d0c..b567e308ddb0 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
@@ -116,8 +116,8 @@ $dimagi-mango: #FC5F36;
 
 
 // Base color overrides
-$blue: #5D70D2;
-$green: #3FA12A;
+$blue: darken(#5D70D2, 20%);
+$green: lighten(#3FA12A, 20%);
 $red: darken($dimagi-sunset, 20%);
 $teal: #01A2A9;
 $yellow: $dimagi-marigold;

From 6978569c37f4471f1becb937a60d06b9b51af2ce Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 16:36:36 +0000
Subject: [PATCH 49/63] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../imports/includes_variables._variables.style.diff.txt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
index b63da5f3eb5a..e21bbfde2444 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
@@ -223,8 +223,8 @@
 +
 +
 +// Base color overrides
-+$blue: #5D70D2;
-+$green: #3FA12A;
++$blue: darken(#5D70D2, 20%);
++$green: lighten(#3FA12A, 20%);
 +$red: darken($dimagi-sunset, 20%);
 +$teal: #01A2A9;
 +$yellow: $dimagi-marigold;

From 1134e6d3b98653dddde41c0be088c91b210b1858 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 12:43:15 -0400
Subject: [PATCH 50/63] Darkened green instead of lightening it

Lightening would be fine if this were just about buttons, but we also use this as a text color on white
backgrounds.
---
 .../hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
index b567e308ddb0..9f23e33527ca 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
@@ -117,7 +117,7 @@ $dimagi-mango: #FC5F36;
 
 // Base color overrides
 $blue: darken(#5D70D2, 20%);
-$green: lighten(#3FA12A, 20%);
+$green: darken(#3FA12A, 10%);
 $red: darken($dimagi-sunset, 20%);
 $teal: #01A2A9;
 $yellow: $dimagi-marigold;

From 9ede242f2b72d3a0240bf47a2560363e0ba22fb5 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 16:43:55 +0000
Subject: [PATCH 51/63] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../imports/includes_variables._variables.style.diff.txt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
index e21bbfde2444..3a61dd2ee756 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
@@ -224,7 +224,7 @@
 +
 +// Base color overrides
 +$blue: darken(#5D70D2, 20%);
-+$green: lighten(#3FA12A, 20%);
++$green: darken(#3FA12A, 10%);
 +$red: darken($dimagi-sunset, 20%);
 +$teal: #01A2A9;
 +$yellow: $dimagi-marigold;

From 0b0f2fae742e648eac4285c8b6cbfb627ba8c80b Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Wed, 5 Jun 2024 08:52:04 -0500
Subject: [PATCH 52/63] USH-4358: add separate setting to show breadcrumbs

---
 corehq/apps/app_manager/models.py                      |  1 +
 .../static/app_manager/json/commcare-app-settings.yml  | 10 +++++++++-
 .../app_manager/json/commcare-settings-layout.yml      |  1 +
 corehq/apps/app_manager/static_strings.py              |  4 +++-
 .../apps/app_manager/templates/app_manager/profile.xml |  2 +-
 corehq/apps/app_manager/views/apps.py                  |  3 ++-
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/app_manager/models.py b/corehq/apps/app_manager/models.py
index 9c839108c40a..c1d195048934 100644
--- a/corehq/apps/app_manager/models.py
+++ b/corehq/apps/app_manager/models.py
@@ -4188,6 +4188,7 @@ def assert_app_v2(self):
     split_screen_dynamic_search = BooleanProperty(default=False)
 
     persistent_menu = BooleanProperty(default=False)
+    show_breadcrumbs = BooleanProperty(default=True)
 
     @property
     def id(self):
diff --git a/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml b/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml
index 0eaf567d1a12..5fcf2b47a724 100644
--- a/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml
+++ b/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml
@@ -181,7 +181,15 @@
 
 - id: persistent_menu
   name: Show Persistent Menu
-  description: Show a persistent menu instead of breadcrumbs.
+  description: Show the persistent menu on the side of the web app.
+  toggle: PERSISTENT_MENU_SETTING
+  widget: bool
+  default: false
+  since: '2.54'
+
+- id: show_breadcrumbs
+  name: Show Breadcrumbs
+  description: Show the breadcrumbs on top of the web app.
   toggle: PERSISTENT_MENU_SETTING
   widget: bool
   default: false
diff --git a/corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yml b/corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yml
index c04c8403a364..c8b81e34dfb6 100644
--- a/corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yml
+++ b/corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yml
@@ -55,6 +55,7 @@
   collapse: true
   settings:
     - properties.logo_web_apps
+    - hq.show_breadcrumbs
     - hq.persistent_menu
 
 - title: 'Advanced'
diff --git a/corehq/apps/app_manager/static_strings.py b/corehq/apps/app_manager/static_strings.py
index a11c428ec035..c4a52be4528b 100644
--- a/corehq/apps/app_manager/static_strings.py
+++ b/corehq/apps/app_manager/static_strings.py
@@ -160,7 +160,9 @@
     gettext_noop('Server User Registration'),
     gettext_noop('Set to skip if your deployment does not require users to register with the server. Note that this will likely result in OTA Restore and other features being unavailable.'),
     gettext_noop('Short'),
-    gettext_noop('Show a persistent menu instead of breadcrumbs.'),
+    gettext_noop('Show Breadcrumbs'),
+    gettext_noop('Show the breadcrumbs on top of the web app.'),
+    gettext_noop('Show the persistent menu on the side of the web app.'),
     gettext_noop('Show Persistent Menu'),
     gettext_noop('Simple (FOR TESTING ONLY: crashes with any unrecognized user-defined translations)'),
     gettext_noop('Skip'),
diff --git a/corehq/apps/app_manager/templates/app_manager/profile.xml b/corehq/apps/app_manager/templates/app_manager/profile.xml
index 4e31489b4562..782bae17dcd4 100644
--- a/corehq/apps/app_manager/templates/app_manager/profile.xml
+++ b/corehq/apps/app_manager/templates/app_manager/profile.xml
@@ -30,7 +30,7 @@
     {% endif %}
 
     <property key="cc_persistent_menu" value="{{ app.persistent_menu|yesno:"yes,no" }}" force="true"/>
-    <property key="cc_breadcrumbs_enabled" value="{{ app.persistent_menu|yesno:"no,yes" }}" force="true"/>
+    <property key="cc_breadcrumbs_enabled" value="{{ app.show_breadcrumbs|yesno:"yes,no" }}" force="true"/>
 
     <!-- Properties configured on CommCare HQ 1.0 -->
     {% for key, value in app_profile.properties.items %}{% if value != None %}
diff --git a/corehq/apps/app_manager/views/apps.py b/corehq/apps/app_manager/views/apps.py
index 91c8fc7341c9..c9adbf1e0cd0 100644
--- a/corehq/apps/app_manager/views/apps.py
+++ b/corehq/apps/app_manager/views/apps.py
@@ -883,7 +883,8 @@ def _always_allowed(x):
         ('mobile_ucr_restore_version', None, _always_allowed),
         ('location_fixture_restore', None, _always_allowed),
         ('split_screen_dynamic_search', None, _always_allowed),
-        ('persistent_menu', None, _always_allowed)
+        ('persistent_menu', None, _always_allowed),
+        ('show_breadcrumbs', None, _always_allowed)
     )
     for attribute, transformation, can_set_attr in easy_attrs:
         if should_edit(attribute):

From a26e376b1fe5336a377db1443b07f94aba2face1 Mon Sep 17 00:00:00 2001
From: nospame <mapson.evan@gmail.com>
Date: Wed, 5 Jun 2024 09:00:43 -0700
Subject: [PATCH 53/63] Update software plan visibilities

- One-time changes to existing plans
- Remove 'ANNUAL' visibility
---
 corehq/apps/accounting/bootstrap/utils.py     |  5 ++-
 .../0095_update_softwareplan_visibilities.py  | 44 +++++++++++++++++++
 corehq/apps/accounting/models.py              |  2 -
 migrations.lock                               |  1 +
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 corehq/apps/accounting/migrations/0095_update_softwareplan_visibilities.py

diff --git a/corehq/apps/accounting/bootstrap/utils.py b/corehq/apps/accounting/bootstrap/utils.py
index 3bea07c4f521..64e56f64a361 100644
--- a/corehq/apps/accounting/bootstrap/utils.py
+++ b/corehq/apps/accounting/bootstrap/utils.py
@@ -171,8 +171,9 @@ def _ensure_software_plan(plan_key, product, product_rate, verbose, apps):
         plan_opts = {
             'name': plan_name,
             'edition': plan_key.edition,
-            'visibility': (SoftwarePlanVisibility.ANNUAL
-                           if plan_key.is_annual_plan else SoftwarePlanVisibility.PUBLIC),
+            'visibility': (SoftwarePlanVisibility.INTERNAL
+                if plan_key.edition == SoftwarePlanEdition.ENTERPRISE
+                else SoftwarePlanVisibility.PUBLIC),
         }
         if plan_key.is_annual_plan is not None:
             plan_opts['is_annual_plan'] = plan_key.is_annual_plan
diff --git a/corehq/apps/accounting/migrations/0095_update_softwareplan_visibilities.py b/corehq/apps/accounting/migrations/0095_update_softwareplan_visibilities.py
new file mode 100644
index 000000000000..c05fdc5c6938
--- /dev/null
+++ b/corehq/apps/accounting/migrations/0095_update_softwareplan_visibilities.py
@@ -0,0 +1,44 @@
+from datetime import datetime
+
+from django.db import migrations, models
+
+from corehq.apps.accounting.models import SoftwarePlanVisibility
+
+ANNUAL = "ANNUAL"
+
+
+def change_plan_visibilities(apps, schema_editor):
+    # one-time cleanup of existing software plans
+    SoftwarePlan = apps.get_model('accounting', 'SoftwarePlan')
+
+    enterprise_names = ["Dimagi Only CommCare Enterprise Edition"]
+    enterprise_plans = SoftwarePlan.objects.filter(name__in=enterprise_names)
+    enterprise_plans.update(visibility=SoftwarePlanVisibility.INTERNAL, last_modified=datetime.now())
+
+    annual_plans = SoftwarePlan.objects.filter(visibility=ANNUAL)
+    annual_plans.update(visibility=SoftwarePlanVisibility.PUBLIC, last_modified=datetime.now())
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounting", "0094_add_annual_softwareplans"),
+    ]
+
+    operations = [
+        migrations.RunPython(change_plan_visibilities),
+        migrations.AlterField(
+            model_name="softwareplan",
+            name="visibility",
+            field=models.CharField(
+                choices=[
+                    ("PUBLIC", "PUBLIC - Anyone can subscribe"),
+                    ("INTERNAL", "INTERNAL - Dimagi must create subscription"),
+                    ("TRIAL", "TRIAL- This is a Trial Plan"),
+                    ("ARCHIVED", "ARCHIVED - hidden from subscription change forms"),
+                ],
+                default="INTERNAL",
+                max_length=10,
+            ),
+        ),
+    ]
diff --git a/corehq/apps/accounting/models.py b/corehq/apps/accounting/models.py
index 131b454eb6e6..df5296bd3d0d 100644
--- a/corehq/apps/accounting/models.py
+++ b/corehq/apps/accounting/models.py
@@ -171,14 +171,12 @@ class SoftwarePlanVisibility(object):
     PUBLIC = "PUBLIC"
     INTERNAL = "INTERNAL"
     TRIAL = "TRIAL"
-    ANNUAL = "ANNUAL"
     ARCHIVED = "ARCHIVED"
     CHOICES = (
         (PUBLIC, "PUBLIC - Anyone can subscribe"),
         (INTERNAL, "INTERNAL - Dimagi must create subscription"),
         (TRIAL, "TRIAL- This is a Trial Plan"),
         (ARCHIVED, "ARCHIVED - hidden from subscription change forms"),
-        (ANNUAL, "ANNUAL - public plans that on annual pricing"),
     )
 
 
diff --git a/migrations.lock b/migrations.lock
index 4561d88dde95..f180b4e1cc2a 100644
--- a/migrations.lock
+++ b/migrations.lock
@@ -114,6 +114,7 @@ accounting
  0092_revert_application_error_report_priv
  0093_defaultproductplan_is_annual_plan
  0094_add_annual_softwareplans
+ 0095_update_softwareplan_visibilities
 admin
  0001_initial
  0002_logentry_remove_auto_add

From 3355581c81a9fd7b68054ad68592c5337542c085 Mon Sep 17 00:00:00 2001
From: nospame <mapson.evan@gmail.com>
Date: Wed, 5 Jun 2024 09:47:28 -0700
Subject: [PATCH 54/63] Update test_ensure_plans

---
 corehq/apps/accounting/tests/test_ensure_plans.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/accounting/tests/test_ensure_plans.py b/corehq/apps/accounting/tests/test_ensure_plans.py
index d1af692a00ab..2ceef0f6d4ad 100644
--- a/corehq/apps/accounting/tests/test_ensure_plans.py
+++ b/corehq/apps/accounting/tests/test_ensure_plans.py
@@ -104,7 +104,8 @@ def _test_plan_versions_ensured(self, bootstrap_config):
             )
             self.assertEqual(sms_feature_rate.per_excess_fee, 0)
 
-            expected_visibility = (SoftwarePlanVisibility.ANNUAL
-                                   if is_annual_plan else SoftwarePlanVisibility.PUBLIC)
+            expected_visibility = (SoftwarePlanVisibility.INTERNAL
+                                   if edition == SoftwarePlanEdition.ENTERPRISE
+                                   else SoftwarePlanVisibility.PUBLIC)
             self.assertEqual(software_plan_version.plan.visibility, expected_visibility)
             self.assertEqual(software_plan_version.plan.is_annual_plan, is_annual_plan)

From f5ff9fccd48832448623aa8cb53e5591b642ec74 Mon Sep 17 00:00:00 2001
From: AddisonDunn <dunnaddisonw@gmail.com>
Date: Wed, 5 Jun 2024 15:17:32 -0400
Subject: [PATCH 55/63] use different way of checking the FF

---
 .../apps/locations/templates/locations/location_types.html   | 5 ++---
 corehq/apps/locations/views.py                               | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/corehq/apps/locations/templates/locations/location_types.html b/corehq/apps/locations/templates/locations/location_types.html
index 1e33c8e01292..2a04442b7972 100644
--- a/corehq/apps/locations/templates/locations/location_types.html
+++ b/corehq/apps/locations/templates/locations/location_types.html
@@ -7,7 +7,6 @@
 {% block page_content %}
   {% initial_page_data 'location_types' location_types %}
   {% initial_page_data 'commtrack_enabled' commtrack_enabled %}
-  {% initial_page_data 'location_case_sync_restriction_enabled' location_case_sync_restriction_enabled %}
   {% initial_page_data 'suggest_orphan_case_alerts_setting' suggest_orphan_case_alerts_setting %}
   {% initial_page_data 'project_settings_url' project_settings_url %}
   <div class="row">
@@ -158,7 +157,7 @@ <h2>{% trans "Organization Levels" %}</h2>
                                           {% endblocktrans %}">
                                     </span>
               </th>
-              {% if location_case_sync_restriction_enabled %}
+              {% if request|toggle_enabled:"USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION" %}
                 <th data-bind="visible: advanced_mode">
                   {% trans "View Child Data to Level" %}
                   <span class="hq-help-template"
@@ -246,7 +245,7 @@ <h2>{% trans "Organization Levels" %}</h2>
               <td>
                 <input data-bind="checked: view_descendants" type="checkbox" />
               </td>
-              {% if location_case_sync_restriction_enabled %}
+              {% if request|toggle_enabled:"USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION" %}
                 <td data-bind="visible: $parent.advanced_mode">
                   <select class="form-control"
                           data-bind="options: $data.child_loc_types(),
diff --git a/corehq/apps/locations/views.py b/corehq/apps/locations/views.py
index 8e236da63c99..fa84c4f2c615 100644
--- a/corehq/apps/locations/views.py
+++ b/corehq/apps/locations/views.py
@@ -310,8 +310,6 @@ def page_context(self):
         return {
             'location_types': self._location_types,
             'commtrack_enabled': self.domain_object.commtrack_enabled,
-            'location_case_sync_restriction_enabled':
-                toggles.USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION.enabled(self.domain),
             'suggest_orphan_case_alerts_setting': self._suggest_orphan_case_alerts_setting,
             'project_settings_url': reverse('domain_settings_default', args=[self.domain])
         }

From 72e6a158d95d5b6b180960d864a9e492765e3f6a Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 6 Jun 2024 08:24:14 -0400
Subject: [PATCH 56/63] JSONSchemaValidator has no _extract_errors attribute

Also fix a lint error.
---
 corehq/util/validation.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/corehq/util/validation.py b/corehq/util/validation.py
index a25055999759..c314cb2cb0d7 100644
--- a/corehq/util/validation.py
+++ b/corehq/util/validation.py
@@ -38,6 +38,7 @@ def has_scheme(url):
     scheme_regex = r'(?:.+:)?//'  # Should match 'http://', 'file://', '//' etc
     return bool(re.match(scheme_regex, url))
 
+
 @deconstructible
 class JSONSchemaValidator:
     """Field level validation for JSONField against a JSON Schema"""
@@ -53,7 +54,7 @@ def __call__(self, value):
         def _extract_errors(_errors):
             for error in _errors:
                 if error.context:
-                    return self._extract_errors(error.context)
+                    return _extract_errors(error.context)
 
                 message = str(error).replace("\n\n", ": ").replace("\n", "")
                 django_errors.append(ValidationError(message))

From 1b3aa52608d6689d7cb79957bb2cb9f71424946c Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 6 Jun 2024 08:26:22 -0400
Subject: [PATCH 57/63] Add HqBaseResource hook for schema validation

---
 corehq/apps/api/resources/__init__.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/corehq/apps/api/resources/__init__.py b/corehq/apps/api/resources/__init__.py
index 65ce4e44a099..2e1e1d2b0e4a 100644
--- a/corehq/apps/api/resources/__init__.py
+++ b/corehq/apps/api/resources/__init__.py
@@ -1,5 +1,6 @@
 import json
 
+from django.core.exceptions import ValidationError
 from django.http import HttpResponse
 from django.urls import NoReverseMatch
 
@@ -114,6 +115,22 @@ def dispatch(self, request_type, request, **kwargs):
                 content_type="application/json",
                 status=401))
 
+    def alter_deserialized_detail_data(self, request, data):
+        """Provide a hook for data validation
+
+        Subclasses may implement ``validate_deserialized_data`` that
+        raises ``django.core.exceptions.ValidationError`` if the submitted
+        data is not valid. This is designed to work conveniently with
+        ``corehq.util.validation.JSONSchemaValidator``.
+        """
+        data = super().alter_deserialized_detail_data(request, data)
+        if hasattr(self, "validate_deserialized_data"):
+            try:
+                self.validate_deserialized_data(data)
+            except ValidationError as error:
+                raise ImmediateHttpResponse(self.error_response(request, error.messages))
+        return data
+
     def get_required_privilege(self):
         return privileges.API_ACCESS
 

From caab31de34ebb7b4fb7b53a7a3d12ff5df28757a Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 6 Jun 2024 08:34:56 -0400
Subject: [PATCH 58/63] Validate data submitted to lookup table row API

---
 .../apps/api/tests/lookup_table_resources.py  | 15 +++++
 corehq/apps/fixtures/resources/v0_1.py        | 61 +++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/corehq/apps/api/tests/lookup_table_resources.py b/corehq/apps/api/tests/lookup_table_resources.py
index 2a36032d3e1f..54692d1d442e 100644
--- a/corehq/apps/api/tests/lookup_table_resources.py
+++ b/corehq/apps/api/tests/lookup_table_resources.py
@@ -328,6 +328,21 @@ def test_update(self):
             'cool_attr_value'
         )
 
+    def test_create_with_bad_properties(self):
+        data_item_json = self._get_data_item_create()
+        data_item_json["fields"]["state_name"]["field_list"][0]["properties"] = []
+        response = self._assert_auth_post_resource(
+            self.list_endpoint,
+            json.dumps(data_item_json),
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        errors = json.loads(response.content.decode("utf-8"))
+        print(errors)
+        self.assertIn("[] is not of type 'object':", errors[0])
+        data_item = LookupTableRow.objects.filter(domain=self.domain.name).first()
+        self.assertIsNone(data_item)
+
 
 class TestLookupTableItemResourceV05(TestLookupTableItemResourceV06):
     resource = LookupTableItemResource
diff --git a/corehq/apps/fixtures/resources/v0_1.py b/corehq/apps/fixtures/resources/v0_1.py
index 1b1924845a1d..d6e7527bdc44 100644
--- a/corehq/apps/fixtures/resources/v0_1.py
+++ b/corehq/apps/fixtures/resources/v0_1.py
@@ -19,6 +19,7 @@
 )
 from corehq.apps.fixtures.utils import clear_fixture_cache
 from corehq.apps.users.models import HqPermissions
+from corehq.util.validation import JSONSchemaValidator
 
 
 def convert_fdt(fdi, type_cache=None):
@@ -218,11 +219,71 @@ def make_field(data):
 
 
 class LookupTableItemResource(HqBaseResource):
+    """Lookup Table Row API resource
+
+    Example ``fields`` format:
+
+        "fields": {
+            "tree": {
+                "field_list": [
+                    {
+                        "field_value": "pine",
+                        "properties": {"family": "Pinaceae"}
+                    }
+                ]
+            }
+        }
+
+    Note: the object containing "field_list" is superfluous and could
+    be replaced with the "field_list" property value. Maybe in a
+    API version?
+
+    Example ``item_attributes`` format:
+
+        "item_attributes": {
+            "name": "Western White Pine Tree",
+            "height": "30-50 meters",
+        }
+    """
     id = UUIDField(attribute='id', readonly=True, unique=True)
     data_type_id = UUIDField(attribute='table_id')
     fields = FieldsDictField(attribute='fields')
     item_attributes = tp_f.DictField(attribute='item_attributes')
 
+    validate_deserialized_data = JSONSchemaValidator({
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "type": "object",
+        "properties": {
+            "fields": {
+                "type": "object",
+                "additionalProperties": {
+                    "type": "object",
+                    "properties": {"field_list": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "patternProperties": {
+                                "^(field_)?value$": {"type": "string"},
+                            },
+                            "properties": {
+                                "properties": {
+                                    "type": "object",
+                                    "additionalProperties": {"type": "string"},
+                                },
+                            },
+                            "additionalProperties": False,
+                        },
+                    }},
+                    "additionalProperties": False,
+                },
+            },
+            "item_attributes": {
+                "type": "object",
+                "additionalProperties": {"type": "string"},
+            }
+        },
+    })
+
     # It appears that sort_key is not included in any user facing UI. It is only defined as
     # the order of rows in the excel file when uploaded. We'll keep this behavior by incrementing
     # the sort key on new item creations

From e5d4a018ddcd47db456a60f0eb9cf29faabe3431 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 6 Jun 2024 09:29:18 -0400
Subject: [PATCH 59/63] Add schema validation for Lookup Table API

Verified that tests exercise all string fields in the schema except "name", which will be addressed in a separate commit.
---
 corehq/apps/fixtures/resources/v0_1.py | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/corehq/apps/fixtures/resources/v0_1.py b/corehq/apps/fixtures/resources/v0_1.py
index d6e7527bdc44..00bab395c4d3 100644
--- a/corehq/apps/fixtures/resources/v0_1.py
+++ b/corehq/apps/fixtures/resources/v0_1.py
@@ -109,12 +109,51 @@ class Meta(CustomResourceMeta):
 
 
 class LookupTableResource(HqBaseResource):
+    """Lookup Table API resource
+
+    Example ``fields`` format:
+
+        "fields": [
+            {
+                "field_name": "tree",
+                "properties": ["family"]
+            }
+        ]
+
+    Example ``item_attributes`` format:
+
+        "item_attributes": ["name", "height"]
+    """
     id = UUIDField(attribute='id', readonly=True, unique=True)
     is_global = tp_f.BooleanField(attribute='is_global')
     tag = tp_f.CharField(attribute='tag')
     fields = tp_f.ListField(attribute='fields')
     item_attributes = tp_f.ListField(attribute='item_attributes')
 
+    validate_deserialized_data = JSONSchemaValidator({
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "type": "object",
+        "properties": {
+            "fields": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "patternProperties": {
+                        "^(field_)?name$": {"type": "string"},
+                    },
+                    "properties": {
+                        "properties": {
+                            "type": "array",
+                            "items": {"type": "string"},
+                        },
+                    },
+                    "additionalProperties": False,
+                },
+            },
+            "item_attributes": {"type": "array", "items": {"type": "string"}}
+        },
+    })
+
     def dehydrate_fields(self, bundle):
         return [
             {

From 99fb30507ad2dd106741ebae2bec6ec4cb4e9caf Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 6 Jun 2024 14:08:27 -0400
Subject: [PATCH 60/63] Fix bug in Lookup Table API updates

"field_name" was not accepted.
---
 corehq/apps/api/tests/lookup_table_resources.py | 12 ++++++++++++
 corehq/apps/fixtures/resources/v0_1.py          | 17 ++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/api/tests/lookup_table_resources.py b/corehq/apps/api/tests/lookup_table_resources.py
index 54692d1d442e..306a22ecfa0b 100644
--- a/corehq/apps/api/tests/lookup_table_resources.py
+++ b/corehq/apps/api/tests/lookup_table_resources.py
@@ -237,6 +237,18 @@ def test_update(self):
         self.assertEqual(data_type.fields[0].properties, ['lang', 'name'])
         self.assertEqual(data_type.item_attributes, ['X'])
 
+    def test_update_field_name(self):
+        lookup_table = {
+            "fields": [{"name": "ignored", "field_name": "property", "properties": ["value"]}],
+            "tag": "lookup_table",
+        }
+
+        response = self._assert_auth_post_resource(
+            self.single_endpoint(self.data_type.id), json.dumps(lookup_table), method="PUT")
+        print(response.content)  # for debugging errors
+        data_type = LookupTable.objects.get(id=self.data_type.id)
+        self.assertEqual(data_type.fields[0].field_name, 'property')
+
 
 class TestLookupTableItemResourceV06(APIResourceTest):
     resource = LookupTableItemResource
diff --git a/corehq/apps/fixtures/resources/v0_1.py b/corehq/apps/fixtures/resources/v0_1.py
index 00bab395c4d3..5c4cc6df04c5 100644
--- a/corehq/apps/fixtures/resources/v0_1.py
+++ b/corehq/apps/fixtures/resources/v0_1.py
@@ -178,13 +178,15 @@ def obj_delete(self, bundle, **kwargs):
         clear_fixture_cache(kwargs['domain'])
         return ImmediateHttpResponse(response=HttpAccepted())
 
-    def obj_create(self, bundle, request=None, **kwargs):
-        def adapt(field):
-            if "name" not in field and "field_name" in field:
-                field = field.copy()
-                field["name"] = field.pop("field_name")
-            return field
+    @staticmethod
+    def _adapt_field(field):
+        if "field_name" in field:
+            field = field.copy()
+            field["name"] = field.pop("field_name")
+        return field
 
+    def obj_create(self, bundle, request=None, **kwargs):
+        adapt = self._adapt_field
         tag = bundle.data.get("tag")
         if LookupTable.objects.domain_tag_exists(kwargs['domain'], tag):
             raise BadRequest(f"A lookup table with name {tag} already exists")
@@ -217,7 +219,8 @@ def obj_update(self, bundle, **kwargs):
 
         if 'fields' in bundle.data:
             save = True
-            bundle.obj.fields = [TypeField(**f) for f in bundle.data['fields']]
+            adapt = self._adapt_field
+            bundle.obj.fields = [TypeField(**adapt(f)) for f in bundle.data['fields']]
 
         if 'item_attributes' in bundle.data:
             save = True

From 01addc81f7f9a415f3cba99c7e01602dac95366e Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 6 Jun 2024 14:14:22 -0400
Subject: [PATCH 61/63] Make name/value field validation consistent

Either one or the other is accepted, but not both.

{"not": {"required": [...]}} is misleading in English, it actually means _not allowed_.
---
 .../apps/api/tests/lookup_table_resources.py   | 18 +++++++++++++++++-
 corehq/apps/fixtures/resources/v0_1.py         |  8 ++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/api/tests/lookup_table_resources.py b/corehq/apps/api/tests/lookup_table_resources.py
index 306a22ecfa0b..f4f7c9a52eb2 100644
--- a/corehq/apps/api/tests/lookup_table_resources.py
+++ b/corehq/apps/api/tests/lookup_table_resources.py
@@ -239,7 +239,7 @@ def test_update(self):
 
     def test_update_field_name(self):
         lookup_table = {
-            "fields": [{"name": "ignored", "field_name": "property", "properties": ["value"]}],
+            "fields": [{"name": "property", "properties": ["value"]}],
             "tag": "lookup_table",
         }
 
@@ -355,6 +355,22 @@ def test_create_with_bad_properties(self):
         data_item = LookupTableRow.objects.filter(domain=self.domain.name).first()
         self.assertIsNone(data_item)
 
+    def test_update_field_value(self):
+        data_item = self._create_data_item()
+        data_item_update = self._get_data_item_update()
+        data_item_update["fields"]["state_name"]["field_list"][0] = {
+            "value": "Mass.",
+            "properties": {"lang": "en"},
+        }
+        response = self._assert_auth_post_resource(
+            self.single_endpoint(data_item.id.hex),
+            json.dumps(data_item_update),
+            method="PUT",
+        )
+        print(response.content)  # for debugging errors
+        row = LookupTableRow.objects.filter(domain=self.domain.name).first()
+        self.assertEqual(row.fields["state_name"][0].value, 'Mass.')
+
 
 class TestLookupTableItemResourceV05(TestLookupTableItemResourceV06):
     resource = LookupTableItemResource
diff --git a/corehq/apps/fixtures/resources/v0_1.py b/corehq/apps/fixtures/resources/v0_1.py
index 5c4cc6df04c5..d0878a027a60 100644
--- a/corehq/apps/fixtures/resources/v0_1.py
+++ b/corehq/apps/fixtures/resources/v0_1.py
@@ -148,6 +148,10 @@ class LookupTableResource(HqBaseResource):
                         },
                     },
                     "additionalProperties": False,
+                    "oneOf": [
+                        {"not": {"required": ["field_name"]}},
+                        {"not": {"required": ["name"]}},
+                    ],
                 },
             },
             "item_attributes": {"type": "array", "items": {"type": "string"}}
@@ -314,6 +318,10 @@ class LookupTableItemResource(HqBaseResource):
                                 },
                             },
                             "additionalProperties": False,
+                            "oneOf": [
+                                {"not": {"required": ["field_value"]}},
+                                {"not": {"required": ["value"]}},
+                            ],
                         },
                     }},
                     "additionalProperties": False,

From 7247d819323e54884d23af8c2961929b02d21d13 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Fri, 7 Jun 2024 09:26:25 -0400
Subject: [PATCH 62/63] Schema violation tests for name/value fields

---
 .../apps/api/tests/lookup_table_resources.py  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/corehq/apps/api/tests/lookup_table_resources.py b/corehq/apps/api/tests/lookup_table_resources.py
index f4f7c9a52eb2..11a97ddfb3c2 100644
--- a/corehq/apps/api/tests/lookup_table_resources.py
+++ b/corehq/apps/api/tests/lookup_table_resources.py
@@ -249,6 +249,23 @@ def test_update_field_name(self):
         data_type = LookupTable.objects.get(id=self.data_type.id)
         self.assertEqual(data_type.fields[0].field_name, 'property')
 
+    def test_update_fails_with_two_field_names(self):
+        lookup_table = {
+            "fields": [{"name": "property", "field_name": "prop"}],
+            "tag": "lookup_table",
+        }
+
+        response = self._assert_auth_post_resource(
+            self.single_endpoint(self.data_type.id), json.dumps(lookup_table), method="PUT")
+        self.assertEqual(response.status_code, 400)
+        errors = json.loads(response.content.decode("utf-8"))
+        print(errors)
+        self.assertIn("Failed validating 'not' in schema", errors[0])
+        self.assertIn("{'not': {'required': ['field_name']}}", errors[0])
+        self.assertIn("Failed validating 'not' in schema", errors[1])
+        self.assertIn("{'not': {'required': ['name']}}", errors[1])
+        self.assertEqual(len(errors), 2)
+
 
 class TestLookupTableItemResourceV06(APIResourceTest):
     resource = LookupTableItemResource
@@ -371,6 +388,27 @@ def test_update_field_value(self):
         row = LookupTableRow.objects.filter(domain=self.domain.name).first()
         self.assertEqual(row.fields["state_name"][0].value, 'Mass.')
 
+    def test_update_fails_with_two_field_values(self):
+        data_item = self._create_data_item()
+        data_item_update = self._get_data_item_update()
+        data_item_update["fields"]["state_name"]["field_list"][0] = {
+            "value": "Mass.",
+            "field_value": "Mass...",
+        }
+        response = self._assert_auth_post_resource(
+            self.single_endpoint(data_item.id.hex),
+            json.dumps(data_item_update),
+            method="PUT",
+        )
+        self.assertEqual(response.status_code, 400)
+        errors = json.loads(response.content.decode("utf-8"))
+        print(errors)
+        self.assertIn("Failed validating 'not' in schema", errors[0])
+        self.assertIn("{'not': {'required': ['field_value']}}", errors[0])
+        self.assertIn("Failed validating 'not' in schema", errors[1])
+        self.assertIn("{'not': {'required': ['value']}}", errors[1])
+        self.assertEqual(len(errors), 2)
+
 
 class TestLookupTableItemResourceV05(TestLookupTableItemResourceV06):
     resource = LookupTableItemResource

From 6cf27a5658ece0eb3dc150c5bebdeba33e86e443 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 10:19:59 -0400
Subject: [PATCH 63/63] Linted hqModules.js

---
 .../hqwebapp/static/hqwebapp/js/hqModules.js  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js b/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js
index 9c32dc6d7e4d..292d41083ace 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js
@@ -1,3 +1,10 @@
+/*
+    This file does a number of manipulations of global variables that are typically bad practice.
+    It does not use strict because it's included everywhere, and strictness is not fully tested.
+*/
+/* eslint no-implicit-globals: 0 */
+/* eslint no-redeclare: 0 */
+/* eslint strict: 0 */
 /*
  * hqModules provides a poor man's module system for js. It is not a module *loader*,
  * only a module *referencer*: "importing" a module doesn't automatically load it as
@@ -76,26 +83,25 @@ function hqDefine(path, dependencies, moduleAccessor) {
             var args = [];
             for (var i = 0; i < dependencies.length; i++) {
                 var dependency = dependencies[i];
-                if (COMMCAREHQ_MODULES.hasOwnProperty(dependency)) {
+                if (Object.hasOwn(COMMCAREHQ_MODULES, dependency)) {
                     args[i] = hqImport(dependency);
-                } else if (thirdPartyGlobals.hasOwnProperty(dependency)) {
+                } else if (Object.hasOwn(thirdPartyGlobals, dependency)) {
                     args[i] = window[thirdPartyGlobals[dependency]];
                 }
             }
-            if (!COMMCAREHQ_MODULES.hasOwnProperty(path)) {
+            if (!Object.hasOwn(COMMCAREHQ_MODULES, path)) {
                 if (path.match(/\.js$/)) {
                     throw new Error("Error in '" + path + "': module names should not end in .js.");
                 }
                 COMMCAREHQ_MODULES[path] = factory.apply(undefined, args);
-            }
-            else {
+            } else {
                 throw new Error("The module '" + path + "' has already been defined elsewhere.");
             }
         }
     }(moduleAccessor));
 }
 if (typeof define === 'undefined') {
-    define = hqDefine;
+    define = hqDefine;      // eslint-disable-line no-global-assign
 }
 
 // For use only with modules that are never used in a requirejs context.
@@ -110,11 +116,11 @@ function hqImport(path) {
 // Support require calls within a module. Best practice is to require all dependencies
 // at module definition time, but this function can be used when doing so would
 // introduce a circular dependency.
-function hqRequire(paths, callback) {
+function hqRequire(paths, callback) {       // eslint-disable-line no-unused-vars
     if (typeof define === 'function' && define.amd && window.USE_REQUIREJS) {
         // HQ's requirejs build process (build_requirejs.py) replaces hqRequire calls with
         // require calls, so it's important that this do nothing but pass through to require
-        require(paths, callback);
+        require(paths, callback);   // eslint-disable-line no-undef
     } else {
         var args = [];
         for (var i = 0; i < paths.length; i++) {