Merge branch 'master' into riese/conditional_alert_empty_prop

dimagi · Dec 4, 2024 · bd58982 · bd58982
2 parents a93266e + fe8512c
commit bd58982
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 1 deletion.
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
@@ -73,12 +73,17 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                     appCollection: appCollection.models.map(
                         appItem => appItem.attributes._id + ' / ' + appItem.attributes.copy_of),
                 }
+                var errorMsg = 'The application could not be found.'
+                if (params.appId) {
+                    // Likely due to a link followed from an old build.
+                    errorMsg = errorMsg + ' If you clicked on a link, that link may be outdated.'
+                }
                 if (!params.preview) {
                     // Make sure the user has access to the app
                     if (!app) {
                         FormplayerFrontend.trigger(
                             'showError',
-                            gettext('The application could not be found'),
+                            gettext(errorMsg),
                             false,
                             true,
                             additionalSentryData

diff --git a/custom/abt/reports/data_sources/late_pmt.json b/custom/abt/reports/data_sources/late_pmt.json
@@ -15,6 +15,7 @@
     "kenya-vca",
     "pmievolve-ethiopia-1",
     "pmievolve-ghana",
+    "pmievolve-kenya",
     "pmievolve-madagascar",
     "pmievolve-malawi",
     "pmievolve-mozambique",

diff --git a/custom/abt/reports/data_sources/sms_case.json b/custom/abt/reports/data_sources/sms_case.json
@@ -15,6 +15,7 @@
     "kenya-vca",
     "pmievolve-ethiopia-1",
     "pmievolve-ghana",
+    "pmievolve-kenya",
     "pmievolve-madagascar",
     "pmievolve-malawi",
     "pmievolve-mozambique",

diff --git a/custom/abt/reports/data_sources/supervisory_v2020.json b/custom/abt/reports/data_sources/supervisory_v2020.json
@@ -16,6 +16,7 @@
         "kenya-vca",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/custom/abt/reports/sms_indicator_report.json b/custom/abt/reports/sms_indicator_report.json
@@ -16,6 +16,7 @@
         "vectorlink-benin",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/custom/abt/reports/spray_progress_country.json b/custom/abt/reports/spray_progress_country.json
@@ -15,6 +15,7 @@
         "kenya-vca",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/custom/abt/reports/spray_progress_level_1.json b/custom/abt/reports/spray_progress_level_1.json
@@ -15,6 +15,7 @@
         "kenya-vca",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/custom/abt/reports/spray_progress_level_2.json b/custom/abt/reports/spray_progress_level_2.json
@@ -15,6 +15,7 @@
         "kenya-vca",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/custom/abt/reports/spray_progress_level_3.json b/custom/abt/reports/spray_progress_level_3.json
@@ -14,6 +14,7 @@
         "kenya-vca",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/custom/abt/reports/spray_progress_level_4.json b/custom/abt/reports/spray_progress_level_4.json
@@ -14,6 +14,7 @@
         "kenya-vca",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/custom/abt/reports/supervisory_report_v2020.json b/custom/abt/reports/supervisory_report_v2020.json
@@ -16,6 +16,7 @@
         "kenya-vca",
         "pmievolve-ethiopia-1",
         "pmievolve-ghana",
+        "pmievolve-kenya",
         "pmievolve-madagascar",
         "pmievolve-malawi",
         "pmievolve-mozambique",

diff --git a/settings.py b/settings.py
@@ -1971,6 +1971,7 @@ def _pkce_required(client_id):
     'kenya-vca': 'custom.abt',
     'pmievolve-ethiopia-1': 'custom.abt',
     'pmievolve-ghana': 'custom.abt',
+    'pmievolve-kenya': 'custom.abt',
     'pmievolve-madagascar': 'custom.abt',
     'pmievolve-malawi': 'custom.abt',
     'pmievolve-mozambique': 'custom.abt',