From 25d30ccef6b64f5d96b976f4f0368931853e4721 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Mon, 4 Dec 2023 18:04:25 +0530
Subject: [PATCH 001/118] Add col-sm class the group

---
 .../static/cloudcare/js/form_entry/form_ui.js          | 10 ++++++++++
 .../apps/cloudcare/templates/form_entry/templates.html |  1 +
 2 files changed, 11 insertions(+)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index a211b8cebc62..709429bf45ea 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -652,6 +652,16 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             }
             return Container.prototype.headerBackgroundColor.call(self);
         };
+
+        const columnWidth = Question.calculateColumnWidthForPerRowStyle(this.style);
+        const perRowPattern = new RegExp(`\\d+${constants.PER_ROW}(\\s|$)`);
+        var styleStr = (self.style) ? ko.utils.unwrapObservable(self.style.raw) : null;
+
+        if (getMatchingStyles(perRowPattern, styleStr)) {
+            this.questionTileWidth = `col-sm-${columnWidth}`;
+        }
+
+
     }
     Group.prototype = Object.create(Container.prototype);
     Group.prototype.constructor = Container;
diff --git a/corehq/apps/cloudcare/templates/form_entry/templates.html b/corehq/apps/cloudcare/templates/form_entry/templates.html
index 96fd625ef919..325a4f1da606 100644
--- a/corehq/apps/cloudcare/templates/form_entry/templates.html
+++ b/corehq/apps/cloudcare/templates/form_entry/templates.html
@@ -4,6 +4,7 @@
 <script type="text/html" id="sub-group-fullform-ko-template">
   <div tabindex="-1" class ="gr" data-bind="
         class: isRepetition ? 'repetition' : '',
+        class: questionTileWidth,
         css: {
           'gr-no-children': $data.children().length === 0,
           'gr-has-no-questions': _.all($data.children(), function(d) { return d.type() !== 'grouped-question-tile-row' }),

From 5cd146e7a52c085c7de2cb8cc8ff69e482ff6563 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Mon, 11 Dec 2023 16:05:00 +0530
Subject: [PATCH 002/118] Add GroupedGroup to wrap group elements within a row

---
 .../static/cloudcare/js/form_entry/const.js   |  1 +
 .../static/cloudcare/js/form_entry/form_ui.js | 90 ++++++++++++++-----
 .../templates/form_entry/templates.html       |  6 ++
 3 files changed, 77 insertions(+), 20 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
index 42f2d18fb956..7f05d82494d8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
@@ -4,6 +4,7 @@ hqDefine("cloudcare/js/form_entry/const", function () {
         REPEAT_TYPE: 'repeat-juncture',
         QUESTION_TYPE: 'question',
         GROUPED_QUESTION_TILE_ROW_TYPE: 'grouped-question-tile-row',
+        GROUPED_GROUP_TILE_ROW_TYPE: 'grouped-group-tile-row',
 
         // Entry types
         STRING: 'str',
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 709429bf45ea..b9e1288b7511 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -171,7 +171,8 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         var self = this;
 
         if (!json.type) {
-            Container.groupQuestions(json);
+            Container.groupElements(json, constants.QUESTION_TYPE);
+            Container.groupElements(json, constants.GROUP_TYPE);
         }
 
         var mapping = {
@@ -192,7 +193,9 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
                 create: function (options) {
                     if (options.data.type === constants.GROUPED_QUESTION_TILE_ROW_TYPE) {
                         return new GroupedQuestionTileRow(options.data, self);
-                    } else if (options.data.type === constants.QUESTION_TYPE) {
+                    } else  if (options.data.type === constants.GROUPED_GROUP_TILE_ROW_TYPE) {
+                        return new GroupedGroupTileRow(options.data, self);
+                    }else if (options.data.type === constants.QUESTION_TYPE) {
                         return new Question(options.data, self);
                     } else if (options.data.type === constants.GROUP_TYPE) {
                         return new Group(options.data, self);
@@ -272,17 +275,17 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     };
 
     /**
-     * Recursively groups sequential "question" items in a nested JSON structure.
+     * Recursively groups sequential "question" or "group" items in a nested JSON structure.
      *
-     * This function takes a JSON object as input and searches for sequential "question"
+     * This function takes a JSON object as input and searches for sequential "question" or "group"
      * items within the 'children' arrays of the input and its nested 'group' objects.
-     * It groups these sequential "question" items into "GroupedQuestionTileRow" objects while
-     * maintaining the original structure of the JSON.
+     * It groups these sequential "question" items into "GroupedQuestionTileRow" and "group"
+     * items into "GroupedGroupTileRow" objects while maintaining the original structure of the JSON.
      *
      * @param {Object} json - The JSON object to process, containing 'children' arrays.
      * @returns {Object} - A new JSON object with sequential "question" items grouped into "GroupedQuestionTileRow".
      */
-    Container.groupQuestions = function (json) {
+    Container.groupElements= function (json, elementType) {
         if (!json || !json.children || !Array.isArray(json.children)) {
             return json;
         }
@@ -312,22 +315,52 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             usedWidth = 0;
         }
 
-        for (let child of json.children) {
-            if (child.type === constants.QUESTION_TYPE) {
-                const questionTileWidth = Question.calculateColumnWidthForPerRowStyle(child.style);
+        function pushChildAndResetGroup(child) {
+            newChildren.push(child);
+            resetCurrentGroup();
+        }
+
+        function groupElementsAndResetGroup(child) {
+            const newGroup = Container.groupElements(child, elementType);
+            newChildren.push(newGroup);
+            resetCurrentGroup();
+        }
+
+        function addToGroupForAllowedWidth(child) {
+            const questionTileWidth = Question.calculateColumnWidthForPerRowStyle(child.style);
+            usedWidth += questionTileWidth;
+            if (usedWidth > constants.GRID_COLUMNS) {
+                resetCurrentGroup();
                 usedWidth += questionTileWidth;
-                if (usedWidth > constants.GRID_COLUMNS) {
-                    resetCurrentGroup();
-                    usedWidth += questionTileWidth;
-                }
-                addToCurrentGroup(child);
+            }
+            addToCurrentGroup(child);
+        }
+
+        function processChildForGroupingQuestions(child, usedWidth, currentGroup, newChildren) {
+            if (child.type === constants.QUESTION_TYPE) {
+                addToGroupForAllowedWidth(child);
             } else if (child.type === constants.GROUP_TYPE || child.type === constants.REPEAT_TYPE) {
-                const newGroup = Container.groupQuestions(child);
-                newChildren.push(newGroup);
-                resetCurrentGroup();
+                groupElementsAndResetGroup(child);
             } else {
-                newChildren.push(child);
-                resetCurrentGroup();
+                pushChildAndResetGroup(child);
+            }
+        }
+
+        function processChildForGroupingGroups(child, usedWidth, currentGroup, newChildren) {
+            if (child.type === constants.GROUP_TYPE) {
+                addToGroupForAllowedWidth(child);
+            } else if (child.type === constants.REPEAT_TYPE) {
+                groupElementsAndResetGroup(child);
+            } else {
+                pushChildAndResetGroup(child);
+            }
+        }
+
+        for (let child of json.children) {
+            if (elementType === constants.QUESTION_TYPE) {
+                processChildForGroupingQuestions(child, usedWidth, currentGroup, newChildren);
+            } else if (elementType === constants.GROUP_TYPE) {
+                processChildForGroupingGroups(child, usedWidth, currentGroup, newChildren);
             }
         }
         resetCurrentGroup();
@@ -718,6 +751,23 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     GroupedQuestionTileRow.prototype = Object.create(Container.prototype);
     GroupedQuestionTileRow.prototype.constructor = Container;
 
+
+    function GroupedGroupTileRow(json, parent) {
+        var self = this;
+        self.parent = parent;
+        Container.call(self, json);
+
+        self.required = ko.observable(0);
+        self.childrenRequired = ko.computed(function () {
+            return _.find(self.children(), function (child) {
+                return child.required();
+            });
+        });
+    }
+    GroupedGroupTileRow.prototype = Object.create(Container.prototype);
+    GroupedGroupTileRow.prototype.constructor = Container;
+
+
     /**
      * Represents a Question. A Question contains an Entry which is the widget that is displayed for that question
      * type.
diff --git a/corehq/apps/cloudcare/templates/form_entry/templates.html b/corehq/apps/cloudcare/templates/form_entry/templates.html
index 325a4f1da606..e4b48988c0aa 100644
--- a/corehq/apps/cloudcare/templates/form_entry/templates.html
+++ b/corehq/apps/cloudcare/templates/form_entry/templates.html
@@ -1,6 +1,12 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
+<script type="text/html" id="grouped-group-tile-row-fullform-ko-template">
+  <div class="row">
+    <div data-bind="template: { name: childTemplate, foreach: $data.children }"/>
+  </div>
+</script>
+
 <script type="text/html" id="sub-group-fullform-ko-template">
   <div tabindex="-1" class ="gr" data-bind="
         class: isRepetition ? 'repetition' : '',

From ea4f8ecb45f757236c05872d73f271ceeacff1b1 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Mon, 11 Dec 2023 23:26:48 +0530
Subject: [PATCH 003/118] Lint errors

---
 .../static/cloudcare/js/form_entry/form_ui.js        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 3fdad44a635f..8919c65dbc54 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -195,7 +195,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
                         return new GroupedQuestionTileRow(options.data, self);
                     } else  if (options.data.type === constants.GROUPED_GROUP_TILE_ROW_TYPE) {
                         return new GroupedGroupTileRow(options.data, self);
-                    }else if (options.data.type === constants.QUESTION_TYPE) {
+                    } else if (options.data.type === constants.QUESTION_TYPE) {
                         return new Question(options.data, self);
                     } else if (options.data.type === constants.GROUP_TYPE) {
                         return new Group(options.data, self);
@@ -284,7 +284,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
      * @param {Object} json - The JSON object to process, containing 'children' arrays.
      * @returns {Object} - A new JSON object with sequential "question" items grouped into "GroupedQuestionTileRow".
      */
-    Container.groupElements= function (json, elementType) {
+    Container.groupElements = function (json, elementType) {
         if (!json || !json.children || !Array.isArray(json.children)) {
             return json;
         }
@@ -335,7 +335,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             addToCurrentGroup(child);
         }
 
-        function processChildForGroupingQuestions(child, usedWidth, currentGroup, newChildren) {
+        function processChildForGroupingQuestions(child) {
             if (child.type === constants.QUESTION_TYPE) {
                 addToGroupForAllowedWidth(child);
             } else if (child.type === constants.GROUP_TYPE || child.type === constants.REPEAT_TYPE) {
@@ -345,7 +345,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             }
         }
 
-        function processChildForGroupingGroups(child, usedWidth, currentGroup, newChildren) {
+        function processChildForGroupingGroups(child) {
             if (child.type === constants.GROUP_TYPE) {
                 addToGroupForAllowedWidth(child);
             } else if (child.type === constants.REPEAT_TYPE) {
@@ -357,9 +357,9 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
 
         for (let child of json.children) {
             if (elementType === constants.QUESTION_TYPE) {
-                processChildForGroupingQuestions(child, usedWidth, currentGroup, newChildren);
+                processChildForGroupingQuestions(child);
             } else if (elementType === constants.GROUP_TYPE) {
-                processChildForGroupingGroups(child, usedWidth, currentGroup, newChildren);
+                processChildForGroupingGroups(child);
             }
         }
         resetCurrentGroup();

From 577da9006b958dfcbb92474a3a68b99ce0e139dd Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Tue, 12 Dec 2023 23:33:27 +0530
Subject: [PATCH 004/118] Use GroupedElementTilerow to add group and question
 in a row

---
 .../static/cloudcare/js/form_entry/const.js   |   3 +-
 .../static/cloudcare/js/form_entry/form_ui.js | 109 +++++-------------
 .../templates/form_entry/templates.html       |  10 +-
 3 files changed, 34 insertions(+), 88 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
index 52310fc4db2a..da63ea31252a 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
@@ -3,8 +3,7 @@ hqDefine("cloudcare/js/form_entry/const", function () {
         GROUP_TYPE: 'sub-group',
         REPEAT_TYPE: 'repeat-juncture',
         QUESTION_TYPE: 'question',
-        GROUPED_QUESTION_TILE_ROW_TYPE: 'grouped-question-tile-row',
-        GROUPED_GROUP_TILE_ROW_TYPE: 'grouped-group-tile-row',
+        GROUPED_ELEMENT_TILE_ROW_TYPE: 'grouped-element-tile-row',
 
         // Entry types
         STRING: 'str',
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index a62e65189e54..aea6db0cd78c 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -138,7 +138,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     }
 
     /**
-     * Base abstract prototype for Repeat, Group, GroupedQuestionTileRow, and Form. Adds methods to
+     * Base abstract prototype for Repeat, Group, GroupedElementTileRow, and Form. Adds methods to
      * objects that contain a children array for rendering nested questions.
      * @param {Object} json - The JSON returned from touchforms to represent the container
      */
@@ -171,8 +171,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         var self = this;
 
         if (!json.type) {
-            Container.groupElements(json, constants.QUESTION_TYPE);
-            Container.groupElements(json, constants.GROUP_TYPE);
+            Container.groupElements(json);
         }
 
         var mapping = {
@@ -191,10 +190,8 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             },
             children: {
                 create: function (options) {
-                    if (options.data.type === constants.GROUPED_QUESTION_TILE_ROW_TYPE) {
-                        return new GroupedQuestionTileRow(options.data, self);
-                    } else  if (options.data.type === constants.GROUPED_GROUP_TILE_ROW_TYPE) {
-                        return new GroupedGroupTileRow(options.data, self);
+                    if (options.data.type === constants.GROUPED_ELEMENT_TILE_ROW_TYPE) {
+                        return new GroupedElementTileRow(options.data, self);
                     } else if (options.data.type === constants.QUESTION_TYPE) {
                         return new Question(options.data, self);
                     } else if (options.data.type === constants.GROUP_TYPE) {
@@ -278,13 +275,13 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
      *
      * This function takes a JSON object as input and searches for sequential "question" or "group"
      * items within the 'children' arrays of the input and its nested 'group' objects.
-     * It groups these sequential "question" items into "GroupedQuestionTileRow" and "group"
+     * It groups these sequential "question" items into "GroupedElementTileRow" and "group"
      * items into "GroupedGroupTileRow" objects while maintaining the original structure of the JSON.
      *
      * @param {Object} json - The JSON object to process, containing 'children' arrays.
-     * @returns {Object} - A new JSON object with sequential "question" items grouped into "GroupedQuestionTileRow".
+     * @returns {Object} - A new JSON object with sequential "question" items grouped into "GroupedElementTileRow".
      */
-    Container.groupElements = function (json, elementType) {
+    Container.groupElements = function (json) {
         if (!json || !json.children || !Array.isArray(json.children)) {
             return json;
         }
@@ -296,7 +293,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         function addToCurrentGroup(child) {
             if (!currentGroup) {
                 currentGroup = {
-                    type: constants.GROUPED_QUESTION_TILE_ROW_TYPE,
+                    type: constants.GROUPED_ELEMENT_TILE_ROW_TYPE,
                     children: [],
                     ix: null,
                 };
@@ -314,52 +311,25 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             usedWidth = 0;
         }
 
-        function pushChildAndResetGroup(child) {
-            newChildren.push(child);
-            resetCurrentGroup();
-        }
-
-        function groupElementsAndResetGroup(child) {
-            const newGroup = Container.groupElements(child, elementType);
-            newChildren.push(newGroup);
-            resetCurrentGroup();
-        }
-
-        function addToGroupForAllowedWidth(child) {
-            const questionTileWidth = Question.calculateColumnWidthForPerRowStyle(child.style);
-            usedWidth += questionTileWidth;
-            if (usedWidth > constants.GRID_COLUMNS) {
-                resetCurrentGroup();
-                usedWidth += questionTileWidth;
-            }
-            addToCurrentGroup(child);
-        }
-
-        function processChildForGroupingQuestions(child) {
-            if (child.type === constants.QUESTION_TYPE) {
-                addToGroupForAllowedWidth(child);
-            } else if (child.type === constants.GROUP_TYPE || child.type === constants.REPEAT_TYPE) {
-                groupElementsAndResetGroup(child);
-            } else {
-                pushChildAndResetGroup(child);
-            }
-        }
-
-        function processChildForGroupingGroups(child) {
-            if (child.type === constants.GROUP_TYPE) {
-                addToGroupForAllowedWidth(child);
+        for (let child of json.children) {
+            if (child.type === constants.QUESTION_TYPE || child.type === constants.GROUP_TYPE) {
+                const elementTileWidth = Question.calculateColumnWidthForPerRowStyle(child.style);
+                usedWidth += elementTileWidth;
+                if (usedWidth > constants.GRID_COLUMNS) {
+                    resetCurrentGroup();
+                    usedWidth += elementTileWidth;
+                }
+                if (child.type === constants.GROUP_TYPE) {
+                    child = Container.groupElements(child);
+                }
+                addToCurrentGroup(child);
             } else if (child.type === constants.REPEAT_TYPE) {
-                groupElementsAndResetGroup(child);
+                const newGroup = Container.groupElements(child);
+                newChildren.push(newGroup);
+                resetCurrentGroup();
             } else {
-                pushChildAndResetGroup(child);
-            }
-        }
-
-        for (let child of json.children) {
-            if (elementType === constants.QUESTION_TYPE) {
-                processChildForGroupingQuestions(child);
-            } else if (elementType === constants.GROUP_TYPE) {
-                processChildForGroupingGroups(child);
+                newChildren.push(child);
+                resetCurrentGroup();
             }
         }
         resetCurrentGroup();
@@ -592,7 +562,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     Form.prototype.constructor = Container;
 
     /**
-     * Represents a group of GroupedQuestionTileRow which contains questions.
+     * Represents a group of GroupedElementTileRow which contains questions.
      * @param {Object} json - The JSON returned from touchforms to represent a Form
      * @param {Object} parent - The object's parent. Either a Form, Group, or Repeat.
      */
@@ -668,7 +638,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
 
         self.hasAnyNestedQuestions = function () {
             return _.any(self.children(), function (d) {
-                if (d.type() === constants.QUESTION_TYPE || d.type() === constants.REPEAT_TYPE || d.type() === constants.GROUPED_QUESTION_TILE_ROW_TYPE) {
+                if (d.type() === constants.QUESTION_TYPE || d.type() === constants.REPEAT_TYPE || d.type() === constants.GROUPED_ELEMENT_TILE_ROW_TYPE) {
                     return true;
                 } else if (d.type() === constants.GROUP_TYPE) {
                     return d.hasAnyNestedQuestions();
@@ -703,7 +673,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     Group.prototype.constructor = Container;
 
     /**
-     * Represents a repeat group. A repeat only has Group objects as children. Each child Group contains GroupedQuestionTileRow
+     * Represents a repeat group. A repeat only has Group objects as children. Each child Group contains GroupedElementTileRow
      * objects which contains the child questions to be rendered
      * @param {Object} json - The JSON returned from touchforms to represent a Form
      * @param {Object} parent - The object's parent. Either a Form, Group, or Repeat.
@@ -739,7 +709,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
      * @param {Object} json - The JSON returned from touchforms to represent a Form
      * @param {Object} parent - The object's parent. Either a Form, Group, or Repeat.
      */
-    function GroupedQuestionTileRow(json, parent) {
+    function GroupedElementTileRow(json, parent) {
         var self = this;
         self.parent = parent;
         Container.call(self, json);
@@ -751,25 +721,8 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             });
         });
     }
-    GroupedQuestionTileRow.prototype = Object.create(Container.prototype);
-    GroupedQuestionTileRow.prototype.constructor = Container;
-
-
-    function GroupedGroupTileRow(json, parent) {
-        var self = this;
-        self.parent = parent;
-        Container.call(self, json);
-
-        self.required = ko.observable(0);
-        self.childrenRequired = ko.computed(function () {
-            return _.find(self.children(), function (child) {
-                return child.required();
-            });
-        });
-    }
-    GroupedGroupTileRow.prototype = Object.create(Container.prototype);
-    GroupedGroupTileRow.prototype.constructor = Container;
-
+    GroupedElementTileRow.prototype = Object.create(Container.prototype);
+    GroupedElementTileRow.prototype.constructor = Container;
 
     /**
      * Represents a Question. A Question contains an Entry which is the widget that is displayed for that question
diff --git a/corehq/apps/cloudcare/templates/form_entry/templates.html b/corehq/apps/cloudcare/templates/form_entry/templates.html
index 7b7276eec728..0922fd2d2228 100644
--- a/corehq/apps/cloudcare/templates/form_entry/templates.html
+++ b/corehq/apps/cloudcare/templates/form_entry/templates.html
@@ -1,18 +1,12 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-<script type="text/html" id="grouped-group-tile-row-fullform-ko-template">
-  <div class="row">
-    <div data-bind="template: { name: childTemplate, foreach: $data.children }"/>
-  </div>
-</script>
-
 <script type="text/html" id="sub-group-fullform-ko-template">
   <div tabindex="-1" class ="gr" data-bind="
         class: questionTileWidth,
         css: {
           'gr-no-children': $data.children().length === 0,
-          'gr-has-no-questions': _.all($data.children(), function(d) { return d.type() !== 'grouped-question-tile-row' }),
+          'gr-has-no-questions': _.all($data.children(), function(d) { return d.type() !== 'grouped-element-tile-row' }),
           'gr-has-no-nested-questions': !$data.hasAnyNestedQuestions(),
           'panel panel-default': collapsible,
           'repetition': isRepetition,
@@ -203,7 +197,7 @@ <h1 class="title" data-bind="text: title, visible: !showInFormNavigation()"></h1
 </script>
 
 
-<script type="text/html" id="grouped-question-tile-row-fullform-ko-template">
+<script type="text/html" id="grouped-element-tile-row-fullform-ko-template">
   <div class="row">
     <div data-bind="template: { name: childTemplate, foreach: $data.children }"/>
   </div>

From 50eec9c7bdb4113e5657009f9f4adc11d5c058c3 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 13 Dec 2023 16:28:36 +0530
Subject: [PATCH 005/118] Rename: calculateColumnWidthForPerRowStyle ->
 calculateElementWidth and move it to GroupedElementTileRow from Question

---
 .../static/cloudcare/js/form_entry/form_ui.js | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index aea6db0cd78c..4a8ea5afd512 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -313,7 +313,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
 
         for (let child of json.children) {
             if (child.type === constants.QUESTION_TYPE || child.type === constants.GROUP_TYPE) {
-                const elementTileWidth = Question.calculateColumnWidthForPerRowStyle(child.style);
+                const elementTileWidth = GroupedElementTileRow.calculateElementWidth(child.style);
                 usedWidth += elementTileWidth;
                 if (usedWidth > constants.GRID_COLUMNS) {
                     resetCurrentGroup();
@@ -659,7 +659,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             return Container.prototype.headerBackgroundColor.call(self);
         };
 
-        const columnWidth = Question.calculateColumnWidthForPerRowStyle(this.style);
+        const columnWidth = GroupedElementTileRow.calculateElementWidth(this.style);
         const perRowPattern = new RegExp(`\\d+${constants.PER_ROW}(\\s|$)`);
         var styleStr = (self.style) ? ko.utils.unwrapObservable(self.style.raw) : null;
 
@@ -724,6 +724,21 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     GroupedElementTileRow.prototype = Object.create(Container.prototype);
     GroupedElementTileRow.prototype.constructor = Container;
 
+    /**
+     * Matches "<n>-per-row" style attributes. If a match if found, it calculates the column width
+     * based on Bootstrap's 12 column grid system and returns the column width.
+     * @param {Object} style - the appearance attributes
+     */
+    GroupedElementTileRow.calculateElementWidth = function (style) {
+        const styleStr = (style) ? ko.utils.unwrapObservable(style.raw) : null;
+        const perRowPattern = new RegExp(`\\d+${constants.PER_ROW}(\\s|$)`);
+        const matchingPerRowStyles = getMatchingStyles(perRowPattern, styleStr);
+        const perRowStyle = matchingPerRowStyles.length === 0 ? null : matchingPerRowStyles[0];
+        const itemsPerRow = perRowStyle !== null ? parseInt(perRowStyle.split("-")[0], 10) : null;
+
+        return itemsPerRow !== null ? Math.round(constants.GRID_COLUMNS / itemsPerRow) : constants.GRID_COLUMNS;
+    };
+
     /**
      * Represents a Question. A Question contains an Entry which is the widget that is displayed for that question
      * type.
@@ -878,7 +893,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
 
     Question.prototype.setWidths = function () {
         const self = this;
-        const columnWidth = Question.calculateColumnWidthForPerRowStyle(this.style);
+        const columnWidth = GroupedElementTileRow.calculateElementWidth(this.style);
         const perRowPattern = new RegExp(`\\d+${constants.PER_ROW}(\\s|$)`);
 
         if (this.stylesContains(perRowPattern)) {
@@ -898,21 +913,6 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         }
     };
 
-    /**
-     * Matches "<n>-per-row" style attributes. If a match if found, it calculates the column width
-     * based on Bootstrap's 12 column grid system and returns the column width.
-     * @param {Object} style - the appearance attributes
-     */
-    Question.calculateColumnWidthForPerRowStyle = function (style) {
-        const styleStr = (style) ? ko.utils.unwrapObservable(style.raw) : null;
-        const perRowPattern = new RegExp(`\\d+${constants.PER_ROW}(\\s|$)`);
-        const matchingPerRowStyles = getMatchingStyles(perRowPattern, styleStr);
-        const perRowStyle = matchingPerRowStyles.length === 0 ? null : matchingPerRowStyles[0];
-        const itemsPerRow = perRowStyle !== null ? parseInt(perRowStyle.split("-")[0], 10) : null;
-
-        return itemsPerRow !== null ? Math.round(constants.GRID_COLUMNS / itemsPerRow) : constants.GRID_COLUMNS;
-    };
-
     return {
         getIx: getIx,
         getForIx: getForIx,

From 606fae2a2ee67bcdfef90adc3d5d9d126b334120 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 13 Dec 2023 17:40:55 +0530
Subject: [PATCH 006/118] Check for required child in nested children

---
 corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 4a8ea5afd512..70fc0d187ceb 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -717,7 +717,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         self.required = ko.observable(0);
         self.childrenRequired = ko.computed(function () {
             return _.find(self.children(), function (child) {
-                return child.required();
+                return child.required() || child.childrenRequired && child.childrenRequired();
             });
         });
     }

From b5037b04ca9a2bafe53850bf8b53622f1e18de20 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 13 Dec 2023 17:52:35 +0530
Subject: [PATCH 007/118] Check for nested children in hasAnyNestedQuestions
 for grouped element

---
 .../apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 70fc0d187ceb..ed35ef330c96 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -638,9 +638,9 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
 
         self.hasAnyNestedQuestions = function () {
             return _.any(self.children(), function (d) {
-                if (d.type() === constants.QUESTION_TYPE || d.type() === constants.REPEAT_TYPE || d.type() === constants.GROUPED_ELEMENT_TILE_ROW_TYPE) {
+                if (d.type() === constants.QUESTION_TYPE || d.type() === constants.REPEAT_TYPE) {
                     return true;
-                } else if (d.type() === constants.GROUP_TYPE) {
+                } else if (d.type() === constants.GROUP_TYPE || d.type() === constants.GROUPED_ELEMENT_TILE_ROW_TYPE) {
                     return d.hasAnyNestedQuestions();
                 }
             });

From 55712819e77f71b1495b25f103bb7074c095a9bf Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 13 Dec 2023 21:13:45 +0530
Subject: [PATCH 008/118] Test fixes

---
 .../static/cloudcare/js/form_entry/form_ui.js | 12 ++++++++
 .../js/form_entry/spec/form_ui_spec.js        | 28 +++++++++----------
 .../js/form_entry/spec/utils_spec.js          |  2 +-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index ed35ef330c96..75a309e53b96 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -714,6 +714,18 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         self.parent = parent;
         Container.call(self, json);
 
+        self.isRepetition = parent instanceof Repeat;
+
+        self.hasAnyNestedQuestions = function () {
+            return _.any(self.children(), function (d) {
+                if (d.type() === constants.QUESTION_TYPE) {
+                    return true;
+                } else if (d.type() === constants.GROUP_TYPE) {
+                    return d.hasAnyNestedQuestions();
+                }
+            });
+        };
+
         self.required = ko.observable(0);
         self.childrenRequired = ko.computed(function () {
             return _.find(self.children(), function (child) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
index ae2c1ff647ac..4d2be334e66e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
@@ -73,10 +73,11 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             // Each repeat is a group with questions
             assert.equal(form.children()[0].type(), constants.REPEAT_TYPE);
             assert.equal(form.children()[0].children().length, 1);
-            assert.equal(form.children()[0].children()[0].type(), constants.GROUP_TYPE);
+            assert.equal(form.children()[0].children()[0].type(), constants.GROUPED_ELEMENT_TILE_ROW_TYPE);
+            assert.equal(form.children()[0].children()[0].children()[0].type(), constants.GROUP_TYPE);
             assert.isTrue(form.children()[0].children()[0].isRepetition);
-            assert.equal(form.children()[0].children()[0].children()[0].type(), constants.GROUPED_QUESTION_TILE_ROW_TYPE);
-            assert.equal(form.children()[0].children()[0].children()[0].children()[0].type(), constants.QUESTION_TYPE);
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].type(), constants.GROUPED_ELEMENT_TILE_ROW_TYPE);
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[0].type(), constants.QUESTION_TYPE);
         });
 
         it('Should render questions grouped by row', function () {
@@ -105,10 +106,10 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             formJSON.tree = [q0, g0, q1, q2, q3];
             let form = formUI.Form(formJSON);
 
-            // Expected structure (where gq signifies type "grouped-question-tile-row")
-            assert.equal(form.children().length, 4); // [gq, g, gq, gq]
+            // Expected structure (where ge signifies type "grouped-element-tile-row")
+            assert.equal(form.children().length, 4); // [ge, g, ge, ge]
             assert.equal(form.children()[0].children().length, 1); // [q0]
-            assert.equal(form.children()[1].children()[0].children()[0].children().length, 2); // [q(ix=2,3), q(ix=2,4)]
+            assert.equal(form.children()[1].children()[0].children()[0].children()[0].children()[0].children().length, 2); // [q(ix=2,3), q(ix=2,4)]
             assert.equal(form.children()[2].children().length, 2); // [q1, q2]
             assert.equal(form.children()[3].children().length, 1); // [q3]
         });
@@ -142,12 +143,11 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             formJSON.tree = [g0];
             let form = formUI.Form(formJSON);
 
-            assert.equal(form.children()[0].headerBackgroundColor(), '#002f71'); //[g0]
-            assert.equal(form.children()[0].children()[0].headerBackgroundColor(), ''); //[g0-0]
-            assert.equal(form.children()[0].children()[0].children()[2].headerBackgroundColor(), '#003e96'); //[g1]
-            assert.equal(form.children()[0].children()[0].children()[2].children()[0].headerBackgroundColor(), '#004EBC'); //[g1-0]
-            assert.equal(form.children()[0].children()[0].children()[2].children()[0].children()[2].headerBackgroundColor(), '#002f71'); //[r1]
-            assert.equal(form.children()[0].children()[0].children()[2].children()[0].children()[2].children()[0].headerBackgroundColor(), ''); //[r1-0]
+            assert.equal(form.children()[0].children()[0].headerBackgroundColor(), '#002f71'); //[g0]
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].headerBackgroundColor(), ''); //[g0-0]
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[2].children()[0].headerBackgroundColor(), '#003e96'); //[g1]
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[2].children()[0].children()[0].children()[0].headerBackgroundColor(), '#004EBC'); //[g1-0]
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[2].children()[0].children()[0].children()[0].children()[2].headerBackgroundColor(), '#002f71'); //[r1]
         });
 
         it('Should reconcile question choices', function () {
@@ -265,8 +265,8 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
 
         it('Should find nested questions', function () {
             var form = formUI.Form(nestedGroupJSON);
-            assert.isTrue(form.children()[0].hasAnyNestedQuestions());
-            assert.isFalse(form.children()[1].hasAnyNestedQuestions());
+            assert.isTrue(form.children()[0].children()[0].hasAnyNestedQuestions());
+            assert.isFalse(form.children()[1].children()[0].children()[0].children()[0].hasAnyNestedQuestions());
         });
 
         it('Should not reconcile outdated data', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
index ca7c14f2a092..f35a6fcc9285 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
@@ -45,7 +45,7 @@ hqDefine("cloudcare/js/form_entry/spec/utils_spec", function () {
             [groupInRepeat] = repeat.children();
             [textInRepeat] = groupInRepeat.children();
 
-            assert.equal(groupInRepeat.caption(), null);
+            assert.equal(groupInRepeat.caption, null);
             assert.equal(utils.getRootForm(text), form);
             assert.equal(utils.getRootForm(groupInRepeat), form);
             assert.equal(utils.getRootForm(textInRepeat), form);

From fcfd832903e2b14b28da215df0cb9d520f19c3fc Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Thu, 14 Dec 2023 00:03:15 +0530
Subject: [PATCH 009/118] Add test for group and question together

---
 .../js/form_entry/spec/form_ui_spec.js        | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
index 4d2be334e66e..37d268b3090c 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
@@ -114,6 +114,61 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             assert.equal(form.children()[3].children().length, 1); // [q3]
         });
 
+        it('Should render groups and question grouped by row', function () {
+            let styleObj = {raw: '3-per-row'};
+            let styleObj2 = {raw: '2-per-row'};
+
+            let g0 = fixtures.groupJSON({
+                style: styleObj,
+                ix: "0",
+            });
+            let g1 = fixtures.groupJSON({
+                style: styleObj,
+                ix: "1",
+            });
+            let q2 = fixtures.labelJSON({
+                style: styleObj,
+                ix: "3",
+            });
+
+            g0.children[0].children[0].style = styleObj2;
+            g0.children[0].children[1].style = styleObj2;
+
+            formJSON.tree = [g0,g1,q2];
+            let form = formUI.Form(formJSON);
+
+            /* Group-Element-Tile-Row
+                    -Group
+                        -Group-Element-Tile-Row
+                            -Group
+                                -Group-Element-Tile-Row
+                                    -Question
+                                    -Question
+                    -Group
+                        -Group-Element-Tile-Row
+                            -Group
+                                -Group-Element-Tile-Row
+                                    -Question
+                                -Group-Element-Tile-Row
+                                    -Question
+                    -Question
+            */
+
+            // Expected structure (where ge signifies type "grouped-element-tile-row")
+            assert.equal(form.children().length, 1); // [ge]
+            assert.equal(form.children()[0].children().length, 3); // [g0,g1,q2]
+            assert.equal(form.children()[0].children()[0].children().length, 1); // [ge]
+            assert.equal(form.children()[0].children()[0].children()[0].children().length, 1); // [group]
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].children().length, 1); // [ge]
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[0].children().length, 2); // [q,q]
+
+             assert.equal(form.children()[0].children()[1].children().length, 1); // [ge]
+             assert.equal(form.children()[0].children()[1].children()[0].children().length, 1); // [group]
+             assert.equal(form.children()[0].children()[1].children()[0].children()[0].children().length, 2); // [ge,ge]
+             assert.equal(form.children()[0].children()[1].children()[0].children()[0].children()[0].children().length, 1); // [q]
+             assert.equal(form.children()[0].children()[1].children()[0].children()[0].children()[1].children().length, 1); // [q]
+        });
+
         it('Should calculate nested background header color', function () {
             let styleObj = {raw: 'group-collapse'};
             let g0 = fixtures.groupJSON({

From a3e8a6af82f11efaed13265008bd63a8cc60061e Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Thu, 14 Dec 2023 13:48:18 +0530
Subject: [PATCH 010/118] Refactor: Review comments

---
 .../static/cloudcare/js/form_entry/form_ui.js    | 16 +++++-----------
 .../cloudcare/js/form_entry/spec/form_ui_spec.js |  2 +-
 .../templates/form_entry/templates.html          |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 75a309e53b96..793b1c325758 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -638,9 +638,9 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
 
         self.hasAnyNestedQuestions = function () {
             return _.any(self.children(), function (d) {
-                if (d.type() === constants.QUESTION_TYPE || d.type() === constants.REPEAT_TYPE) {
+                if (d.type() === constants.REPEAT_TYPE) {
                     return true;
-                } else if (d.type() === constants.GROUP_TYPE || d.type() === constants.GROUPED_ELEMENT_TILE_ROW_TYPE) {
+                } else if (d.type() === constants.GROUPED_ELEMENT_TILE_ROW_TYPE) {
                     return d.hasAnyNestedQuestions();
                 }
             });
@@ -659,16 +659,10 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
             return Container.prototype.headerBackgroundColor.call(self);
         };
 
-        const columnWidth = GroupedElementTileRow.calculateElementWidth(this.style);
-        const perRowPattern = new RegExp(`\\d+${constants.PER_ROW}(\\s|$)`);
-        var styleStr = (self.style) ? ko.utils.unwrapObservable(self.style.raw) : null;
-
-        if (getMatchingStyles(perRowPattern, styleStr)) {
-            this.questionTileWidth = `col-sm-${columnWidth}`;
-        }
-
-
+        let columnWidth = GroupedElementTileRow.calculateElementWidth(this.style);
+        this.elementTile = `col-sm-${columnWidth}`;
     }
+
     Group.prototype = Object.create(Container.prototype);
     Group.prototype.constructor = Container;
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
index 37d268b3090c..75dae224da10 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
@@ -321,7 +321,7 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
         it('Should find nested questions', function () {
             var form = formUI.Form(nestedGroupJSON);
             assert.isTrue(form.children()[0].children()[0].hasAnyNestedQuestions());
-            assert.isFalse(form.children()[1].children()[0].children()[0].children()[0].hasAnyNestedQuestions());
+            assert.isFalse(form.children()[1].children()[0].hasAnyNestedQuestions());
         });
 
         it('Should not reconcile outdated data', function () {
diff --git a/corehq/apps/cloudcare/templates/form_entry/templates.html b/corehq/apps/cloudcare/templates/form_entry/templates.html
index 0922fd2d2228..2e5678281e6c 100644
--- a/corehq/apps/cloudcare/templates/form_entry/templates.html
+++ b/corehq/apps/cloudcare/templates/form_entry/templates.html
@@ -3,7 +3,7 @@
 
 <script type="text/html" id="sub-group-fullform-ko-template">
   <div tabindex="-1" class ="gr" data-bind="
-        class: questionTileWidth,
+        class: elementTile,
         css: {
           'gr-no-children': $data.children().length === 0,
           'gr-has-no-questions': _.all($data.children(), function(d) { return d.type() !== 'grouped-element-tile-row' }),

From 0457bc3d08be8d445e2d2894b2fa3fade18c30f5 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Mon, 18 Dec 2023 15:02:29 +0530
Subject: [PATCH 011/118] Test fix

---
 .../static/cloudcare/js/form_entry/spec/utils_spec.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
index f35a6fcc9285..9cd3d51b5bd3 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
@@ -35,7 +35,7 @@ hqDefine("cloudcare/js/form_entry/spec/utils_spec", function () {
                 textInGroup = fixtures.textJSON({ix: "1,0"}),
                 group = fixtures.groupJSON({ix: "1", children: [textInGroup]}),
                 textInRepeat = fixtures.textJSON({ix: "2_0,0"}),
-                groupInRepeat = fixtures.groupJSON({ix: "2_0", children: [textInRepeat]}),
+                groupInRepeat = fixtures.groupJSON({ix: "2_0", children: [textInRepeat], caption: null}),
                 repeat = fixtures.repeatJSON({ix: "2", children: [groupInRepeat]}),
                 form = formUI.Form({
                     tree: [text, group, repeat],
@@ -45,7 +45,7 @@ hqDefine("cloudcare/js/form_entry/spec/utils_spec", function () {
             [groupInRepeat] = repeat.children();
             [textInRepeat] = groupInRepeat.children();
 
-            assert.equal(groupInRepeat.caption, null);
+            assert.equal(groupInRepeat.children()[0].caption(), null);
             assert.equal(utils.getRootForm(text), form);
             assert.equal(utils.getRootForm(groupInRepeat), form);
             assert.equal(utils.getRootForm(textInRepeat), form);

From f1db764a6a64cf992db3157ec4ad03c52a6963b9 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Mon, 18 Dec 2023 15:38:24 +0530
Subject: [PATCH 012/118] Add group-collapsible style to the correct element

---
 .../static/cloudcare/js/form_entry/spec/form_ui_spec.js        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
index 75dae224da10..ac6beba620de 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
@@ -179,7 +179,7 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             });
             let r1 = fixtures.repeatNestJSON();
             g1.children[0].style = styleObj;
-            r1.children[0].style = styleObj;
+            r1.children[0].children[0].style = styleObj;
             g1.children[0].children.push(r1);
             g0.children[0].children.push(g1);
 
@@ -203,6 +203,7 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[2].children()[0].headerBackgroundColor(), '#003e96'); //[g1]
             assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[2].children()[0].children()[0].children()[0].headerBackgroundColor(), '#004EBC'); //[g1-0]
             assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[2].children()[0].children()[0].children()[0].children()[2].headerBackgroundColor(), '#002f71'); //[r1]
+            assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[2].children()[0].children()[0].children()[0].children()[2].children()[0].children()[0].headerBackgroundColor(), ''); //[r1-0]
         });
 
         it('Should reconcile question choices', function () {

From 21957e1c34057ea8dd06c7ee6a357211d176d658 Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Mon, 18 Dec 2023 17:43:52 +0530
Subject: [PATCH 013/118] Refactor user import code

---
 corehq/apps/user_importer/helpers.py  |   7 +-
 corehq/apps/user_importer/importer.py | 812 ++++++++++++++------------
 2 files changed, 452 insertions(+), 367 deletions(-)

diff --git a/corehq/apps/user_importer/helpers.py b/corehq/apps/user_importer/helpers.py
index 0404200083dd..e75ade0bca6f 100644
--- a/corehq/apps/user_importer/helpers.py
+++ b/corehq/apps/user_importer/helpers.py
@@ -169,9 +169,6 @@ def _include_user_data_changes(self):
 
 
 class CommCareUserImporter(BaseUserImporter):
-    def update_password(self, password):
-        self.user.set_password(password)
-        self.logger.add_change_message(UserChangeMessage.password_reset())
 
     def update_phone_numbers(self, phone_numbers):
         """
@@ -191,14 +188,14 @@ def update_name(self, name):
         self.user.set_full_name(str(name))
         self.logger.add_changes({'first_name': self.user.first_name, 'last_name': self.user.last_name})
 
-    def update_user_data(self, data, uncategorized_data, profile_name, domain_info):
+    def update_user_data(self, data, uncategorized_data, profile_name, profiles_by_name):
         from corehq.apps.users.user_data import UserDataError
         user_data = self.user.get_user_data(self.user_domain)
         old_profile_id = user_data.profile_id
         if PROFILE_SLUG in data:
             raise UserUploadError(_("You cannot set {} directly").format(PROFILE_SLUG))
         if profile_name:
-            profile_id = domain_info.profiles_by_name[profile_name].pk
+            profile_id = profiles_by_name[profile_name].pk
 
         try:
             user_data.update(data, profile_id=profile_id if profile_name else ...)
diff --git a/corehq/apps/user_importer/importer.py b/corehq/apps/user_importer/importer.py
index 3223c50b9f47..edd2463425f8 100644
--- a/corehq/apps/user_importer/importer.py
+++ b/corehq/apps/user_importer/importer.py
@@ -1,3 +1,4 @@
+import copy
 import logging
 import string
 import random
@@ -5,6 +6,7 @@
 from datetime import datetime
 from corehq.util.soft_assert.api import soft_assert
 
+from memoized import memoized
 from django.db import DEFAULT_DB_ALIAS
 
 from corehq.apps.enterprise.models import EnterpriseMobileWorkerSettings
@@ -316,12 +318,6 @@ def get_location_from_site_code(site_code, location_cache):
         )
 
 
-DomainInfo = namedtuple('DomainInfo', [
-    'validators', 'can_assign_locations', 'location_cache',
-    'roles_by_name', 'profiles_by_name', 'group_memoizer'
-])
-
-
 def create_or_update_web_user_invite(email, domain, role_qualified_id, upload_user, location_id,
                                      user_change_logger=None, send_email=True):
     invite, invite_created = Invitation.objects.update_or_create(
@@ -355,79 +351,6 @@ def check_modified_user_loc(location_ids, loc_id, assigned_loc_ids):
     return locations_updated, primary_location_removed
 
 
-def get_domain_info(
-    domain,
-    upload_domain,
-    user_specs,
-    domain_info_by_domain,
-    upload_user=None,
-    group_memoizer=None,
-    is_web_upload=False
-):
-    from corehq.apps.users.views.mobile.custom_data_fields import UserFieldsView
-    from corehq.apps.users.views.utils import get_editable_role_choices
-
-    domain_info = domain_info_by_domain.get(domain)
-    if domain_info:
-        return domain_info
-    if domain == upload_domain:
-        domain_group_memoizer = group_memoizer or GroupMemoizer(domain)
-    else:
-        domain_group_memoizer = GroupMemoizer(domain)
-    domain_group_memoizer.load_all()
-    can_assign_locations = domain_has_privilege(domain, privileges.LOCATIONS)
-    location_cache = None
-    if can_assign_locations:
-        location_cache = SiteCodeToLocationCache(domain)
-
-    domain_obj = Domain.get_by_name(domain)
-    if domain_obj is None:
-        raise UserUploadError(_("Domain cannot be set to '{domain}'".format(domain=domain)))
-
-    allowed_group_names = [group.name for group in domain_group_memoizer.groups]
-    profiles_by_name = {}
-    domain_user_specs = [spec for spec in user_specs if spec.get('domain', upload_domain) == domain]
-    if is_web_upload:
-        roles_by_name = {role[1]: role[0] for role in get_editable_role_choices(domain, upload_user,
-                                                                                allow_admin_role=True)}
-        validators = get_user_import_validators(
-            domain_obj,
-            domain_user_specs,
-            True,
-            allowed_roles=list(roles_by_name),
-            upload_domain=upload_domain,
-        )
-    else:
-        roles_by_name = {role.name: role.get_qualified_id() for role in UserRole.objects.get_by_domain(domain)}
-        definition = CustomDataFieldsDefinition.get(domain, UserFieldsView.field_type)
-        if definition:
-            profiles = definition.get_profiles()
-            profiles_by_name = {
-                profile.name: profile
-                for profile in profiles
-            }
-        validators = get_user_import_validators(
-            domain_obj,
-            domain_user_specs,
-            False,
-            allowed_group_names,
-            list(roles_by_name),
-            list(profiles_by_name),
-            upload_domain
-        )
-
-    domain_info = DomainInfo(
-        validators,
-        can_assign_locations,
-        location_cache,
-        roles_by_name,
-        profiles_by_name,
-        domain_group_memoizer
-    )
-    domain_info_by_domain[domain] = domain_info
-    return domain_info
-
-
 def format_location_codes(location_codes):
     if location_codes and not isinstance(location_codes, list):
         location_codes = [location_codes]
@@ -471,213 +394,73 @@ def create_or_update_commcare_users_and_groups(upload_domain, user_specs, upload
     #
     # Please remove this flag when this method no longer triggers an 'E' or 'F'
     # classification from the radon code static analysis
-
-    from corehq.apps.user_importer.helpers import CommCareUserImporter, WebUserImporter
-
-    domain_info_by_domain = {}
-
-    ret = {"errors": [], "rows": []}
-    current = 0
-    update_deactivate_after_date = EnterpriseMobileWorkerSettings.is_domain_using_custom_deactivation(
-        upload_domain
-    )
-
-    for row in user_specs:
-        if update_progress:
-            update_progress(current)
-            current += 1
-
-        username = row.get('username')
-        domain = row.get('domain') or upload_domain
-        try:
-            username = generate_mobile_username(str(username), domain, False) if username else None
-        except ValidationError:
-            status_row = {
-                'username': username,
-                'row': row,
-                'flag': _("Username must not contain blank spaces or special characters."),
-            }
-            ret["rows"].append(status_row)
-            continue
-        status_row = {
-            'username': username,
-            'row': row,
+    return CCImporter(
+        upload_domain, user_specs, upload_user, upload_record_id,
+        group_memoizer=group_memoizer,
+        update_progress=update_progress
+    ).run()
+
+
+class UserRowMixin:
+    def __init__(self, importer, row):
+        self.importer = importer
+        self.row = row
+        self.status_row = {
+            'row': copy.copy(row)
         }
+        self.error = None
+        self.domain = self.row.get('domain') or self.importer.upload_domain
+        self.domain_info = self.importer.domain_info(self.domain)
+        self.column_values = {}
 
-        # Set a dummy password to pass the validation, similar to GUI user creation
-        send_account_confirmation_sms = spec_value_to_boolean_or_none(row, 'send_confirmation_sms')
-        if send_account_confirmation_sms and not row.get('password'):
-            string_set = string.ascii_uppercase + string.digits + string.ascii_lowercase
-            password = ''.join(random.choices(string_set, k=10))
-            row['password'] = password
-
-        if row.get('password'):
-            row['password'] = str(row.get('password'))
-        try:
-            domain_info = get_domain_info(domain, upload_domain, user_specs, domain_info_by_domain,
-                                          group_memoizer=group_memoizer)
-            for validator in domain_info.validators:
-                validator(row)
-        except UserUploadError as e:
-            status_row['flag'] = str(e)
-            ret['rows'].append(status_row)
-            continue
-
-        data = row.get('data', {})
-        email = row.get('email')
-        group_names = list(map(str, row.get('group') or []))
-        language = row.get('language')
-        name = row.get('name')
-        password = row.get('password')
-        uncategorized_data = row.get('uncategorized_data', {})
-        user_id = row.get('user_id')
-        location_codes = row.get('location_code', []) if 'location_code' in row else None
-        location_codes = format_location_codes(location_codes)
-        role = row.get('role', None)
-        profile_name = row.get('user_profile', None)
-        web_user_username = row.get('web_user')
-        phone_numbers = row.get('phone-number', []) if 'phone-number' in row else None
-
-        deactivate_after = row.get('deactivate_after', None) if update_deactivate_after_date else None
-        if isinstance(deactivate_after, datetime):
-            deactivate_after = deactivate_after.strftime("%m-%Y")
-            row['deactivate_after'] = deactivate_after
-
-        try:
-            password = str(password) if password else None
-            is_active = spec_value_to_boolean_or_none(row, 'is_active')
-            is_account_confirmed = spec_value_to_boolean_or_none(row, 'is_account_confirmed')
-            send_account_confirmation_email = spec_value_to_boolean_or_none(row, 'send_confirmation_email')
-
-            remove_web_user = spec_value_to_boolean_or_none(row, 'remove_web_user')
-
-            if send_account_confirmation_sms:
-                is_active = False
-                if not user_id:
-                    is_account_confirmed = False
-
-            user = _get_or_create_commcare_user(domain, user_id, username, is_account_confirmed,
-                                                web_user_username, password, upload_user)
-            commcare_user_importer = CommCareUserImporter(upload_domain, domain, user, upload_user,
-                                                        is_new_user=not bool(user_id),
-                                                        via=USER_CHANGE_VIA_BULK_IMPORTER,
-                                                        upload_record_id=upload_record_id)
-            if user_id:
-                if is_password(password):
-                    commcare_user_importer.update_password(password)
-                    # overwrite password in results so we do not save it to the db
-                    status_row['row']['password'] = 'REDACTED'
-                status_row['flag'] = 'updated'
-            else:
-                status_row['flag'] = 'created'
+    def validate_row(self):
+        for validator in self.domain_info.validators:
+            validator(self.row)
 
-            if phone_numbers is not None:
-                phone_numbers = clean_phone_numbers(phone_numbers)
-                commcare_user_importer.update_phone_numbers(phone_numbers)
 
-            if name:
-                commcare_user_importer.update_name(name)
+class CCUserRow(UserRowMixin):
 
-            commcare_user_importer.update_user_data(data, uncategorized_data, profile_name, domain_info)
+    def process(self):
+        if not self._process_column_values():
+            return False
 
-            if update_deactivate_after_date:
-                commcare_user_importer.update_deactivate_after(deactivate_after)
-
-            if language:
-                commcare_user_importer.update_language(language)
-            if email:
-                commcare_user_importer.update_email(email)
-            if is_active is not None:
-                commcare_user_importer.update_status(is_active)
-
-            # Do this here so that we validate the location code before we
-            # save any other information to the user, this way either all of
-            # the user's information is updated, or none of it
-            # Do not update location info if the column is not included at all
-            if domain_info.can_assign_locations and location_codes is not None:
-                commcare_user_importer.update_locations(location_codes, domain_info)
-
-            if role:
-                role_qualified_id = domain_info.roles_by_name[role]
-                commcare_user_importer.update_role(role_qualified_id)
-            elif not commcare_user_importer.logger.is_new_user and 'role' in row:
-                commcare_user_importer.update_role('none')
-
-            if web_user_username:
-                user.get_user_data(domain)['login_as_user'] = web_user_username
+        try:
+            self.validate_row()
+            user, import_helper = self._set_user_importer()
+            self._process_simple_fields()
 
             try:
                 user.save(fail_hard=True)
             except Exception as e:
                 # HACK: Catching all exception here is temporary. We believe that user critical sections
                 # are not behaving properly, and this catch-all is here to identify the problem
-                status_row['flag'] = str(e)
+                self.status_row['flag'] = str(e)
                 notify_error(f'Error while processing bulk import: {str(e)}')
                 soft_assert(to='{}@{}'.format('mriley', 'dimagi.com'), send_to_ops=False)(
                     False,
                     'Error while processing bulk import',
                     e
                 )
-                ret["rows"].append(status_row)
-                continue
-
-            log = commcare_user_importer.save_log()
-
-            if web_user_username:
-                check_can_upload_web_users(domain, upload_user)
-                web_user = CouchUser.get_by_username(web_user_username)
-                if web_user:
-                    web_user_importer = WebUserImporter(upload_domain, domain, web_user, upload_user,
-                                                        is_new_user=False,
-                                                        via=USER_CHANGE_VIA_BULK_IMPORTER,
-                                                        upload_record_id=upload_record_id)
-                    user_change_logger = web_user_importer.logger
-                else:
-                    web_user_importer = None
-                    user_change_logger = None
-                if remove_web_user:
-                    remove_web_user_from_domain(domain, web_user, username, upload_user,
-                                                user_change_logger)
-                else:
-                    check_user_role(username, role)
-                    if not web_user and is_account_confirmed:
-                        raise UserUploadError(_(
-                            "You can only set 'Is Account Confirmed' to 'True' on an existing Web User. "
-                            f"{web_user_username} is a new username."
-                        ).format(web_user_username=web_user_username))
-                    if web_user and not web_user.is_member_of(domain) and is_account_confirmed:
-                        # add confirmed account to domain
-                        # role_qualified_id would be present here as confirmed in check_user_role
-                        web_user_importer.add_to_domain(role_qualified_id, user.location_id)
-                    elif not web_user or not web_user.is_member_of(domain):
-                        create_or_update_web_user_invite(web_user_username, domain, role_qualified_id,
-                                                        upload_user, user.location_id, user_change_logger,
-                                                        send_email=send_account_confirmation_email)
-                    elif web_user.is_member_of(domain):
-                        # edit existing user in the domain
-                        web_user_importer.update_role(role_qualified_id)
-                        if location_codes is not None:
-                            web_user_importer.update_primary_location(user.location_id)
-                        web_user.save()
-                if web_user_importer:
-                    web_user_importer.save_log()
-            if not web_user_username:
-                if send_account_confirmation_email:
-                    send_account_confirmation_if_necessary(user)
-                if send_account_confirmation_sms:
-                    send_account_confirmation_sms_if_necessary(user)
-
-            if is_password(password):
+                return False
+
+            log = import_helper.save_log()
+
+            self._process_web_user()
+
+
+            if is_password(self.column_values["password"]):
                 # Without this line, digest auth doesn't work.
                 # With this line, digest auth works.
                 # Other than that, I'm not sure what's going on
                 # Passing use_primary_db=True because of https://dimagi-dev.atlassian.net/browse/ICDS-465
-                user.get_django_user(use_primary_db=True).check_password(password)
+                user.get_django_user(use_primary_db=True).check_password(self.column_values["password"])
 
-            group_change_message = commcare_user_importer.update_user_groups(domain_info, group_names)
+            group_change_message = import_helper.update_user_groups(
+                self.domain_info, self.column_values["group_names"]
+            )
 
             try:
-                domain_info.group_memoizer.save_updated()
+                self.domain_info.group_memoizer.save_updated()
             except BulkSaveError as e:
                 _error_message = (
                     "Oops! We were not able to save some of your group changes. "
@@ -688,7 +471,7 @@ def create_or_update_commcare_users_and_groups(upload_domain, user_specs, upload
                     'BulkSaveError saving groups. '
                     'User saw error message "%s". Errors: %s'
                 ) % (_error_message, e.errors))
-                ret['errors'].append(_error_message)
+                self.error = _error_message
 
             if log and group_change_message:
                 log.change_messages.update(group_change_message)
@@ -697,13 +480,410 @@ def create_or_update_commcare_users_and_groups(upload_domain, user_specs, upload
                 log = commcare_user_importer.logger.save_only_group_changes(group_change_message)
 
         except ValidationError as e:
-            status_row['flag'] = e.message
+            self.status_row['flag'] = e.message
         except (UserUploadError, CouchUser.Inconsistent) as e:
-            status_row['flag'] = str(e)
+            self.status_row['flag'] = str(e)
+
+    def _parse_username(self):
+        username = self.row.get('username')
+        try:
+            self.column_values['username'] = generate_mobile_username(str(username), self.domain, False) if username else None
+        except ValidationError as e:
+            self.status_row['flag'] = _("Username must not contain blank spaces or special characters.")
+            self.column_values['username'] = username
+            return False
+        return True
+
+    def _parse_password(self):
+        if self.row.get('password'):
+            password = str(self.row.get('password'))
+        elif self.column_values["send_confirmation_sms"]:
+            # Set a dummy password to pass the validation, similar to GUI user creation
+            string_set = string.ascii_uppercase + string.digits + string.ascii_lowercase
+            password = ''.join(random.choices(string_set, k=10))
+        else:
+            password = None
+        self.column_values['password'] = password
+        self.status_row['row']['password'] = password
+        if self.column_values['user_id'] and is_password(password):
+            self.status_row['row']['password'] = 'REDACTED'
+
+    def _process_column_values(self):
+        values = {
+            "data": self.row.get('data', {}),
+            "email": self.row.get('email'),
+            "group_names": list(map(str, self.row.get('group') or [])),
+            "language": self.row.get('language'),
+            "name": self.row.get('name'),
+            "uncategorized_data": self.row.get('uncategorized_data', {}),
+            "user_id": self.row.get('user_id'),
+            "location_codes": format_location_codes(
+                self.row.get('location_code', []) if 'location_code' in self.row else None
+            ),
+            "role": self.row.get('role', None),
+            "profile_name": self.row.get('user_profile', None),
+            "web_user_username": self.row.get('web_user'),
+            "phone_numbers": self.row.get('phone-number', []) if 'phone-number' in self.row else None,
+            "deactivate_after": self.row.get('deactivate_after', None)
+        }
+
+        for v in ['is_active', 'is_account_confirmed', 'send_confirmation_email', 'remove_web_user', 'send_confirmation_sms']:
+            values[v] = spec_value_to_boolean_or_none(self.row, v)
+
+        if values["send_confirmation_sms"] and not values["user_id"]:
+            values["is_account_confirmed"] = False
+        else:
+            values["is_account_confirmed"] = values["is_account_confirmed"]
+
+        self.column_values.update(values)
+        if not self._parse_username():
+            return False
+        self._parse_password()
+        return True
+
+    def _set_user_importer(self):
+        from corehq.apps.user_importer.helpers import CommCareUserImporter
+        cv = self.column_values
+
+        self.user = _get_or_create_commcare_user(
+            self.domain, cv["user_id"], cv["username"], cv["is_account_confirmed"],
+            cv["web_user_username"], cv["password"], self.importer.upload_user
+        )
+        self.commcare_user_importer = CommCareUserImporter(
+            self.importer.upload_domain, self.domain, self.user, self.importer.upload_user,
+            is_new_user=not bool(cv["user_id"]),
+            via=USER_CHANGE_VIA_BULK_IMPORTER,
+            upload_record_id=self.importer.upload_record_id
+        )
+        self.status_row['flag'] = 'updated' if cv['user_id'] else 'created'
+
+        return self.user, self.commcare_user_importer
+
+    def _process_simple_fields(self):
+        import_helper = self.commcare_user_importer
+        cv = self.column_values
+        # process password
+        if cv["user_id"] and is_password(cv["password"]):
+            self.user.set_password(cv["password"])
+            import_helper.logger.add_change_message(UserChangeMessage.password_reset())
+
+        # process phone_numbers
+        if cv["phone_numbers"] is not None:
+            phone_numbers = clean_phone_numbers(cv["phone_numbers"])
+            import_helper.update_phone_numbers(phone_numbers)
+
+        # process name
+        if cv["name"]:
+            self.user.set_full_name(str(cv["name"]))
+            import_helper.logger.add_changes({'first_name': self.user.first_name, 'last_name': self.user.last_name})
+
+        # process user_data
+        import_helper.update_user_data(
+            cv["data"], cv["uncategorized_data"], cv["profile_name"],
+            self.domain_info.profiles_by_name
+        )
+
+        if self.importer.update_deactivate_after_date:
+            deactivate_after = cv['deactivate_after']
+            if isinstance(deactivate_after, datetime):
+                deactivate_after = deactivate_after.strftime("%m-%Y")
+
+            import_helper.update_deactivate_after(deactivate_after)
+
+        if cv["language"]:
+            import_helper.update_language(cv["language"])
+        if cv["email"]:
+            import_helper.update_email(cv["email"])
+        if cv["is_active"] is not None:
+            import_helper.update_status(cv["is_active"])
+
+        # Do this here so that we validate the location code before we
+        # save any other information to the user, this way either all of
+        # the user's information is updated, or none of it
+        # Do not update location info if the column is not included at all
+        if self.domain_info.can_assign_locations and cv["location_codes"] is not None:
+            import_helper.update_locations(cv["location_codes"], self.domain_info)
+
+        if cv["role"]:
+            role_qualified_id = self.domain_info.roles_by_name[cv["role"]]
+            import_helper.update_role(role_qualified_id)
+        elif not import_helper.logger.is_new_user and cv["role"]:
+            import_helper.update_role('none')
+
+        if cv["web_user_username"]:
+            self.user.get_user_data(self.domain)['login_as_user'] = cv["web_user_username"]
+
+    def _process_web_user(self):
+        from corehq.apps.user_importer.helpers import WebUserImporter
+        cv = self.column_values
+        web_user_username = cv["web_user_username"]
+        if web_user_username:
+            check_can_upload_web_users(self.domain, self.importer.upload_user)
+            web_user = CouchUser.get_by_username(web_user_username)
+            if web_user:
+                web_user_importer = WebUserImporter(self.importer.upload_domain, self.domain, web_user, self.importer.upload_user,
+                                                    is_new_user=False,
+                                                    via=USER_CHANGE_VIA_BULK_IMPORTER,
+                                                    upload_record_id=self.importer.upload_record_id)
+                user_change_logger = web_user_importer.logger
+            else:
+                web_user_importer = None
+                user_change_logger = None
+            if cv["remove_web_user"]:
+                remove_web_user_from_domain(self.domain, web_user, cv["username"], self.importer.upload_user,
+                                            user_change_logger)
+            else:
+                check_user_role(cv["username"], cv["role"])
+                if not web_user and cv["is_account_confirmed"]:
+                    raise UserUploadError(_(
+                        "You can only set 'Is Account Confirmed' to 'True' on an existing Web User. "
+                        f"{web_user_username} is a new username."
+                    ).format(web_user_username=web_user_username))
+                role_qualified_id = self.domain_info.roles_by_name[cv["role"]]
+                if web_user and not web_user.is_member_of(self.domain) and cv["is_account_confirmed"]:
+                    # add confirmed account to domain
+                    # role_qualified_id would be present here as confirmed in check_user_role
+                    web_user_importer.add_to_domain(role_qualified_id, self.user.location_id)
+                elif not web_user or not web_user.is_member_of(self.domain):
+                    create_or_update_web_user_invite(web_user_username, self.domain, role_qualified_id,
+                                                    self.importer.upload_user, self.user.location_id, user_change_logger,
+                                                    send_email=cv["send_confirmation_email"])
+                elif web_user.is_member_of(self.domain):
+                    # edit existing user in the domain
+                    web_user_importer.update_role(role_qualified_id)
+                    if cv["location_codes"] is not None:
+                        web_user_importer.update_primary_location(self.user.location_id)
+                    web_user.save()
+            if web_user_importer:
+                web_user_importer.save_log()
+        else:
+            if cv["send_confirmation_email"]:
+                send_account_confirmation_if_necessary(self.user)
+            if cv["send_confirmation_sms"]:
+                send_account_confirmation_sms_if_necessary(self.user)
+
+
+class WebUserRow(UserRowMixin):
+
+    def process(self):
+        try:
+            self.validate_row()
+            role = self.row.get('role')
+            status = self.row.get('status')
+            location_codes = self.row.get('location_code', [])
+            location_codes = format_location_codes(location_codes)
+            remove = spec_value_to_boolean_or_none(self.row, 'remove')
+
+            self.process_row(role, status, location_codes, remove)
+        except UserUploadError as e:
+            self.status_row['flag'] = str(e)
+
+    def process_row(self, role, status, location_codes, remove):
+        username = self.row.get('username')
+        user = CouchUser.get_by_username(username, strict=True)
+
+        if user:
+            self.process_existing_user(user, role, status, location_codes, remove)
+        else:
+            self.process_new_user(role, status, location_codes, remove)
+
+    def process_existing_user(self, user, role, status, location_codes, remove):
+        from corehq.apps.user_importer.helpers import WebUserImporter
+        check_changing_username(user, user.username)
+        web_user_importer = WebUserImporter(
+            self.importer.upload_domain, self.domain, user, self.importer.upload_user,
+            is_new_user=False, via=USER_CHANGE_VIA_BULK_IMPORTER, upload_record_id=self.importer.upload_record_id
+        )
+        user_change_logger = web_user_importer.logger
+
+        if remove:
+            remove_web_user_from_domain(
+                self.domain, user, user.username, self.importer.upload_user, user_change_logger, is_web_upload=True
+            )
+            self.status_row['flag'] = 'updated'
+        else:
+            membership = user.get_domain_membership(self.domain)
+            role_qualified_id = self.domain_info.roles_by_name[role]
+
+            if membership:
+                modify_existing_user_in_domain(
+                    self.importer.upload_domain, self.domain, self.domain_info, location_codes, membership,
+                    role_qualified_id, self.importer.upload_user, user, web_user_importer
+                )
+            else:
+                create_or_update_web_user_invite(
+                    user.username, self.domain, role_qualified_id, self.importer.upload_user,
+                    user.location_id, user_change_logger
+                )
+        web_user_importer.save_log()
+        self.status_row['flag'] = 'updated'
+
+    def process_new_user(self, role, status, location_codes, remove):
+        username = self.row.get('username')
+
+        if remove:
+            remove_invited_web_user(self.domain, username)
+            self.status_row['flag'] = 'updated'
+        else:
+            if status == "Invited":
+                self.check_invitation_status(self.domain, username)
+
+            user_invite_loc_id = None
+            if self.domain_info.can_assign_locations and location_codes:
+                if len(location_codes) > 0:
+                    user_invite_loc = get_location_from_site_code(
+                        location_codes[0], self.domain_info.location_cache
+                    )
+                    user_invite_loc_id = user_invite_loc.location_id
+
+            create_or_update_web_user_invite(
+                username, self.domain, self.domain_info.roles_by_name[role], self.importer.upload_user,
+                user_invite_loc_id
+            )
+            self.status_row['flag'] = 'invited'
+
+    def check_invitation_status(self, domain, username):
+        try:
+            invitation = Invitation.objects.get(domain=domain, email=username, is_accepted=False)
+        except Invitation.DoesNotExist:
+            raise UserUploadError(
+                _("You can only set 'Status' to 'Invited' on a pending Web User. "
+                "{web_user} has no invitations for this project space.").format(web_user=username)
+            )
+
+        if invitation.email_status == InvitationStatus.BOUNCED and invitation.email == username:
+            raise UserUploadError(_("The email has bounced for this user's invite. "
+                                "Please try again with a different username").format(web_user=username))
+
+
+class WebImporter:
+
+    row_cls = WebUserRow
 
-        ret["rows"].append(status_row)
+    def __init__(self, upload_domain, user_specs, upload_user, upload_record_id,
+                 update_progress=None):
+        self.upload_domain = upload_domain
+        self.user_specs = user_specs
+        self.upload_user = upload_user
+        self.upload_record_id = upload_record_id
+        self.update_progress = update_progress
+        self.is_web_upload = True
 
-    return ret
+    @memoized
+    def domain_info(self, domain):
+        return DomainInfo(self, domain, is_web_upload=self.is_web_upload)
+
+    def run(self):
+        ret = {"errors": [], "rows": []}
+        current = 0
+        for row in self.user_specs:
+            if self.update_progress:
+                self.update_progress(current)
+                current += 1
+            user_row = self.row_cls(self, row)
+            user_row.process()
+            ret["rows"].append(user_row.status_row)
+            if user_row.error:
+                ret["errors"].append(user_row.error)
+        return ret
+
+
+class CCImporter(WebImporter):
+
+    row_cls = CCUserRow
+
+    def __init__(self, *args, group_memoizer=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._group_memoizer = group_memoizer
+        self.is_web_upload = False
+
+    @property
+    def update_deactivate_after_date(self):
+        return EnterpriseMobileWorkerSettings.is_domain_using_custom_deactivation(
+            self.upload_domain
+        )
+
+
+class DomainInfo:
+
+    def __init__(self, importer, domain, is_web_upload):
+        self.importer = importer
+        self.domain = domain
+        self.is_web_upload = is_web_upload
+
+    @property
+    def domain_obj(self):
+        domain_obj = Domain.get_by_name(self.domain)
+        if domain_obj is None:
+            raise UserUploadError(_(f"Domain cannot be set to '{self.domain}'"))
+        return domain_obj
+
+    @property
+    def group_memoizer(self):
+        if self.domain == self.importer.upload_domain:
+            memoizer = self.importer._group_memoizer or GroupMemoizer(self.domain)
+        else:
+            memoizer = GroupMemoizer(self.domain)
+        memoizer.load_all()
+        return memoizer
+
+    @property
+    def roles_by_name(self):
+        from corehq.apps.users.views.utils import get_editable_role_choices
+        if self.is_web_upload:
+            return {role[1]: role[0] for role in get_editable_role_choices(self.domain, self.importer.upload_user,
+                                                  allow_admin_role=True)}
+        else:
+            return {role.name: role.get_qualified_id() for role in UserRole.objects.get_by_domain(self.domain)}
+
+    @property
+    def can_assign_locations(self):
+        return domain_has_privilege(self.domain, privileges.LOCATIONS)
+
+    @property
+    def location_cache(self):
+        if self.can_assign_locations:
+            return SiteCodeToLocationCache(self.domain)
+        else:
+            return None
+
+    @property
+    def profiles_by_name(self):
+        from corehq.apps.users.views.mobile.custom_data_fields import UserFieldsView
+        if self.is_web_upload:
+            return {}
+        definition = CustomDataFieldsDefinition.get(self.domain, UserFieldsView.field_type)
+        if definition:
+            profiles = definition.get_profiles()
+            return {
+                profile.name: profile
+                for profile in profiles
+            }
+        else:
+            return {}
+
+    @property
+    def validators(self):
+        roles_by_name = list(self.roles_by_name)
+        domain_user_specs = [
+            spec
+            for spec in self.importer.user_specs if spec.get('domain', self.importer.upload_domain) == self.domain
+        ]
+        if self.is_web_upload:
+            allowed_group_names = None
+            profiles = None
+        else:
+            allowed_group_names = [group.name for group in self.group_memoizer.groups]
+            profiles = list(self.profiles_by_name)
+        return get_user_import_validators(
+            self.domain_obj,
+            domain_user_specs,
+            self.is_web_upload,
+            allowed_group_names,
+            allowed_roles=roles_by_name,
+            allowed_profiles=profiles,
+            upload_domain=self.importer.upload_domain,
+        )
 
 
 def _get_or_create_commcare_user(domain, user_id, username, is_account_confirmed, web_user_username, password,
@@ -732,102 +912,10 @@ def _get_or_create_commcare_user(domain, user_id, username, is_account_confirmed
 
 
 def create_or_update_web_users(upload_domain, user_specs, upload_user, upload_record_id, update_progress=None):
-    from corehq.apps.user_importer.helpers import WebUserImporter
-
-    domain_info_by_domain = {}
-
-    ret = {"errors": [], "rows": []}
-    current = 0
-
-    for row in user_specs:
-        if update_progress:
-            update_progress(current)
-            current += 1
-
-        username = row.get('username')
-        domain = row.get('domain') or upload_domain
-        status_row = {
-            'username': username,
-            'row': row,
-        }
-        try:
-            domain_info = get_domain_info(domain, upload_domain, user_specs, domain_info_by_domain,
-                                          upload_user=upload_user, is_web_upload=True)
-            for validator in domain_info.validators:
-                validator(row)
-        except UserUploadError as e:
-            status_row['flag'] = str(e)
-            ret['rows'].append(status_row)
-            continue
-
-        role = row.get('role', None)
-        status = row.get('status')
-
-        location_codes = row.get('location_code', []) if 'location_code' in row else None
-        location_codes = format_location_codes(location_codes)
-
-        try:
-            remove = spec_value_to_boolean_or_none(row, 'remove')
-            check_user_role(username, role)
-            role_qualified_id = domain_info.roles_by_name[role]
-            check_can_upload_web_users(domain, upload_user)
-
-            user = CouchUser.get_by_username(username, strict=True)
-            if user:
-                check_changing_username(user, username)
-                web_user_importer = WebUserImporter(upload_domain, domain, user, upload_user,
-                                                    is_new_user=False,
-                                                    via=USER_CHANGE_VIA_BULK_IMPORTER,
-                                                    upload_record_id=upload_record_id)
-                user_change_logger = web_user_importer.logger
-                if remove:
-                    remove_web_user_from_domain(domain, user, username, upload_user, user_change_logger,
-                                                is_web_upload=True)
-                else:
-                    membership = user.get_domain_membership(domain)
-                    if membership:
-                        modify_existing_user_in_domain(upload_domain, domain, domain_info, location_codes,
-                                                       membership, role_qualified_id, upload_user, user,
-                                                       web_user_importer)
-                    else:
-                        create_or_update_web_user_invite(username, domain, role_qualified_id, upload_user,
-                                                         user.location_id, user_change_logger)
-                web_user_importer.save_log()
-                status_row['flag'] = 'updated'
-
-            else:
-                if remove:
-                    remove_invited_web_user(domain, username)
-                    status_row['flag'] = 'updated'
-                else:
-                    if status == "Invited":
-                        try:
-                            invitation = Invitation.objects.get(domain=domain, email=username, is_accepted=False)
-                        except Invitation.DoesNotExist:
-                            raise UserUploadError(_("You can only set 'Status' to 'Invited' on a pending Web "
-                                                    "User. {web_user} has no invitations for this project "
-                                                    "space.").format(web_user=username))
-                        if invitation.email_status == InvitationStatus.BOUNCED and invitation.email == username:
-                            raise UserUploadError(_("The email has bounced for this user's invite. Please try "
-                                                    "again with a different username").format(web_user=username))
-                    user_invite_loc_id = None
-                    if domain_info.can_assign_locations and location_codes is not None:
-                        # set invite location to first item in location_codes
-                        if len(location_codes) > 0:
-                            user_invite_loc = get_location_from_site_code(
-                                location_codes[0], domain_info.location_cache
-                            )
-                            user_invite_loc_id = user_invite_loc.location_id
-                    create_or_update_web_user_invite(username, domain, role_qualified_id, upload_user,
-                                                     user_invite_loc_id)
-                    status_row['flag'] = 'invited'
-
-        except (UserUploadError, CouchUser.Inconsistent) as e:
-            status_row['flag'] = str(e)
-
-        ret["rows"].append(status_row)
-
-    return ret
+    return WebImporter(
+        upload_domain, user_specs, upload_user, upload_record_id,
+        update_progress=update_progress
+    ).run()
 
 
 def modify_existing_user_in_domain(upload_domain, domain, domain_info, location_codes, membership,

From b19e19a86a9182c4e52d5cb0bc680758c22d09c5 Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Wed, 27 Dec 2023 14:26:41 +0530
Subject: [PATCH 014/118] PR Feedback

---
 corehq/apps/user_importer/importer.py | 79 +++++++++++++++------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/corehq/apps/user_importer/importer.py b/corehq/apps/user_importer/importer.py
index edd2463425f8..250b108f1b54 100644
--- a/corehq/apps/user_importer/importer.py
+++ b/corehq/apps/user_importer/importer.py
@@ -401,7 +401,7 @@ def create_or_update_commcare_users_and_groups(upload_domain, user_specs, upload
     ).run()
 
 
-class UserRowMixin:
+class BaseUserRow:
     def __init__(self, importer, row):
         self.importer = importer
         self.row = row
@@ -418,7 +418,7 @@ def validate_row(self):
             validator(self.row)
 
 
-class CCUserRow(UserRowMixin):
+class CCUserRow(BaseUserRow):
 
     def process(self):
         if not self._process_column_values():
@@ -426,11 +426,10 @@ def process(self):
 
         try:
             self.validate_row()
-            user, import_helper = self._set_user_importer()
             self._process_simple_fields()
 
             try:
-                user.save(fail_hard=True)
+                self.user.save(fail_hard=True)
             except Exception as e:
                 # HACK: Catching all exception here is temporary. We believe that user critical sections
                 # are not behaving properly, and this catch-all is here to identify the problem
@@ -443,19 +442,18 @@ def process(self):
                 )
                 return False
 
-            log = import_helper.save_log()
+            log = self.import_helper.save_log()
 
             self._process_web_user()
 
-
             if is_password(self.column_values["password"]):
                 # Without this line, digest auth doesn't work.
                 # With this line, digest auth works.
                 # Other than that, I'm not sure what's going on
                 # Passing use_primary_db=True because of https://dimagi-dev.atlassian.net/browse/ICDS-465
-                user.get_django_user(use_primary_db=True).check_password(self.column_values["password"])
+                self.user.get_django_user(use_primary_db=True).check_password(self.column_values["password"])
 
-            group_change_message = import_helper.update_user_groups(
+            group_change_message = self.import_helper.update_user_groups(
                 self.domain_info, self.column_values["group_names"]
             )
 
@@ -477,7 +475,7 @@ def process(self):
                 log.change_messages.update(group_change_message)
                 log.save()
             elif group_change_message:
-                log = commcare_user_importer.logger.save_only_group_changes(group_change_message)
+                log = self.import_helper.logger.save_only_group_changes(group_change_message)
 
         except ValidationError as e:
             self.status_row['flag'] = e.message
@@ -541,44 +539,48 @@ def _process_column_values(self):
         self._parse_password()
         return True
 
-    def _set_user_importer(self):
-        from corehq.apps.user_importer.helpers import CommCareUserImporter
+    @property
+    @memoized
+    def user(self):
         cv = self.column_values
-
-        self.user = _get_or_create_commcare_user(
+        self.status_row['flag'] = 'updated' if cv['user_id'] else 'created'
+        return _get_or_create_commcare_user(
             self.domain, cv["user_id"], cv["username"], cv["is_account_confirmed"],
             cv["web_user_username"], cv["password"], self.importer.upload_user
         )
-        self.commcare_user_importer = CommCareUserImporter(
+
+    @property
+    @memoized
+    def import_helper(self):
+        from corehq.apps.user_importer.helpers import CommCareUserImporter
+        return CommCareUserImporter(
             self.importer.upload_domain, self.domain, self.user, self.importer.upload_user,
-            is_new_user=not bool(cv["user_id"]),
+            is_new_user=not bool(self.column_values["user_id"]),
             via=USER_CHANGE_VIA_BULK_IMPORTER,
             upload_record_id=self.importer.upload_record_id
         )
-        self.status_row['flag'] = 'updated' if cv['user_id'] else 'created'
-
-        return self.user, self.commcare_user_importer
 
     def _process_simple_fields(self):
-        import_helper = self.commcare_user_importer
         cv = self.column_values
         # process password
         if cv["user_id"] and is_password(cv["password"]):
             self.user.set_password(cv["password"])
-            import_helper.logger.add_change_message(UserChangeMessage.password_reset())
+            self.import_helper.logger.add_change_message(UserChangeMessage.password_reset())
 
         # process phone_numbers
         if cv["phone_numbers"] is not None:
             phone_numbers = clean_phone_numbers(cv["phone_numbers"])
-            import_helper.update_phone_numbers(phone_numbers)
+            self.import_helper.update_phone_numbers(phone_numbers)
 
         # process name
         if cv["name"]:
             self.user.set_full_name(str(cv["name"]))
-            import_helper.logger.add_changes({'first_name': self.user.first_name, 'last_name': self.user.last_name})
+            self.import_helper.logger.add_changes(
+                {'first_name': self.user.first_name, 'last_name': self.user.last_name}
+            )
 
         # process user_data
-        import_helper.update_user_data(
+        self.import_helper.update_user_data(
             cv["data"], cv["uncategorized_data"], cv["profile_name"],
             self.domain_info.profiles_by_name
         )
@@ -588,27 +590,27 @@ def _process_simple_fields(self):
             if isinstance(deactivate_after, datetime):
                 deactivate_after = deactivate_after.strftime("%m-%Y")
 
-            import_helper.update_deactivate_after(deactivate_after)
+            self.import_helper.update_deactivate_after(deactivate_after)
 
         if cv["language"]:
-            import_helper.update_language(cv["language"])
+            self.import_helper.update_language(cv["language"])
         if cv["email"]:
-            import_helper.update_email(cv["email"])
+            self.import_helper.update_email(cv["email"])
         if cv["is_active"] is not None:
-            import_helper.update_status(cv["is_active"])
+            self.import_helper.update_status(cv["is_active"])
 
         # Do this here so that we validate the location code before we
         # save any other information to the user, this way either all of
         # the user's information is updated, or none of it
         # Do not update location info if the column is not included at all
         if self.domain_info.can_assign_locations and cv["location_codes"] is not None:
-            import_helper.update_locations(cv["location_codes"], self.domain_info)
+            self.import_helper.update_locations(cv["location_codes"], self.domain_info)
 
         if cv["role"]:
             role_qualified_id = self.domain_info.roles_by_name[cv["role"]]
-            import_helper.update_role(role_qualified_id)
-        elif not import_helper.logger.is_new_user and cv["role"]:
-            import_helper.update_role('none')
+            self.import_helper.update_role(role_qualified_id)
+        elif not self.import_helper.logger.is_new_user and cv["role"]:
+            self.import_helper.update_role('none')
 
         if cv["web_user_username"]:
             self.user.get_user_data(self.domain)['login_as_user'] = cv["web_user_username"]
@@ -663,7 +665,7 @@ def _process_web_user(self):
                 send_account_confirmation_sms_if_necessary(self.user)
 
 
-class WebUserRow(UserRowMixin):
+class WebUserRow(BaseUserRow):
 
     def process(self):
         try:
@@ -776,10 +778,9 @@ def domain_info(self, domain):
     def run(self):
         ret = {"errors": [], "rows": []}
         current = 0
-        for row in self.user_specs:
+        for i, row in enumerate(self.user_specs):
             if self.update_progress:
-                self.update_progress(current)
-                current += 1
+                self.update_progress(i)
             user_row = self.row_cls(self, row)
             user_row.process()
             ret["rows"].append(user_row.status_row)
@@ -798,6 +799,7 @@ def __init__(self, *args, group_memoizer=None, **kwargs):
         self.is_web_upload = False
 
     @property
+    @memoized
     def update_deactivate_after_date(self):
         return EnterpriseMobileWorkerSettings.is_domain_using_custom_deactivation(
             self.upload_domain
@@ -812,6 +814,7 @@ def __init__(self, importer, domain, is_web_upload):
         self.is_web_upload = is_web_upload
 
     @property
+    @memoized
     def domain_obj(self):
         domain_obj = Domain.get_by_name(self.domain)
         if domain_obj is None:
@@ -819,6 +822,7 @@ def domain_obj(self):
         return domain_obj
 
     @property
+    @memoized
     def group_memoizer(self):
         if self.domain == self.importer.upload_domain:
             memoizer = self.importer._group_memoizer or GroupMemoizer(self.domain)
@@ -828,6 +832,7 @@ def group_memoizer(self):
         return memoizer
 
     @property
+    @memoized
     def roles_by_name(self):
         from corehq.apps.users.views.utils import get_editable_role_choices
         if self.is_web_upload:
@@ -837,10 +842,12 @@ def roles_by_name(self):
             return {role.name: role.get_qualified_id() for role in UserRole.objects.get_by_domain(self.domain)}
 
     @property
+    @memoized
     def can_assign_locations(self):
         return domain_has_privilege(self.domain, privileges.LOCATIONS)
 
     @property
+    @memoized
     def location_cache(self):
         if self.can_assign_locations:
             return SiteCodeToLocationCache(self.domain)
@@ -848,6 +855,7 @@ def location_cache(self):
             return None
 
     @property
+    @memoized
     def profiles_by_name(self):
         from corehq.apps.users.views.mobile.custom_data_fields import UserFieldsView
         if self.is_web_upload:
@@ -863,6 +871,7 @@ def profiles_by_name(self):
             return {}
 
     @property
+    @memoized
     def validators(self):
         roles_by_name = list(self.roles_by_name)
         domain_user_specs = [

From 9a190c443c09edcb1895c2b89168c741d32e605e Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Thu, 28 Dec 2023 13:04:27 +0530
Subject: [PATCH 015/118] Fix required-fields validation bug for profile fields

---
 corehq/apps/custom_data_fields/models.py      |  8 +++++--
 corehq/apps/user_importer/importer.py         |  4 ++--
 .../apps/user_importer/tests/test_importer.py | 22 +++++++++++++++++++
 corehq/apps/user_importer/validation.py       | 16 +++++++++-----
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/corehq/apps/custom_data_fields/models.py b/corehq/apps/custom_data_fields/models.py
index cc2c1c69cbf7..950836614b2c 100644
--- a/corehq/apps/custom_data_fields/models.py
+++ b/corehq/apps/custom_data_fields/models.py
@@ -132,9 +132,13 @@ def get_validator(self):
         """
         Returns a validator to be used in bulk import
         """
-        def validate_custom_fields(custom_fields):
+        def validate_custom_fields(custom_fields, profile=None):
             errors = []
-            for field in self.get_fields():
+            # Fields set via profile can be skipped since they
+            #   are valdiated when the profile is created/edited
+            skip_fields = profile.fields.keys() if profile else []
+            fields = [f for f in self.get_fields() if f.slug not in skip_fields]
+            for field in fields:
                 value = custom_fields.get(field.slug, None)
                 errors.append(field.validate_required(value))
                 errors.append(field.validate_choices(value))
diff --git a/corehq/apps/user_importer/importer.py b/corehq/apps/user_importer/importer.py
index 250b108f1b54..4cba3d578619 100644
--- a/corehq/apps/user_importer/importer.py
+++ b/corehq/apps/user_importer/importer.py
@@ -883,14 +883,14 @@ def validators(self):
             profiles = None
         else:
             allowed_group_names = [group.name for group in self.group_memoizer.groups]
-            profiles = list(self.profiles_by_name)
+            profiles = self.profiles_by_name
         return get_user_import_validators(
             self.domain_obj,
             domain_user_specs,
             self.is_web_upload,
             allowed_group_names,
             allowed_roles=roles_by_name,
-            allowed_profiles=profiles,
+            profiles_by_name=profiles,
             upload_domain=self.importer.upload_domain,
         )
 
diff --git a/corehq/apps/user_importer/tests/test_importer.py b/corehq/apps/user_importer/tests/test_importer.py
index 90099c291185..4d0d90ae3fe4 100644
--- a/corehq/apps/user_importer/tests/test_importer.py
+++ b/corehq/apps/user_importer/tests/test_importer.py
@@ -695,6 +695,28 @@ def test_user_data_profile_blank(self):
             PROFILE_SLUG: self.profile.id,
         })
 
+    def test_required_field_optional_if_profile_set(self):
+        required_field = [f for f in self.definition.get_fields() if f.slug == 'mode'][0]
+        required_field.is_required = True
+        required_field.save()
+        import_users_and_groups(
+            self.domain.name,
+            # mode is marked as is_required but provided via profile
+            [self._get_spec(user_profile=self.profile.name)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            False
+        )
+        self.assert_user_data_equals({
+            'commcare_project': 'mydomain',
+            'mode': 'minor',
+            PROFILE_SLUG: self.profile.id,
+        })
+        # cleanup
+        required_field.is_required = False
+        required_field.save()
+
     def test_user_data_profile_conflict(self):
         rows = import_users_and_groups(
             self.domain.name,
diff --git a/corehq/apps/user_importer/validation.py b/corehq/apps/user_importer/validation.py
index d672e3125856..703f6171c448 100644
--- a/corehq/apps/user_importer/validation.py
+++ b/corehq/apps/user_importer/validation.py
@@ -22,7 +22,7 @@
 
 
 def get_user_import_validators(domain_obj, all_specs, is_web_user_import, allowed_groups=None, allowed_roles=None,
-                               allowed_profiles=None, upload_domain=None):
+                               profiles_by_name=None, upload_domain=None):
     domain = domain_obj.name
     validate_passwords = domain_obj.strong_mobile_passwords
     noop = NoopValidator(domain)
@@ -31,7 +31,7 @@ def get_user_import_validators(domain_obj, all_specs, is_web_user_import, allowe
         UsernameTypeValidator(domain),
         DuplicateValidator(domain, 'username', all_specs),
         UsernameLengthValidator(domain),
-        CustomDataValidator(domain),
+        CustomDataValidator(domain, profiles_by_name),
         EmailValidator(domain, 'email'),
         RoleValidator(domain, allowed_roles),
         ExistingUserValidator(domain, all_specs),
@@ -52,7 +52,7 @@ def get_user_import_validators(domain_obj, all_specs, is_web_user_import, allowe
             NewUserPasswordValidator(domain),
             PasswordValidator(domain) if validate_passwords else noop,
             GroupValidator(domain, allowed_groups),
-            ProfileValidator(domain, allowed_profiles),
+            ProfileValidator(domain, list(profiles_by_name)),
             ConfirmationSmsValidator(domain)
         ]
 
@@ -223,15 +223,21 @@ def validate_spec(self, spec):
 
 
 class CustomDataValidator(ImportValidator):
-    def __init__(self, domain):
+    def __init__(self, domain, profiles_by_name):
         super().__init__(domain)
         from corehq.apps.users.views.mobile.custom_data_fields import UserFieldsView
         self.custom_data_validator = UserFieldsView.get_validator(domain)
+        self.profiles_by_name = profiles_by_name
 
     def validate_spec(self, spec):
         data = spec.get('data')
+        profile_name = spec.get('user_profile')
         if data:
-            return self.custom_data_validator(data)
+            if profile_name and self.profiles_by_name:
+                profile = self.profiles_by_name.get(profile_name)
+            else:
+                profile = None
+            return self.custom_data_validator(data, profile=profile)
 
 
 class EmailValidator(ImportValidator):

From 2f2198b79eaf020d32b84709608b1ec566c7e2d8 Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Thu, 28 Dec 2023 19:28:46 +0530
Subject: [PATCH 016/118] dump userdata in webuser bulk download

---
 corehq/apps/users/bulk_download.py | 84 +++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 30 deletions(-)

diff --git a/corehq/apps/users/bulk_download.py b/corehq/apps/users/bulk_download.py
index f2361835db4e..efa1539d971a 100644
--- a/corehq/apps/users/bulk_download.py
+++ b/corehq/apps/users/bulk_download.py
@@ -2,6 +2,7 @@
 
 from django.conf import settings
 from django.utils.translation import gettext
+from memoized import memoized
 
 from couchexport.writers import Excel2007ExportWriter
 from soil import DownloadBase
@@ -88,14 +89,53 @@ def get_phone_numbers(user_data):
     return phone_numbers_dict
 
 
-def make_mobile_user_dict(user, group_names, location_cache, domain, fields_definition, deactivation_triggers):
-    model_data = {}
-    uncategorized_data = {}
-    user_data = user.get_user_data(domain)
-    model_data, uncategorized_data = fields_definition.get_model_and_uncategorized(user_data.to_dict())
-    profile_name = (user_data.profile.name
-                    if user_data.profile and domain_has_privilege(domain, privileges.APP_USER_PROFILES)
-                    else "")
+class UserDataContributor:
+
+    def __init__(self, domain):
+        self.domain = domain
+        self.unrecognized_user_data_keys = set()
+        self.has_profile_privilege = domain_has_privilege(domain, privileges.APP_USER_PROFILES)
+
+    @property
+    @memoized
+    def fields_definition(self):
+        from corehq.apps.users.views.mobile.custom_data_fields import (
+            UserFieldsView,
+        )
+        return CustomDataFieldsDefinition.get_or_create(
+            self.domain,
+            UserFieldsView.field_type
+        )
+
+    def get_headers(self):
+        user_headers = []
+        if self.has_profile_privilege:
+            user_headers += ['user_profile']
+        user_data_fields = [f.slug for f in self.fields_definition.get_fields(include_system=False)]
+        user_headers.extend(build_data_headers(user_data_fields))
+        user_headers.extend(build_data_headers(
+            self.unrecognized_user_data_keys,
+            header_prefix='uncategorized_data'
+        ))
+        return user_headers
+
+    def get_data_dict(self, user):
+        model_data = {}
+        uncategorized_data = {}
+        user_data = user.get_user_data(self.domain)
+        model_data, uncategorized_data = self.fields_definition.get_model_and_uncategorized(user_data.to_dict())
+        profile_name = (user_data.profile.name
+                        if user_data.profile and self.has_profile_privilege
+                        else "")
+        self.unrecognized_user_data_keys.update(uncategorized_data)
+        return {
+            'data': model_data,
+            'uncategorized_data': uncategorized_data,
+            'user_profile': profile_name,
+        }
+
+
+def make_mobile_user_dict(user, group_names, location_cache, domain, deactivation_triggers):
     role = user.get_role(domain)
     activity = user.reporting_metadata
     location_codes = get_location_codes(location_cache, user.location_id, user.assigned_location_ids)
@@ -104,8 +144,6 @@ def _format_date(date):
         return date.strftime('%Y-%m-%d %H:%M:%S') if date else ''
 
     user_dict = {
-        'data': model_data,
-        'uncategorized_data': uncategorized_data,
         'group': group_names,
         'name': user.full_name,
         'password': "********",  # dummy display string for passwords
@@ -118,7 +156,6 @@ def _format_date(date):
         'location_code': location_codes,
         'role': role.name if role else '',
         'domain': domain,
-        'user_profile': profile_name,
         'registered_on (read only)': _format_date(user.created_on),
         'last_submission (read only)': _format_date(activity.last_submission_for_user.submission_date),
         'last_sync (read only)': activity.last_sync_for_user.sync_date,
@@ -191,19 +228,12 @@ def get_user_rows(user_dicts, user_headers):
 
 
 def parse_mobile_users(domain, user_filters, task=None, total_count=None):
-    from corehq.apps.users.views.mobile.custom_data_fields import (
-        UserFieldsView,
-    )
-    fields_definition = CustomDataFieldsDefinition.get_or_create(
-        domain,
-        UserFieldsView.field_type
-    )
-    unrecognized_user_data_keys = set()
     user_groups_length = 0
     max_location_length = 0
     phone_numbers_length = 0
     user_dicts = []
     (is_cross_domain, domains_list) = get_domains_from_user_filters(domain, user_filters)
+    user_data_contributor = UserDataContributor(domain)
 
     current_user_downloaded_count = 0
     for current_domain in domains_list:
@@ -226,11 +256,10 @@ def parse_mobile_users(domain, user_filters, task=None, total_count=None):
                 group_names,
                 location_cache,
                 current_domain,
-                fields_definition,
                 deactivation_triggers,
             )
+            user_dict.update(user_data_contributor.get_data_dict(user))
             user_dicts.append(user_dict)
-            unrecognized_user_data_keys.update(user_dict['uncategorized_data'])
             user_groups_length = max(user_groups_length, len(group_names))
             max_location_length = max(max_location_length, len(user_dict["location_code"]))
 
@@ -249,17 +278,9 @@ def parse_mobile_users(domain, user_filters, task=None, total_count=None):
         {'phone-number': list(range(1, phone_numbers_length + 1))}
     ))
 
-    if domain_has_privilege(domain, privileges.APP_USER_PROFILES):
-        user_headers += ['user_profile']
-
     if EnterpriseMobileWorkerSettings.is_domain_using_custom_deactivation(domain):
         user_headers += ['deactivate_after']
-    user_data_fields = [f.slug for f in fields_definition.get_fields(include_system=False)]
-    user_headers.extend(build_data_headers(user_data_fields))
-    user_headers.extend(build_data_headers(
-        unrecognized_user_data_keys,
-        header_prefix='uncategorized_data'
-    ))
+    user_headers.extend(user_data_contributor.get_headers())
     user_headers.extend(json_to_headers(
         {'group': list(range(1, user_groups_length + 1))}
     ))
@@ -277,10 +298,12 @@ def parse_web_users(domain, user_filters, task=None, total_count=None):
     max_location_length = 0
     (is_cross_domain, domains_list) = get_domains_from_user_filters(domain, user_filters)
     progress = 0
+    user_data_contributor = UserDataContributor(domain)
     for current_domain in domains_list:
         location_cache = LocationIdToSiteCodeCache(current_domain)
         for user in get_web_users_by_filters(current_domain, user_filters):
             user_dict = make_web_user_dict(user, location_cache, current_domain)
+            user_dict.update(user_data_contributor.get_data_dict(user))
             user_dicts.append(user_dict)
             max_location_length = max(max_location_length, len(user_dict["location_code"]))
             progress += 1
@@ -295,6 +318,7 @@ def parse_web_users(domain, user_filters, task=None, total_count=None):
         'username', 'first_name', 'last_name', 'email', 'role', 'last_access_date (read only)',
         'last_login (read only)', 'status', 'remove'
     ]
+    user_headers.extend(user_data_contributor.get_headers())
     if domain_has_privilege(domain, privileges.LOCATIONS):
         user_headers.extend(json_to_headers(
             {'location_code': list(range(1, max_location_length + 1))}

From e3e5788818389e72e050a175c3c6803222ba6724 Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Thu, 28 Dec 2023 20:03:11 +0530
Subject: [PATCH 017/118] refactor webuser importer code

---
 corehq/apps/user_importer/importer.py | 99 ++++++++++++++-------------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/corehq/apps/user_importer/importer.py b/corehq/apps/user_importer/importer.py
index 4cba3d578619..c7105ae8b4b2 100644
--- a/corehq/apps/user_importer/importer.py
+++ b/corehq/apps/user_importer/importer.py
@@ -667,29 +667,32 @@ def _process_web_user(self):
 
 class WebUserRow(BaseUserRow):
 
+    def _process_column_values(self):
+        self.column_values = {
+            'username': self.row.get('username'),
+            'role': self.row.get('role'),
+            'status': self.row.get('status'),
+            'location_codes': format_location_codes(self.row.get('location_code', [])),
+            'remove': spec_value_to_boolean_or_none(self.row, 'remove')
+        }
+
     def process(self):
         try:
             self.validate_row()
-            role = self.row.get('role')
-            status = self.row.get('status')
-            location_codes = self.row.get('location_code', [])
-            location_codes = format_location_codes(location_codes)
-            remove = spec_value_to_boolean_or_none(self.row, 'remove')
-
-            self.process_row(role, status, location_codes, remove)
+            self._process_column_values()
+            self.process_row()
         except UserUploadError as e:
             self.status_row['flag'] = str(e)
 
-    def process_row(self, role, status, location_codes, remove):
-        username = self.row.get('username')
-        user = CouchUser.get_by_username(username, strict=True)
+    def process_row(self):
+        user = CouchUser.get_by_username(self.column_values['username'], strict=True)
 
         if user:
-            self.process_existing_user(user, role, status, location_codes, remove)
+            self.process_existing_user(user)
         else:
-            self.process_new_user(role, status, location_codes, remove)
+            self.process_new_user()
 
-    def process_existing_user(self, user, role, status, location_codes, remove):
+    def process_existing_user(self, user):
         from corehq.apps.user_importer.helpers import WebUserImporter
         check_changing_username(user, user.username)
         web_user_importer = WebUserImporter(
@@ -698,19 +701,18 @@ def process_existing_user(self, user, role, status, location_codes, remove):
         )
         user_change_logger = web_user_importer.logger
 
-        if remove:
+        if self.column_values['remove']:
             remove_web_user_from_domain(
                 self.domain, user, user.username, self.importer.upload_user, user_change_logger, is_web_upload=True
             )
             self.status_row['flag'] = 'updated'
         else:
             membership = user.get_domain_membership(self.domain)
-            role_qualified_id = self.domain_info.roles_by_name[role]
+            role_qualified_id = self.domain_info.roles_by_name[self.column_values['role']]
 
             if membership:
-                modify_existing_user_in_domain(
-                    self.importer.upload_domain, self.domain, self.domain_info, location_codes, membership,
-                    role_qualified_id, self.importer.upload_user, user, web_user_importer
+                self._modify_existing_user_in_domain(
+                    membership, role_qualified_id, user, web_user_importer
                 )
             else:
                 create_or_update_web_user_invite(
@@ -720,26 +722,47 @@ def process_existing_user(self, user, role, status, location_codes, remove):
         web_user_importer.save_log()
         self.status_row['flag'] = 'updated'
 
-    def process_new_user(self, role, status, location_codes, remove):
-        username = self.row.get('username')
+    def _modify_existing_user_in_domain(self, membership, role_qualified_id,
+                                       current_user, web_user_importer,
+                                       max_tries=3):
+        location_codes = self.column_values['location_codes']
+        if self.domain_info.can_assign_locations and location_codes is not None:
+            web_user_importer.update_locations(location_codes, membership, self.domain_info)
+        web_user_importer.update_role(role_qualified_id)
+        try:
+            current_user.save()
+        except ResourceConflict:
+            notify_exception(None, message="ResouceConflict during web user import",
+                             details={'domain': self.domain, 'username': current_user.username})
+            if max_tries > 0:
+                current_user.clear_quickcache_for_user()
+                updated_user = CouchUser.get_by_username(current_user.username, strict=True)
+                self._modify_existing_user_in_domain(
+                    membership, role_qualified_id,
+                    updated_user, web_user_importer, max_tries=max_tries - 1)
+            else:
+                raise
+
+    def process_new_user(self):
+        cv = self.column_values
 
-        if remove:
-            remove_invited_web_user(self.domain, username)
+        if cv['remove']:
+            remove_invited_web_user(self.domain, cv['username'])
             self.status_row['flag'] = 'updated'
         else:
-            if status == "Invited":
-                self.check_invitation_status(self.domain, username)
+            if cv['status'] == "Invited":
+                self.check_invitation_status(self.domain, cv['username'])
 
             user_invite_loc_id = None
-            if self.domain_info.can_assign_locations and location_codes:
-                if len(location_codes) > 0:
+            if self.domain_info.can_assign_locations and cv['location_codes']:
+                if len(cv['location_codes']) > 0:
                     user_invite_loc = get_location_from_site_code(
-                        location_codes[0], self.domain_info.location_cache
+                        cv['location_codes'][0], self.domain_info.location_cache
                     )
                     user_invite_loc_id = user_invite_loc.location_id
 
             create_or_update_web_user_invite(
-                username, self.domain, self.domain_info.roles_by_name[role], self.importer.upload_user,
+                cv['username'], self.domain, self.domain_info.roles_by_name[cv['role']], self.importer.upload_user,
                 user_invite_loc_id
             )
             self.status_row['flag'] = 'invited'
@@ -927,26 +950,6 @@ def create_or_update_web_users(upload_domain, user_specs, upload_user, upload_re
     ).run()
 
 
-def modify_existing_user_in_domain(upload_domain, domain, domain_info, location_codes, membership,
-                                   role_qualified_id, upload_user, current_user, web_user_importer,
-                                   max_tries=3):
-    if domain_info.can_assign_locations and location_codes is not None:
-        web_user_importer.update_locations(location_codes, membership, domain_info)
-    web_user_importer.update_role(role_qualified_id)
-    try:
-        current_user.save()
-    except ResourceConflict:
-        notify_exception(None, message="ResouceConflict during web user import",
-                         details={'domain': domain, 'username': current_user.username})
-        if max_tries > 0:
-            current_user.clear_quickcache_for_user()
-            updated_user = CouchUser.get_by_username(current_user.username, strict=True)
-            modify_existing_user_in_domain(domain, domain_info, location_codes, membership, role_qualified_id,
-                                           upload_user, updated_user, web_user_importer, max_tries=max_tries - 1)
-        else:
-            raise
-
-
 def check_user_role(username, role):
     if not role:
         raise UserUploadError(_(

From de266b400e7677ee001dfac368c08d1aecd4c8a9 Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Sat, 30 Dec 2023 08:12:15 +0530
Subject: [PATCH 018/118] Support web user data update via bulk upload

---
 corehq/apps/user_importer/helpers.py          |  35 +-
 corehq/apps/user_importer/importer.py         |  26 +-
 .../apps/user_importer/tests/test_importer.py | 597 ++++++++++--------
 corehq/apps/user_importer/validation.py       |   4 +-
 4 files changed, 376 insertions(+), 286 deletions(-)

diff --git a/corehq/apps/user_importer/helpers.py b/corehq/apps/user_importer/helpers.py
index e75ade0bca6f..838988760dee 100644
--- a/corehq/apps/user_importer/helpers.py
+++ b/corehq/apps/user_importer/helpers.py
@@ -153,6 +153,23 @@ def update_role(self, role_qualified_id):
         if self.role_updated:
             self.user.set_role(self.user_domain, role_qualified_id)
 
+    def update_user_data(self, data, uncategorized_data, profile_name, profiles_by_name):
+        from corehq.apps.users.user_data import UserDataError
+        user_data = self.user.get_user_data(self.user_domain)
+        old_profile_id = user_data.profile_id
+        if PROFILE_SLUG in data:
+            raise UserUploadError(_("You cannot set {} directly").format(PROFILE_SLUG))
+        if profile_name:
+            profile_id = profiles_by_name[profile_name].pk
+
+        try:
+            user_data.update(data, profile_id=profile_id if profile_name else ...)
+            user_data.update(uncategorized_data)
+        except UserDataError as e:
+            raise UserUploadError(str(e))
+        if user_data.profile_id and user_data.profile_id != old_profile_id:
+            self.logger.add_info(UserChangeMessage.profile_info(user_data.profile_id, profile_name))
+
     def save_log(self):
         # Tracking for role is done post save to have role setup correctly on save
         if self.role_updated:
@@ -188,24 +205,6 @@ def update_name(self, name):
         self.user.set_full_name(str(name))
         self.logger.add_changes({'first_name': self.user.first_name, 'last_name': self.user.last_name})
 
-    def update_user_data(self, data, uncategorized_data, profile_name, profiles_by_name):
-        from corehq.apps.users.user_data import UserDataError
-        user_data = self.user.get_user_data(self.user_domain)
-        old_profile_id = user_data.profile_id
-        if PROFILE_SLUG in data:
-            raise UserUploadError(_("You cannot set {} directly").format(PROFILE_SLUG))
-        if profile_name:
-            profile_id = profiles_by_name[profile_name].pk
-
-        try:
-            user_data.update(data, profile_id=profile_id if profile_name else ...)
-            user_data.update(uncategorized_data)
-        except UserDataError as e:
-            raise UserUploadError(str(e))
-
-        if user_data.profile_id and user_data.profile_id != old_profile_id:
-            self.logger.add_info(UserChangeMessage.profile_info(user_data.profile_id, profile_name))
-
     def update_language(self, language):
         self.user.language = language
         self.logger.add_changes({'language': language})
diff --git a/corehq/apps/user_importer/importer.py b/corehq/apps/user_importer/importer.py
index c7105ae8b4b2..f2fc62fbc5e3 100644
--- a/corehq/apps/user_importer/importer.py
+++ b/corehq/apps/user_importer/importer.py
@@ -673,7 +673,10 @@ def _process_column_values(self):
             'role': self.row.get('role'),
             'status': self.row.get('status'),
             'location_codes': format_location_codes(self.row.get('location_code', [])),
-            'remove': spec_value_to_boolean_or_none(self.row, 'remove')
+            'remove': spec_value_to_boolean_or_none(self.row, 'remove'),
+            "data": self.row.get('data', {}),
+            "uncategorized_data": self.row.get('uncategorized_data', {}),
+            "profile_name": self.row.get('user_profile', None),
         }
 
     def process(self):
@@ -686,7 +689,6 @@ def process(self):
 
     def process_row(self):
         user = CouchUser.get_by_username(self.column_values['username'], strict=True)
-
         if user:
             self.process_existing_user(user)
         else:
@@ -725,10 +727,22 @@ def process_existing_user(self, user):
     def _modify_existing_user_in_domain(self, membership, role_qualified_id,
                                        current_user, web_user_importer,
                                        max_tries=3):
-        location_codes = self.column_values['location_codes']
+        cv = self.column_values
+        # set locations
+        location_codes = cv['location_codes']
         if self.domain_info.can_assign_locations and location_codes is not None:
             web_user_importer.update_locations(location_codes, membership, self.domain_info)
+
+        # set role
         web_user_importer.update_role(role_qualified_id)
+
+        # set user_data
+        web_user_importer.update_user_data(
+            cv["data"], cv["uncategorized_data"], cv["profile_name"],
+            self.domain_info.profiles_by_name
+        )
+
+        # Try saving
         try:
             current_user.save()
         except ResourceConflict:
@@ -881,8 +895,6 @@ def location_cache(self):
     @memoized
     def profiles_by_name(self):
         from corehq.apps.users.views.mobile.custom_data_fields import UserFieldsView
-        if self.is_web_upload:
-            return {}
         definition = CustomDataFieldsDefinition.get(self.domain, UserFieldsView.field_type)
         if definition:
             profiles = definition.get_profiles()
@@ -903,17 +915,15 @@ def validators(self):
         ]
         if self.is_web_upload:
             allowed_group_names = None
-            profiles = None
         else:
             allowed_group_names = [group.name for group in self.group_memoizer.groups]
-            profiles = self.profiles_by_name
         return get_user_import_validators(
             self.domain_obj,
             domain_user_specs,
             self.is_web_upload,
             allowed_group_names,
             allowed_roles=roles_by_name,
-            profiles_by_name=profiles,
+            profiles_by_name=self.profiles_by_name,
             upload_domain=self.importer.upload_domain,
         )
 
diff --git a/corehq/apps/user_importer/tests/test_importer.py b/corehq/apps/user_importer/tests/test_importer.py
index 4d0d90ae3fe4..78de5f76f30c 100644
--- a/corehq/apps/user_importer/tests/test_importer.py
+++ b/corehq/apps/user_importer/tests/test_importer.py
@@ -58,7 +58,286 @@
 from dimagi.utils.dates import add_months_to_date
 
 
-class TestMobileUserBulkUpload(TestCase, DomainSubscriptionMixin):
+class TestUserDataMixin:
+
+    @classmethod
+    def setup_userdata(cls):
+
+        cls.definition = CustomDataFieldsDefinition(domain=cls.domain_name,
+                                                    field_type=UserFieldsView.field_type)
+        cls.definition.save()
+        cls.definition.set_fields([
+            Field(
+                slug='key',
+                is_required=False,
+                label='Key',
+                regex='^[A-G]',
+                regex_msg='Starts with A-G',
+            ),
+            Field(
+                slug='mode',
+                is_required=False,
+                label='Mode',
+                choices=['major', 'minor']
+            ),
+        ])
+        cls.definition.save()
+        cls.profile = CustomDataFieldsProfile(
+            name='melancholy',
+            fields={'mode': 'minor'},
+            definition=cls.definition,
+        )
+        cls.profile.save()
+
+    @classmethod
+    def tear_down_user_data(cls):
+        cls.definition.delete()
+
+    def setup_locations(self):
+        self.loc1 = make_loc('loc1', type='state', domain=self.domain_name)
+        self.loc2 = make_loc('loc2', type='state', domain=self.domain_name)
+
+    def assert_user_data_equals(self, expected):
+        self.assertEqual(self.user.get_user_data(self.domain.name).to_dict(), expected)
+
+    def _test_user_data(self, is_web_upload=False):
+        # Set user_data
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'key': 'F#'})],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': 'F#', 'commcare_profile': ''})
+
+        # Update user_data
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'key': 'Bb'}, user_id=self.user._id)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': 'Bb', 'commcare_profile': ''})
+
+        # set user data to blank
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'key': ''}, user_id=self.user._id)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': '', 'commcare_profile': ''})
+
+        # Allow falsy but non-blank values
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'key': 0}, user_id=self.user._id)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': 0, 'commcare_profile': ''})
+
+    def _test_user_data_profile(self, is_web_upload=False):
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'key': 'F#'}, user_profile=self.profile.name)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+
+        self.assert_user_data_equals({
+            'commcare_project': 'mydomain',
+            'key': 'F#',
+            'mode': 'minor',
+            PROFILE_SLUG: self.profile.id,
+        })
+        user_history = UserHistory.objects.get(user_id=self.user.get_id, changed_by=self.uploading_user.get_id,
+                                               # web users are setup first and then updated
+                                               action=UserModelAction.UPDATE.value if is_web_upload else UserModelAction.CREATE.value)
+        change_messages = UserChangeMessage.profile_info(self.profile.id, self.profile.name)
+        self.assertDictEqual(user_history.change_messages['profile'], change_messages['profile'])
+
+    def _test_user_data_profile_redundant(self, is_web_upload=False):
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'mode': 'minor'}, user_profile=self.profile.name)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({
+            'commcare_project': 'mydomain',
+            'mode': 'minor',
+            PROFILE_SLUG: self.profile.id,
+        })
+        # Profile fields shouldn't actually be added to user_data
+        self.assertEqual(self.user.get_user_data(self.domain.name).raw, {})
+
+    def _test_user_data_profile_blank(self, is_web_upload=False):
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'mode': ''}, user_profile=self.profile.name)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({
+            'commcare_project': 'mydomain',
+            'mode': 'minor',
+            PROFILE_SLUG: self.profile.id,
+        })
+
+    def _test_required_field_optional_if_profile_set(self, is_web_upload=False):
+        required_field = [f for f in self.definition.get_fields() if f.slug == 'mode'][0]
+        required_field.is_required = True
+        required_field.save()
+        import_users_and_groups(
+            self.domain.name,
+            # mode is marked as is_required but provided via profile
+            [self._get_spec(user_profile=self.profile.name)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({
+            'commcare_project': 'mydomain',
+            'mode': 'minor',
+            PROFILE_SLUG: self.profile.id,
+        })
+        # cleanup
+        required_field.is_required = False
+        required_field.save()
+
+    def _test_user_data_profile_conflict(self, is_web_upload=False):
+        rows = import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'mode': 'major'}, user_profile=self.profile.name)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )['messages']['rows']
+        self.assertEqual(rows[0]['flag'], "'mode' cannot be set directly")
+
+    def _test_profile_cant_overwrite_existing_data(self, is_web_upload=False):
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'mode': 'major'})],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        # This fails because it would silently overwrite the existing "mode"
+        rows = import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(user_id=self.user.get_id, user_profile=self.profile.name)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )['messages']['rows']
+        self.assertEqual(rows[0]['flag'], "Profile conflicts with existing data")
+
+        # This succeeds because it explicitly blanks out "mode"
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(user_id=self.user.get_id, user_profile=self.profile.name, data={'mode': ''})],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({
+            'commcare_project': 'mydomain',
+            'mode': 'minor',
+            PROFILE_SLUG: self.profile.id,
+        })
+
+    def _test_user_data_profile_unknown(self, is_web_upload=False):
+        rows = import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(user_profile="not_a_real_profile")],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )['messages']['rows']
+        self.assertEqual(rows[0]['flag'], "Profile 'not_a_real_profile' does not exist")
+
+    def _test_uncategorized_data(self, is_web_upload=False):
+        # Set data
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(uncategorized_data={'tempo': 'presto'})],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({'commcare_project': 'mydomain', 'tempo': 'presto', 'commcare_profile': ''})
+
+        # Update data
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(uncategorized_data={'tempo': 'andante'}, user_id=self.user._id)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        self.assert_user_data_equals({'commcare_project': 'mydomain', 'tempo': 'andante', 'commcare_profile': ''})
+
+    @patch('corehq.apps.user_importer.importer.domain_has_privilege', lambda x, y: True)
+    def _test_user_data_ignore_system_fields(self, is_web_upload=False):
+        self.setup_locations()
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(data={'key': 'F#'}, location_code=self.loc1.site_code)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        data = {
+            'commcare_project': 'mydomain',
+            'commcare_profile': '',
+            'key': 'F#',
+        }
+        if not is_web_upload:
+            data.update({
+                'commcare_location_id': self.loc1.location_id,
+                'commcare_location_ids': self.loc1.location_id,
+                'commcare_primary_case_sharing_id': self.loc1.location_id,
+            })
+        self.assert_user_data_equals(data)
+
+        import_users_and_groups(
+            self.domain.name,
+            [self._get_spec(user_id=self.user.user_id, data={'key': 'G#'}, location_code=self.loc1.site_code)],
+            [],
+            self.uploading_user.get_id,
+            self.upload_record.pk,
+            is_web_upload
+        )
+        data.update({"key": "G#"})
+        self.assert_user_data_equals(data)
+
+
+class TestMobileUserBulkUpload(TestCase, DomainSubscriptionMixin, TestUserDataMixin):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -102,32 +381,7 @@ def setUpClass(cls):
         cls.upload_record.save()
         cls.patcher = patch('corehq.apps.user_importer.tasks.UserUploadRecord')
         cls.patcher.start()
-
-        cls.definition = CustomDataFieldsDefinition(domain=cls.domain_name,
-                                                    field_type=UserFieldsView.field_type)
-        cls.definition.save()
-        cls.definition.set_fields([
-            Field(
-                slug='key',
-                is_required=False,
-                label='Key',
-                regex='^[A-G]',
-                regex_msg='Starts with A-G',
-            ),
-            Field(
-                slug='mode',
-                is_required=False,
-                label='Mode',
-                choices=['major', 'minor']
-            ),
-        ])
-        cls.definition.save()
-        cls.profile = CustomDataFieldsProfile(
-            name='melancholy',
-            fields={'mode': 'minor'},
-            definition=cls.definition,
-        )
-        cls.profile.save()
+        cls.setup_userdata()
 
     def setUp(self):
         if WebUser.get_by_user_id(self.uploading_user.get_id) is None:
@@ -142,7 +396,7 @@ def tearDownClass(cls):
         cls.other_domain.delete()
         cls.emw_domain.delete()
         cls.patcher.stop()
-        cls.definition.delete()
+        cls.tear_down_user_data()
         super().tearDownClass()
 
     def tearDown(self):
@@ -500,10 +754,6 @@ def test_deactivate_after_updates(self):
         change_messages.update(UserChangeMessage.password_reset())
         self.assertDictEqual(user_history.change_messages, change_messages)
 
-    def setup_locations(self):
-        self.loc1 = make_loc('loc1', type='state', domain=self.domain_name)
-        self.loc2 = make_loc('loc2', type='state', domain=self.domain_name)
-
     def test_numeric_user_name(self):
         """
         Test that bulk upload doesn't choke if the user's name is a number
@@ -533,246 +783,35 @@ def test_empty_user_name(self):
         )
         self.assertEqual(self.user.full_name, "")
 
-    def assert_user_data_equals(self, expected):
-        self.assertEqual(self.user.get_user_data(self.domain.name).to_dict(), expected)
-
     def test_user_data(self):
-        # Set user_data
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'key': 'F#'})],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': 'F#', 'commcare_profile': ''})
-
-        # Update user_data
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'key': 'Bb'}, user_id=self.user._id)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': 'Bb', 'commcare_profile': ''})
-
-        # set user data to blank
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'key': ''}, user_id=self.user._id)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': '', 'commcare_profile': ''})
-
-        # Allow falsy but non-blank values
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'key': 0}, user_id=self.user._id)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({'commcare_project': 'mydomain', 'key': 0, 'commcare_profile': ''})
-
-    def test_uncategorized_data(self):
-        # Set data
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(uncategorized_data={'tempo': 'presto'})],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({'commcare_project': 'mydomain', 'tempo': 'presto', 'commcare_profile': ''})
-
-        # Update data
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(uncategorized_data={'tempo': 'andante'}, user_id=self.user._id)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({'commcare_project': 'mydomain', 'tempo': 'andante', 'commcare_profile': ''})
-
-    @patch('corehq.apps.user_importer.importer.domain_has_privilege', lambda x, y: True)
-    def test_user_data_ignore_system_fields(self):
-        self.setup_locations()
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'key': 'F#'}, location_code=self.loc1.site_code)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({
-            'commcare_project': 'mydomain',
-            'commcare_profile': '',
-            'commcare_location_id': self.loc1.location_id,
-            'commcare_location_ids': self.loc1.location_id,
-            'commcare_primary_case_sharing_id': self.loc1.location_id,
-            'key': 'F#',
-        })
-
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(user_id=self.user.user_id, data={'key': 'G#'}, location_code=self.loc1.site_code)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({
-            'commcare_project': 'mydomain',
-            'commcare_profile': '',
-            'key': 'G#',
-            'commcare_location_id': self.loc1.location_id,
-            'commcare_location_ids': self.loc1.location_id,
-            'commcare_primary_case_sharing_id': self.loc1.location_id,
-        })
+        self._test_user_data(is_web_upload=False)
 
     def test_user_data_profile(self):
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'key': 'F#'}, user_profile=self.profile.name)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-
-        self.assert_user_data_equals({
-            'commcare_project': 'mydomain',
-            'key': 'F#',
-            'mode': 'minor',
-            PROFILE_SLUG: self.profile.id,
-        })
-
-        user_history = UserHistory.objects.get(user_id=self.user.get_id, changed_by=self.uploading_user.get_id,
-                                               action=UserModelAction.CREATE.value)
-        change_messages = UserChangeMessage.profile_info(self.profile.id, self.profile.name)
-        self.assertDictEqual(user_history.change_messages, change_messages)
+        self._test_user_data_profile(is_web_upload=False)
 
     def test_user_data_profile_redundant(self):
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'mode': 'minor'}, user_profile=self.profile.name)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({
-            'commcare_project': 'mydomain',
-            'mode': 'minor',
-            PROFILE_SLUG: self.profile.id,
-        })
-        # Profile fields shouldn't actually be added to user_data
-        self.assertEqual(self.user.get_user_data(self.domain.name).raw, {})
+        self._test_user_data_profile_redundant(is_web_upload=False)
 
     def test_user_data_profile_blank(self):
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'mode': ''}, user_profile=self.profile.name)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({
-            'commcare_project': 'mydomain',
-            'mode': 'minor',
-            PROFILE_SLUG: self.profile.id,
-        })
+        self._test_user_data_profile_blank(is_web_upload=False)
 
     def test_required_field_optional_if_profile_set(self):
-        required_field = [f for f in self.definition.get_fields() if f.slug == 'mode'][0]
-        required_field.is_required = True
-        required_field.save()
-        import_users_and_groups(
-            self.domain.name,
-            # mode is marked as is_required but provided via profile
-            [self._get_spec(user_profile=self.profile.name)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({
-            'commcare_project': 'mydomain',
-            'mode': 'minor',
-            PROFILE_SLUG: self.profile.id,
-        })
-        # cleanup
-        required_field.is_required = False
-        required_field.save()
+        self._test_required_field_optional_if_profile_set(is_web_upload=False)
 
     def test_user_data_profile_conflict(self):
-        rows = import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'mode': 'major'}, user_profile=self.profile.name)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )['messages']['rows']
-        self.assertEqual(rows[0]['flag'], "'mode' cannot be set directly")
+        self._test_user_data_profile_conflict(is_web_upload=False)
 
     def test_profile_cant_overwrite_existing_data(self):
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(data={'mode': 'major'})],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        # This fails because it would silently overwrite the existing "mode"
-        rows = import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(user_id=self.user.get_id, user_profile=self.profile.name)],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )['messages']['rows']
-        self.assertEqual(rows[0]['flag'], "Profile conflicts with existing data")
-
-        # This succeeds because it explicitly blanks out "mode"
-        import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(user_id=self.user.get_id, user_profile=self.profile.name, data={'mode': ''})],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )
-        self.assert_user_data_equals({
-            'commcare_project': 'mydomain',
-            'mode': 'minor',
-            PROFILE_SLUG: self.profile.id,
-        })
+        self._test_profile_cant_overwrite_existing_data(is_web_upload=False)
 
     def test_user_data_profile_unknown(self):
-        rows = import_users_and_groups(
-            self.domain.name,
-            [self._get_spec(user_profile="not_a_real_profile")],
-            [],
-            self.uploading_user.get_id,
-            self.upload_record.pk,
-            False
-        )['messages']['rows']
-        self.assertEqual(rows[0]['flag'], "Profile 'not_a_real_profile' does not exist")
+        self._test_user_data_profile_unknown(is_web_upload=False)
+
+    def test_uncategorized_data(self):
+        self._test_uncategorized_data(is_web_upload=False)
+
+    def test_user_data_ignore_system_fields(self):
+        self._test_user_data_ignore_system_fields(is_web_upload=False)
 
     def test_upper_case_email(self):
         """
@@ -1617,7 +1656,7 @@ def test_user_upload_record(self):
         self.assertEqual(rows['messages'], upload_record.result)
 
 
-class TestWebUserBulkUpload(TestCase, DomainSubscriptionMixin):
+class TestWebUserBulkUpload(TestCase, DomainSubscriptionMixin, TestUserDataMixin):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -1637,6 +1676,7 @@ def setUpClass(cls):
             user_id=1,
         )
         cls.upload_record.save()
+        cls.setup_userdata()
 
     @classmethod
     def tearDownClass(cls):
@@ -1644,6 +1684,7 @@ def tearDownClass(cls):
         cls.domain.delete()
         cls.other_domain.delete()
         cls.patcher.stop()
+        cls.tear_down_user_data()
         super().tearDownClass()
 
     def tearDown(self):
@@ -1767,6 +1808,46 @@ def test_upper_case_email(self):
         user_history = UserHistory.objects.get()
         self.assertNotIn('email', user_history.changes)
 
+    def test_user_data(self):
+        self.setup_users()
+        self._test_user_data(is_web_upload=True)
+
+    def test_user_data_profile(self):
+        self.setup_users()
+        self._test_user_data_profile(is_web_upload=True)
+
+    def test_user_data_profile_redundant(self):
+        self.setup_users()
+        self._test_user_data_profile_redundant(is_web_upload=True)
+
+    def test_user_data_profile_blank(self):
+        self.setup_users()
+        self._test_user_data_profile_blank(is_web_upload=True)
+
+    def test_required_field_optional_if_profile_set(self):
+        self.setup_users()
+        self._test_required_field_optional_if_profile_set(is_web_upload=True)
+
+    def test_user_data_profile_conflict(self):
+        self.setup_users()
+        self._test_user_data_profile_conflict(is_web_upload=True)
+
+    def test_profile_cant_overwrite_existing_data(self):
+        self.setup_users()
+        self._test_profile_cant_overwrite_existing_data(is_web_upload=True)
+
+    def test_user_data_profile_unknown(self):
+        self.setup_users()
+        self._test_user_data_profile_unknown(is_web_upload=True)
+
+    def test_uncategorized_data(self):
+        self.setup_users()
+        self._test_uncategorized_data(is_web_upload=True)
+
+    def test_user_data_ignore_system_fields(self):
+        self.setup_users()
+        self._test_user_data_ignore_system_fields(is_web_upload=True)
+
     def test_set_role(self):
         self.setup_users()
         import_users_and_groups(
diff --git a/corehq/apps/user_importer/validation.py b/corehq/apps/user_importer/validation.py
index 703f6171c448..f71ed6ac8130 100644
--- a/corehq/apps/user_importer/validation.py
+++ b/corehq/apps/user_importer/validation.py
@@ -35,7 +35,8 @@ def get_user_import_validators(domain_obj, all_specs, is_web_user_import, allowe
         EmailValidator(domain, 'email'),
         RoleValidator(domain, allowed_roles),
         ExistingUserValidator(domain, all_specs),
-        TargetDomainValidator(upload_domain)
+        TargetDomainValidator(upload_domain),
+        ProfileValidator(domain, list(profiles_by_name)),
     ]
     if is_web_user_import:
         return validators + [RequiredWebFieldsValidator(domain), DuplicateValidator(domain, 'email', all_specs),
@@ -52,7 +53,6 @@ def get_user_import_validators(domain_obj, all_specs, is_web_user_import, allowe
             NewUserPasswordValidator(domain),
             PasswordValidator(domain) if validate_passwords else noop,
             GroupValidator(domain, allowed_groups),
-            ProfileValidator(domain, list(profiles_by_name)),
             ConfirmationSmsValidator(domain)
         ]
 

From fe90db580ebabe980ed5980e47383f6fa45cff22 Mon Sep 17 00:00:00 2001
From: AddisonDunn <dunnaddisonw@gmail.com>
Date: Tue, 2 Jan 2024 15:32:58 -0500
Subject: [PATCH 019/118] adjust breadcrumbs offset width to account for new
 'home' text

---
 .../apps/cloudcare/static/cloudcare/js/formplayer/constants.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
index 111c83ad3c50..53ba6189c9ac 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
@@ -32,7 +32,7 @@ hqDefine("cloudcare/js/formplayer/constants", function () {
         SMALL_SCREEN_WIDTH_PX: 992,
 
         BREADCRUMB_HEIGHT_PX: 46.125,
-        BREADCRUMB_WIDTH_OFFSET_PX: 106.5, // unavailable breadcrumb space i.e. padding, home and hamburger icons
+        BREADCRUMB_WIDTH_OFFSET_PX: 120.41, // unavailable breadcrumb space i.e. padding, home and hamburger icons
 
         COLLAPSIBLE_TILE_MAX_HEIGHT: 150,
     };

From dbab40c2c0c15313bc355da9910ac8ee96dcb24d Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 3 Jan 2024 11:09:58 +0530
Subject: [PATCH 020/118] Make isRepetition check for parent.parent in Group

---
 .../apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js  | 4 +---
 .../static/cloudcare/js/form_entry/spec/form_ui_spec.js       | 2 +-
 .../static/cloudcare/js/form_entry/spec/utils_spec.js         | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index dbd0ae4b7d69..4c0f9427c6c9 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -590,7 +590,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
 
         self.groupId = groupNum++;
         self.rel_ix = ko.observable(relativeIndex(self.ix()));
-        self.isRepetition = parent instanceof Repeat;
+        self.isRepetition = parent.parent instanceof Repeat;
         let parentForm = getParentForm(self);
         let oneQuestionPerScreen = parentForm.displayOptions.oneQuestionPerScreen !== undefined && parentForm.displayOptions.oneQuestionPerScreen();
 
@@ -725,8 +725,6 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         self.parent = parent;
         Container.call(self, json);
 
-        self.isRepetition = parent instanceof Repeat;
-
         self.hasAnyNestedQuestions = function () {
             return _.any(self.children(), function (d) {
                 if (d.type() === constants.QUESTION_TYPE) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
index ac6beba620de..25764f709d89 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
@@ -75,7 +75,7 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             assert.equal(form.children()[0].children().length, 1);
             assert.equal(form.children()[0].children()[0].type(), constants.GROUPED_ELEMENT_TILE_ROW_TYPE);
             assert.equal(form.children()[0].children()[0].children()[0].type(), constants.GROUP_TYPE);
-            assert.isTrue(form.children()[0].children()[0].isRepetition);
+            assert.isTrue(form.children()[0].children()[0].children()[0].isRepetition);
             assert.equal(form.children()[0].children()[0].children()[0].children()[0].type(), constants.GROUPED_ELEMENT_TILE_ROW_TYPE);
             assert.equal(form.children()[0].children()[0].children()[0].children()[0].children()[0].type(), constants.QUESTION_TYPE);
         });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
index 9cd3d51b5bd3..e4e643030ea7 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
@@ -35,7 +35,7 @@ hqDefine("cloudcare/js/form_entry/spec/utils_spec", function () {
                 textInGroup = fixtures.textJSON({ix: "1,0"}),
                 group = fixtures.groupJSON({ix: "1", children: [textInGroup]}),
                 textInRepeat = fixtures.textJSON({ix: "2_0,0"}),
-                groupInRepeat = fixtures.groupJSON({ix: "2_0", children: [textInRepeat], caption: null}),
+                groupInRepeat = fixtures.groupJSON({ix: "2_0", children: [textInRepeat]}),
                 repeat = fixtures.repeatJSON({ix: "2", children: [groupInRepeat]}),
                 form = formUI.Form({
                     tree: [text, group, repeat],

From 17693864e29fabcaeb75052c839361d3299f9194 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 3 Jan 2024 11:23:13 +0530
Subject: [PATCH 021/118] Update doc to represent new structure of Group

---
 .../static/cloudcare/js/form_entry/form_ui.js          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 4c0f9427c6c9..2f1829bf94c8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -275,11 +275,12 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
      *
      * This function takes a JSON object as input and searches for sequential "question" or "group"
      * items within the 'children' arrays of the input and its nested 'group' objects.
-     * It groups these sequential "question" items into "GroupedElementTileRow" and "group"
-     * items into "GroupedGroupTileRow" objects while maintaining the original structure of the JSON.
+     * It groups the sequential "question" items and "group"
+     * items into "GroupedElementTileRow" objects while maintaining the original structure of the JSON.
      *
      * @param {Object} json - The JSON object to process, containing 'children' arrays.
-     * @returns {Object} - A new JSON object with sequential "question" items grouped into "GroupedElementTileRow".
+     * @returns {Object} - A new JSON object with sequential "question" items and sequential
+     * "group" items grouped into "GroupedElementTileRow".
      */
     Container.groupElements = function (json) {
         if (!json || !json.children || !Array.isArray(json.children)) {
@@ -684,7 +685,8 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     Group.prototype.constructor = Container;
 
     /**
-     * Represents a repeat group. A repeat only has Group objects as children. Each child Group contains GroupedElementTileRow
+     * Represents a repeat group. A repeat only has Group objects as children, which are contained
+     * within a GroupedElementTileRow. Each child Group contains GroupedElementTileRow
      * objects which contains the child questions to be rendered
      * @param {Object} json - The JSON returned from touchforms to represent a Form
      * @param {Object} parent - The object's parent. Either a Form, Group, or Repeat.

From d675701c65a8544d4311a85ebcfe775812f483df Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 3 Jan 2024 13:58:39 +0530
Subject: [PATCH 022/118] Adjust stripe-repeats appearance attribute for
 group-per-row compatibility

---
 .../cloudcare/templates/form_entry/templates.html  | 14 +++++++++++---
 .../cloudcare/less/formplayer-webapp/form.less     |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/form_entry/templates.html b/corehq/apps/cloudcare/templates/form_entry/templates.html
index 24e3084bd0e4..539c63a826f4 100644
--- a/corehq/apps/cloudcare/templates/form_entry/templates.html
+++ b/corehq/apps/cloudcare/templates/form_entry/templates.html
@@ -11,7 +11,6 @@
           'panel panel-default': collapsible,
           'repetition': isRepetition,
           'required-group': !showChildren() && childrenRequired(),
-          'stripe-repeats': stripeRepeats,
         }">
     <fieldset class="gr-header" data-bind="
         css: {
@@ -63,8 +62,17 @@
       <div data-bind="visible: showChildren">
         <fieldset>
         <legend aria-hidden="true" class="sr-only">{% trans "Question Group" %}</legend>
-          <div class="children" data-bind="slideVisible: showChildren(), template: { name: childTemplate, foreach: $data.children,
-            afterRender: focusNewRepeat }, css: {'panel-body': collapsible}"/>
+          <div class="children" data-bind="
+              slideVisible: showChildren(),
+              template: {
+                name: childTemplate,
+                foreach: $data.children,
+                afterRender: focusNewRepeat,
+              },
+              css: {
+                'panel-body': collapsible,
+                'stripe-repeats': stripeRepeats,
+              }"></div>
         </fieldset>
       </div>
   </div>
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
index bb5d21972411..33873558448b 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
@@ -67,7 +67,7 @@
   }
 
   .stripe-repeats {
-    .gr {
+    > .row, .panel-body > .children > .row {
       &:nth-of-type(odd) {
         background-color: @table-bg-accent;
       }

From 26253d8be5cb9f05c3a170745cd114834bab7680 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Tue, 9 Jan 2024 00:10:07 +0530
Subject: [PATCH 023/118] Fix for spacing issue in collpasible groups

---
 .../static/cloudcare/less/formplayer-webapp/form.less      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
index f27f1bfc1033..94a63cc6672f 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
@@ -196,6 +196,8 @@
 
 .question-tile-row:has(div.q) {
   margin-bottom: 15px;
+  margin-left: 20px;
+  margin-right: 20px;
 }
 
 .question-tile-row {
@@ -208,3 +210,8 @@
     margin-bottom: 0px !important;
   }
 }
+
+div[class*="gr"][class*="col-sm-"][class*="panel"][class*="panel-default"] {
+    padding-right: 0px !important;
+    padding-left: 0px !important;
+}

From 22c152e7d701ff9c3c4aa94c0a58a62154771463 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Tue, 9 Jan 2024 00:17:09 +0530
Subject: [PATCH 024/118] Method doc updates

---
 .../static/cloudcare/js/form_entry/form_ui.js    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index de4334cf8741..2cdc8561a365 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -271,16 +271,16 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     };
 
     /**
-     * Recursively groups sequential "question" or "group" items in a nested JSON structure.
+     * Recursively groups sequential "Question" or "Group" items in a nested JSON structure.
      *
-     * This function takes a JSON object as input and searches for sequential "question" or "group"
-     * items within the 'children' arrays of the input and its nested 'group' objects.
-     * It groups the sequential "question" items and "group"
+     * This function takes a JSON object as input and searches for sequential "Question" or "Group"
+     * items within the 'children' arrays of the input and its nested "Group" objects.
+     * It groups the sequential "Question" items and "Group"
      * items into "GroupedElementTileRow" objects while maintaining the original structure of the JSON.
      *
      * @param {Object} json - The JSON object to process, containing 'children' arrays.
-     * @returns {Object} - A new JSON object with sequential "question" items and sequential
-     * "group" items grouped into "GroupedElementTileRow".
+     * @returns {Object} - A new JSON object with sequential "Question" items and sequential
+     * "Group" items grouped into "GroupedElementTileRow".
      */
     Container.groupElements = function (json) {
         if (!json || !json.children || !Array.isArray(json.children)) {
@@ -579,7 +579,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     Form.prototype.constructor = Container;
 
     /**
-     * Represents a group of GroupedElementTileRow which contains questions.
+     * Represents a group of GroupedElementTileRow which contains Question or Group objects.
      * @param {Object} json - The JSON returned from touchforms to represent a Form
      * @param {Object} parent - The object's parent. Either a Form, Group, or Repeat.
      */
@@ -716,7 +716,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
     Repeat.prototype.constructor = Container;
 
     /**
-     * Represents a group of questions. Questions are grouped such that all questions are
+     * Represents a group of Questions. Questions are grouped such that all questions are
      * contained in the same row.
      * @param {Object} json - The JSON returned from touchforms to represent a Form
      * @param {Object} parent - The object's parent. Either a Form, Group, or Repeat.

From 1f84da936332d6fe1ff5675cd4fa65007e04db63 Mon Sep 17 00:00:00 2001
From: Akash Jain <akjain@dimagi.com>
Date: Tue, 9 Jan 2024 16:01:00 +0530
Subject: [PATCH 025/118] Remove left and right margin from question-tile-row

---
 .../hqwebapp/static/cloudcare/less/formplayer-webapp/form.less  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
index 94a63cc6672f..4215c3c611c6 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
@@ -196,8 +196,6 @@
 
 .question-tile-row:has(div.q) {
   margin-bottom: 15px;
-  margin-left: 20px;
-  margin-right: 20px;
 }
 
 .question-tile-row {

From bdf7c147aaa56413e1464217f8b0fd84efb4b217 Mon Sep 17 00:00:00 2001
From: Akash Jain <akjain@dimagi.com>
Date: Tue, 9 Jan 2024 16:57:40 +0530
Subject: [PATCH 026/118] Add left and right margins to question-tile-row

---
 .../hqwebapp/static/cloudcare/less/formplayer-webapp/form.less  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
index 4215c3c611c6..3505f08a2229 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
@@ -201,6 +201,8 @@
 .question-tile-row {
   display: flex;
   align-items: center;
+  margin-left: 10px;
+  margin-right: 10px;
   * .form-group, * p, * .control-label {
     padding-top: 0px !important;
     padding-bottom: 0px !important;

From a316cf3da139e53cb4b2666ec3cf435644efd6de Mon Sep 17 00:00:00 2001
From: Jing Cheng <jcheng@dimagi.com>
Date: Thu, 11 Jan 2024 19:02:03 +0800
Subject: [PATCH 027/118] Use a simple mobile worker query

---
 corehq/apps/enterprise/enterprise.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/enterprise/enterprise.py b/corehq/apps/enterprise/enterprise.py
index 5418fe984268..bc8c17948781 100644
--- a/corehq/apps/enterprise/enterprise.py
+++ b/corehq/apps/enterprise/enterprise.py
@@ -17,8 +17,6 @@
 from corehq.apps.domain.models import Domain
 from corehq.apps.es import forms as form_es
 from corehq.apps.export.dbaccessors import ODataExportFetcher
-from corehq.apps.reports.filters.users import \
-    ExpandedMobileWorkerFilter as EMWF
 from corehq.apps.users.dbaccessors import (
     get_all_user_rows,
     get_mobile_user_count,
@@ -26,6 +24,7 @@
 )
 from corehq.apps.users.models import CouchUser, Invitation
 from corehq.util.quickcache import quickcache
+from corehq.apps.es.users import UserES
 
 
 class EnterpriseReport:
@@ -224,10 +223,9 @@ def _query(self, domain_name):
         time_filter = form_es.submitted
         datespan = DateSpan(datetime.now() - timedelta(days=self.window), datetime.utcnow())
 
-        users_filter = form_es.user_id(EMWF.user_es_query(domain_name,
-                                       ['t__0'],  # All mobile workers
-                                       self.couch_user)
-                        .values_list('_id', flat=True))
+        users_filter = form_es.user_id(UserES().domain(domain_name).mobile_users().show_inactive()
+                                    .values_list('_id', flat=True))
+
         query = (form_es.FormES()
                  .domain(domain_name)
                  .filter(time_filter(gte=datespan.startdate,

From 472928798a8a327a0048e22a1dc5b048a922e09a Mon Sep 17 00:00:00 2001
From: Jing Cheng <jcheng@dimagi.com>
Date: Fri, 12 Jan 2024 16:28:04 +0800
Subject: [PATCH 028/118] Import should be alphabetical

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

diff --git a/corehq/apps/enterprise/enterprise.py b/corehq/apps/enterprise/enterprise.py
index bc8c17948781..bc0fbdacfa44 100644
--- a/corehq/apps/enterprise/enterprise.py
+++ b/corehq/apps/enterprise/enterprise.py
@@ -16,6 +16,7 @@
 from corehq.apps.domain.calculations import sms_in_last
 from corehq.apps.domain.models import Domain
 from corehq.apps.es import forms as form_es
+from corehq.apps.es.users import UserES
 from corehq.apps.export.dbaccessors import ODataExportFetcher
 from corehq.apps.users.dbaccessors import (
     get_all_user_rows,
@@ -24,7 +25,6 @@
 )
 from corehq.apps.users.models import CouchUser, Invitation
 from corehq.util.quickcache import quickcache
-from corehq.apps.es.users import UserES
 
 
 class EnterpriseReport:

From e149c4ddc932d51f0b0b1f69068b56e8e9dd8361 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Fri, 12 Jan 2024 15:13:53 -0800
Subject: [PATCH 029/118] feat: adds hq ui for toggling search on clear

---
 .../partials/modules/case_search_properties.html   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html b/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html
index 9bc44dbbe15b..d59ebc4ebf89 100644
--- a/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html
+++ b/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html
@@ -466,11 +466,23 @@ <h4 class="panel-title panel-title-nolink">{% trans "Search and Claim Options" %
             </div>
           </div>
           {% endif %}
+          {% if request|toggle_enabled:'SPLIT_SCREEN_CASE_SEARCH' %}
+          <div class="form-group">
+            <label class="control-label {% css_label_class %}">
+              {% trans "Clearing search terms resets search results" %}
+            </label>
+            <div class="{% css_field_class %} checkbox">
+              <label>
+                <input type="checkbox" data-bind="checked: search_on_clear" />
+              </label>
+            </div>
+          </div>
+          {% endif %}
           <span class="hide" id="searchFilterXpathErrorHtml">
             {% blocktrans %}
               This is not a valid xpath expression. Check to make sure your parentheses match and you are referencing case properties correctly.
             {% endblocktrans %}
-            </span>
+          </span>
         </div>
       </div>
     </div>

From 1ab93d9eec3d445e81934190063e8c94a4752297 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Fri, 12 Jan 2024 15:22:59 -0800
Subject: [PATCH 030/118] feat: subscribe UI checkbox to save

---
 corehq/apps/app_manager/models.py                               | 1 +
 .../app_manager/static/app_manager/js/details/case_claim.js     | 1 +
 corehq/apps/app_manager/views/modules.py                        | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/corehq/apps/app_manager/models.py b/corehq/apps/app_manager/models.py
index dbfd3f0540ed..4d0f4239ad60 100644
--- a/corehq/apps/app_manager/models.py
+++ b/corehq/apps/app_manager/models.py
@@ -2188,6 +2188,7 @@ class CaseSearch(DocumentSchema):
     description = LabelProperty(default={})
     include_all_related_cases = BooleanProperty(default=False)
     dynamic_search = BooleanProperty(default=False)
+    search_on_clear = BooleanProperty(default=False)
 
     # case property referencing another case's ID
     custom_related_case_property = StringProperty(exclude_if_none=True)
diff --git a/corehq/apps/app_manager/static/app_manager/js/details/case_claim.js b/corehq/apps/app_manager/static/app_manager/js/details/case_claim.js
index 66f525e0b762..6d30544c7124 100644
--- a/corehq/apps/app_manager/static/app_manager/js/details/case_claim.js
+++ b/corehq/apps/app_manager/static/app_manager/js/details/case_claim.js
@@ -203,6 +203,7 @@ hqDefine("app_manager/js/details/case_claim", function () {
         'title_label', 'description', 'search_button_display_condition', 'search_label', 'search_filter',
         'additional_relevant', 'data_registry', 'data_registry_workflow', 'additional_registry_cases',
         'custom_related_case_property', 'inline_search', 'instance_name', 'include_all_related_cases',
+        'search_on_clear',
     ];
     var searchConfigModel = function (options, lang, searchFilterObservable, saveButton) {
         hqImport("hqwebapp/js/assert_properties").assertRequired(options, searchConfigKeys);
diff --git a/corehq/apps/app_manager/views/modules.py b/corehq/apps/app_manager/views/modules.py
index 367735163e28..fc67fe01a945 100644
--- a/corehq/apps/app_manager/views/modules.py
+++ b/corehq/apps/app_manager/views/modules.py
@@ -282,6 +282,7 @@ def _get_shared_module_view_context(request, app, module, case_property_builder,
                 'instance_name': module.search_config.instance_name or "",
                 'include_all_related_cases': module.search_config.include_all_related_cases,
                 'dynamic_search': app.split_screen_dynamic_search,
+                'search_on_clear': module.search_config.search_on_clear,
             },
         },
     }
@@ -1392,6 +1393,7 @@ def _check_xpath(xpath, location):
                 instance_name=instance_name,
                 include_all_related_cases=search_properties.get('include_all_related_cases', False),
                 dynamic_search=app.split_screen_dynamic_search and not module.is_auto_select(),
+                search_on_clear=search_properties.get('search_on_clear', False),
             )
 
     resp = {}

From 378dc10543020cb019479574609b44960e6ec88c Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Fri, 12 Jan 2024 18:23:11 -0800
Subject: [PATCH 031/118] refactor: move arguements into kwargs

---
 .../suite_xml/post_process/remote_requests.py | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py b/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
index da8034ea6683..3eb5dd43113a 100644
--- a/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
+++ b/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
@@ -207,19 +207,20 @@ def build_session(self):
         )
 
     def build_remote_request_queries(self):
+        kwargs = {
+            "url": absolute_reverse('app_aware_remote_search', args=[self.app.domain, self.app._id]),
+            "storage_instance": self.storage_instance,
+            "template": 'case',
+            "title": self.build_title() if self.app.enable_case_search_title_translation else None,
+            "description": self.build_description() if self.module.search_config.description != {} else None,
+            "data": self._remote_request_query_datums,
+            "prompts": self.build_query_prompts(),
+            "prompt_groups": self.build_query_prompt_groups(),
+            "default_search": self.module.search_config.default_search,
+            "dynamic_search": self.app.split_screen_dynamic_search and not self.module.is_auto_select()
+        }
         return [
-            RemoteRequestQuery(
-                url=absolute_reverse('app_aware_remote_search', args=[self.app.domain, self.app._id]),
-                storage_instance=self.storage_instance,
-                template='case',
-                title=self.build_title() if self.app.enable_case_search_title_translation else None,
-                description=self.build_description() if self.module.search_config.description != {} else None,
-                data=self._remote_request_query_datums,
-                prompts=self.build_query_prompts(),
-                prompt_groups=self.build_query_prompt_groups(),
-                default_search=self.module.search_config.default_search,
-                dynamic_search=self.app.split_screen_dynamic_search and not self.module.is_auto_select(),
-            )
+            RemoteRequestQuery(**kwargs)
         ]
 
     def build_remote_request_datums(self):

From d52cc65e806b48f7bae9d51b4a4eac3444b315fe Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Fri, 12 Jan 2024 18:34:02 -0800
Subject: [PATCH 032/118] feat: adds attribute to suite

---
 .../apps/app_manager/suite_xml/post_process/remote_requests.py | 3 +++
 corehq/apps/app_manager/suite_xml/xml_models.py                | 1 +
 2 files changed, 4 insertions(+)

diff --git a/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py b/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
index 3eb5dd43113a..98c101613ff3 100644
--- a/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
+++ b/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
@@ -219,6 +219,9 @@ def build_remote_request_queries(self):
             "default_search": self.module.search_config.default_search,
             "dynamic_search": self.app.split_screen_dynamic_search and not self.module.is_auto_select()
         }
+        if self.module.search_config.search_on_clear:
+            kwargs["search_on_clear"] = (self.module.search_config.search_on_clear
+                and not self.module.is_auto_select())
         return [
             RemoteRequestQuery(**kwargs)
         ]
diff --git a/corehq/apps/app_manager/suite_xml/xml_models.py b/corehq/apps/app_manager/suite_xml/xml_models.py
index 0dfe6a511df1..8576a0e73470 100644
--- a/corehq/apps/app_manager/suite_xml/xml_models.py
+++ b/corehq/apps/app_manager/suite_xml/xml_models.py
@@ -593,6 +593,7 @@ class RemoteRequestQuery(OrderedXmlObject, XmlObject):
     prompt_groups = NodeListField('group', QueryPromptGroup)
     default_search = BooleanField("@default_search")
     dynamic_search = BooleanField("@dynamic_search")
+    search_on_clear = BooleanField("@search_on_clear", required=False)
 
     @property
     def id(self):

From 7bd77d94e7232a954308b3c653668e4e13c0d7ec Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 15 Jan 2024 12:33:50 -0500
Subject: [PATCH 033/118] update Detail models

---
 corehq/apps/app_manager/models.py               | 2 ++
 corehq/apps/app_manager/suite_xml/xml_models.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/corehq/apps/app_manager/models.py b/corehq/apps/app_manager/models.py
index dbfd3f0540ed..6c74772f455c 100644
--- a/corehq/apps/app_manager/models.py
+++ b/corehq/apps/app_manager/models.py
@@ -2024,6 +2024,8 @@ class Detail(IndexedSchema, CaseListLookupMixin):
     #Only applies to 'short' details
     no_items_text = LabelProperty(default={'en': 'List is empty.'})
 
+    select_text = LabelProperty(default={'en': 'Continue'})
+
     def get_instance_name(self, module):
         value_is_the_default = self.instance_name == 'casedb'
         if value_is_the_default:
diff --git a/corehq/apps/app_manager/suite_xml/xml_models.py b/corehq/apps/app_manager/suite_xml/xml_models.py
index 0dfe6a511df1..3d98e1432a5b 100644
--- a/corehq/apps/app_manager/suite_xml/xml_models.py
+++ b/corehq/apps/app_manager/suite_xml/xml_models.py
@@ -933,6 +933,7 @@ class Detail(OrderedXmlObject, IdNode):
     fields = NodeListField('field', Field)
     actions = NodeListField('action', Action)
     details = NodeListField('detail', "self")
+    select_text = NodeField('select_text/text', Text)
     _variables = NodeField('variables', DetailVariableList)
     relevant = StringField('@relevant')
     tile_group = NodeField('group', TileGroup)

From 5200d1ceee341030106b030884ae33792def6756 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 15 Jan 2024 12:39:20 -0500
Subject: [PATCH 034/118] add select text id/app strings

---
 corehq/apps/app_manager/app_strings.py | 5 +++++
 corehq/apps/app_manager/id_strings.py  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/corehq/apps/app_manager/app_strings.py b/corehq/apps/app_manager/app_strings.py
index 9ff5a4f3581d..a3bc28c6fa2b 100644
--- a/corehq/apps/app_manager/app_strings.py
+++ b/corehq/apps/app_manager/app_strings.py
@@ -142,6 +142,11 @@ def _create_module_details_app_strings(module, langs):
             clean_trans(module.case_details.short.no_items_text, langs)
         )
 
+    yield (
+        id_strings.select_text_detail(module),
+        clean_trans(module.case_details.short.select_text, langs)
+    )
+
     for detail_type, detail, _ in module.get_details():
         for column in detail.get_columns():
             yield (
diff --git a/corehq/apps/app_manager/id_strings.py b/corehq/apps/app_manager/id_strings.py
index f5299f5dbffe..ab2df6f2c0d4 100644
--- a/corehq/apps/app_manager/id_strings.py
+++ b/corehq/apps/app_manager/id_strings.py
@@ -473,6 +473,11 @@ def no_items_text_detail(module):
     return detail(module, 'no_items_text')
 
 
+@pattern('m%d_select_text')
+def select_text_detail(module):
+    return detail(module, 'select_text')
+
+
 def fixture_detail(module):
     return detail(module, 'fixture_select')
 

From b804d9820d2ba13e9b422cd31b60a3b725dea88c Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 15 Jan 2024 12:43:53 -0500
Subject: [PATCH 035/118] handle upload/download select text

---
 corehq/apps/translations/app_translations/download.py     | 8 ++++++++
 .../apps/translations/app_translations/upload_module.py   | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/corehq/apps/translations/app_translations/download.py b/corehq/apps/translations/app_translations/download.py
index 70a40271208c..db864806d1b4 100644
--- a/corehq/apps/translations/app_translations/download.py
+++ b/corehq/apps/translations/app_translations/download.py
@@ -244,6 +244,7 @@ def get_case_search_rows(langs, module, domain):
 def get_module_detail_rows(langs, module):
     rows = []
     rows += _get_module_detail_no_items_text(langs, module)
+    rows += _get_module_detail_select_text(langs, module)
     for list_or_detail, detail in [
         ("list", module.case_details.short),
         ("detail", module.case_details.long)
@@ -263,6 +264,13 @@ def _get_module_detail_no_items_text(langs, module):
     ]
 
 
+def _get_module_detail_select_text(langs, module):
+    short_detail = module.case_details.short
+    return [
+        ("select_text", "list") + tuple(short_detail.select_text.get(lang, '') for lang in langs)
+    ]
+
+
 def get_module_detail_tabs_rows(langs, detail, list_or_detail):
     return [
         ("Tab {}".format(index), list_or_detail) + tuple(tab.header.get(lang, "") for lang in langs)
diff --git a/corehq/apps/translations/app_translations/upload_module.py b/corehq/apps/translations/app_translations/upload_module.py
index e0821bce0294..0364fc0dc82e 100644
--- a/corehq/apps/translations/app_translations/upload_module.py
+++ b/corehq/apps/translations/app_translations/upload_module.py
@@ -31,6 +31,7 @@ def __init__(self, app, sheet_name, unique_id=None, lang=None):
         self.search_again_label = None
         self.title_label = None
         self.description = None
+        self.select_text = None
         self.tab_headers = None
         self.no_items_text = None
 
@@ -100,6 +101,9 @@ def update(self, rows):
         if self.description:
             self._update_translation(self.description, self.module.search_config.description)
 
+        if self.select_text:
+            self._update_translation(self.select_text, self.module.case_details.short.select_text)
+
         if self.no_items_text:
             self._update_translation(self.no_items_text, self.module.case_details.short.no_items_text)
 
@@ -208,6 +212,7 @@ def _get_condensed_rows(self, rows):
         self.search_again_label = None
         self.title_label = None
         self.description = None
+        self.select_text = None
         self.no_items_text = None
         self.tab_headers = [None for i in self.module.case_details.long.tabs]
         index_of_last_enum_in_condensed = -1
@@ -268,6 +273,8 @@ def _get_condensed_rows(self, rows):
                 self.title_label = row
             elif row['case_property'] == 'description':
                 self.description = row
+            elif row['case_property'] == 'select_text':
+                self.select_text = row
 
             # It's the empty case list text. Don't add it to condensed rows
             elif row['case_property'] == 'no_items_text':

From 95c26b02e4650ac165b4c762515068fd6c01699b Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 15 Jan 2024 12:49:06 -0500
Subject: [PATCH 036/118] update tests

---
 corehq/apps/app_manager/tests/app_factory.py  |  3 +++
 .../tests/test_bulk_app_translation.py        | 23 +++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/app_manager/tests/app_factory.py b/corehq/apps/app_manager/tests/app_factory.py
index 2a81071491d8..c61ddba7802b 100644
--- a/corehq/apps/app_manager/tests/app_factory.py
+++ b/corehq/apps/app_manager/tests/app_factory.py
@@ -234,6 +234,9 @@ def case_claim_app_factory(cls):
         case_module.search_config.description = {
             'en': 'More information',
         }
+        case_module.search_config.select_text = {
+            'en': 'Continue with case',
+        }
         case_module.search_config.properties = [CaseSearchProperty(
             name='name',
             label={'en': 'Name of Mother'}
diff --git a/corehq/apps/translations/tests/test_bulk_app_translation.py b/corehq/apps/translations/tests/test_bulk_app_translation.py
index 384dace77e4d..f6a9b4f441db 100644
--- a/corehq/apps/translations/tests/test_bulk_app_translation.py
+++ b/corehq/apps/translations/tests/test_bulk_app_translation.py
@@ -88,6 +88,7 @@
     ('menu1',
      (('case_list_menu_item_label', 'list', 'Steth List'),
       ('no_items_text', 'list', 'Empty List'),
+      ('select_text', 'list', 'Continue'),
       ('name', 'list', 'Name'),
       ('name', 'detail', 'Name'))),
     ('menu1_form1',
@@ -98,13 +99,18 @@
                          'and "bad" &lt; xml.', '', '', ''),
       ('submit_label', 'Submit', '', '', ''),
       ('submit_notification_label', '', '', '', ''))),
-    ('menu2', (('no_items_text', 'list', 'List is empty.'), ('name', 'list', 'Name'), ('name', 'detail', 'Name'))),
+    ('menu2',
+     (('no_items_text', 'list', 'List is empty.'),
+      ('select_text', 'list', 'Continue'),
+      ('name', 'list', 'Name'),
+      ('name', 'detail', 'Name'))),
     ('menu2_form1',
      (('name_of_series-label', 'Name of series', '', '', ''),
       ('submit_label', 'Submit', '', '', ''),
       ('submit_notification_label', '', '', '', ''))),
     ('menu3',
      (('no_items_text', 'list', 'List is empty.'),
+      ('select_text', 'list', 'Continue'),
       ('name', 'list', 'Name'),
       ('Tab 0', 'detail', 'Name'),
       ('Tab 1', 'detail', 'Graph'),
@@ -123,6 +129,7 @@
       ('submit_notification_label', '', '', '', ''))),
     ('menu4',
      (('no_items_text', 'list', 'List is empty.'),
+      ('select_text', 'list', 'Continue'),
       ('x', 'list', 'X'),
       ('y', 'list', 'Y'),
       ('x (ID Mapping Text)', 'detail', 'X Name'),
@@ -137,7 +144,11 @@
       ('submit_label', 'Submit', '', '', ''),
       ('submit_notification_label', '', '', '', ''))),
     ('menu5', ()),
-    ('menu6', (('no_items_text', 'list', 'List is empty.'), ('name', 'list', 'Name'), ('name', 'detail', 'Name'))),
+    ('menu6',
+     (('no_items_text', 'list', 'List is empty.'),
+      ('select_text', 'list', 'Continue'),
+      ('name', 'list', 'Name'),
+      ('name', 'detail', 'Name'))),
     ('menu6_form1',
      (('this_form_does_nothing-label', 'This form does nothing.', '', '', ''),
       ('submit_label', 'Submit', '', '', ''),
@@ -361,6 +372,7 @@ class BulkAppTranslationBasicTest(BulkAppTranslationTestBaseWithApp):
             ("search_again_label", "list", "Find Another Mother", "Mère! Encore!"),
             ("title_label", "list", "Find a Mom", "Maman!"),
             ("description", "list", "More information", "Plus d'information"),
+            ("select_text", "list", "Continue with case", "Continuer avec le cas"),
             ("no_items_text", "list", "Empty List", "Lista Vacía"),
             ("name", "list", "Name", "Nom"),
             ("Tab 0", "detail", "Name", "Nom"),
@@ -418,6 +430,7 @@ class BulkAppTranslationBasicTest(BulkAppTranslationTestBaseWithApp):
             ("menu1", "search_again_label", "list", "", "Find Another Mother", "", "", "", ""),
             ("menu1", "title_label", "list", "Find a Mom", "Maman!", "", "", "", ""),
             ("menu1", "description", "list", "More information", "Plus d'information", "", "", "", ""),
+            ("menu1", "select_text", "list", "Continue with case", "Continuer avec le cas", "", "", "", ""),
             ("menu1", "no_items_text", "list", "Empty List", "Lista Vacía", "", "", "", ""),
             ("menu1", "name", "list", "", "Name", "", "", "", ""),
             ("menu1", "Tab 0", "detail", "", "Name", "", "", "", ""),
@@ -1141,6 +1154,7 @@ def test_module_case_search_rows(self):
     def test_module_detail_rows(self):
         self.assertListEqual(get_module_detail_rows(self.app.langs, self.app.modules[0]), [
             ('no_items_text', 'list', 'Empty List'),
+            ('select_text', 'list', 'Continue'),
             ('name', 'list', 'Name'),
             ('name', 'detail', 'Name'),
         ])
@@ -1226,6 +1240,7 @@ def test_bulk_app_single_sheet_rows(self):
             ['menu1', '', '', '', 'Stethoscope', 'jr://file/commcare/image/module0.png', None, '',
              '58ce5c9cf6eda401526973773ef216e7980bc6cc'],
             ['menu1', 'case_list_menu_item_label', 'list', '', 'Steth List', '', '', '', ''],
+            ['menu1', 'select_text', 'list', '', 'Continue', '', '', '', ''],
             ['menu1', 'name', 'list', '', 'Name', '', '', '', ''],
             ['menu1', 'name', 'detail', '', 'Name', '', '', '', ''],
 
@@ -1241,6 +1256,7 @@ def test_bulk_app_single_sheet_rows(self):
             ['menu1_form1', '', '', 'submit_notification_label', '', '', '', '', ''],
 
             ['menu2', '', '', '', 'Register Series', '', '', '', 'b9c25abe21054632a3623199debd7cfa'],
+            ['menu2', 'select_text', 'list', '', 'Continue', '', '', '', ''],
             ['menu2', 'name', 'list', '', 'Name', '', '', '', ''],
             ['menu2', 'name', 'detail', '', 'Name', '', '', '', ''],
 
@@ -1250,6 +1266,7 @@ def test_bulk_app_single_sheet_rows(self):
             ['menu2_form1', '', '', 'submit_notification_label', '', '', '', '', ''],
 
             ['menu3', '', '', '', 'Followup Series', '', '', '', '217e1c8de3dd46f98c7d2806bc19b580'],
+            ['menu3', 'select_text', 'list', '', 'Continue', '', '', '', ''],
             ['menu3', 'name', 'list', '', 'Name', '', '', '', ''],
             ['menu3', 'Tab 0', 'detail', '', 'Name', '', '', '', ''],
             ['menu3', 'Tab 1', 'detail', '', 'Graph', '', '', '', ''],
@@ -1269,6 +1286,7 @@ def test_bulk_app_single_sheet_rows(self):
             ['menu3_form1', '', '', 'submit_notification_label', '', '', '', '', ''],
 
             ['menu4', '', '', '', 'Remove Point', '', '', '', '17195132472446ed94bd91ba19a2b379'],
+            ['menu4', 'select_text', 'list', '', 'Continue', '', '', '', ''],
             ['menu4', 'x', 'list', '', 'X', '', '', '', ''],
             ['menu4', 'y', 'list', '', 'Y', '', '', '', ''],
             ['menu4', 'x (ID Mapping Text)', 'detail', '', 'X Name', '', '', '', ''],
@@ -1287,6 +1305,7 @@ def test_bulk_app_single_sheet_rows(self):
             ['menu5', '', '', '', 'Empty Reports Module', '', '', '', '703eb807ae584d1ba8bf9457d7ac7590'],
 
             ['menu6', '', '', '', 'Advanced Module', None, None, '', '7f75ed4c15be44509591f41b3d80746e'],
+            ['menu6', 'select_text', 'list', '', 'Continue', '', '', '', ''],
             ['menu6', 'name', 'list', '', 'Name', '', '', '', ''],
             ['menu6', 'name', 'detail', '', 'Name', '', '', '', ''],
 

From 349ae9c2242a02accf73632ea20b77135d96526b Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 15 Jan 2024 12:52:47 -0500
Subject: [PATCH 037/118] select text in case tiles

---
 corehq/apps/app_manager/suite_xml/features/case_tiles.py | 2 ++
 corehq/apps/app_manager/suite_xml/sections/details.py    | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/corehq/apps/app_manager/suite_xml/features/case_tiles.py b/corehq/apps/app_manager/suite_xml/features/case_tiles.py
index dbb383ef0762..33a24eae58c9 100644
--- a/corehq/apps/app_manager/suite_xml/features/case_tiles.py
+++ b/corehq/apps/app_manager/suite_xml/features/case_tiles.py
@@ -147,6 +147,8 @@ def build_case_tile_detail(self):
 
         DetailContributor.add_no_items_text_to_detail(detail, self.app, self.detail_type, self.module)
 
+        DetailContributor.add_select_text_to_detail(detail, self.app, self.detail_type, self.module)
+
         if self.module.has_grouped_tiles():
             detail.tile_group = TileGroup(
                 function=f"string(./index/{self.detail.case_tile_group.index_identifier})",
diff --git a/corehq/apps/app_manager/suite_xml/sections/details.py b/corehq/apps/app_manager/suite_xml/sections/details.py
index 5ea9fb3fe38d..5dec28d5d8e1 100644
--- a/corehq/apps/app_manager/suite_xml/sections/details.py
+++ b/corehq/apps/app_manager/suite_xml/sections/details.py
@@ -250,6 +250,8 @@ def build_detail(self, module, detail_type, detail, detail_column_infos, tabs=No
                         id
                     )) is not None:
                         d.actions.append(case_search_action)
+            # Add select text
+            self.add_select_text_to_detail(d, self.app, detail_type, module)
 
             try:
                 if not self.app.enable_multi_sort:
@@ -553,6 +555,11 @@ def add_no_items_text_to_detail(detail, app, detail_type, module):
         if detail_type.endswith('short') and app.supports_empty_case_list_text:
             detail.no_items_text = Text(locale_id=id_strings.no_items_text_detail(module))
 
+    @staticmethod
+    def add_select_text_to_detail(detail, app, detail_type, module):
+        if detail_type.endswith('short'):
+            detail.select_text = Text(locale_id=id_strings.select_text_detail(module))
+
 
 class DetailsHelper(object):
 

From 5302fbdb6c3c3b04eee51fff630e2c9aed336fce Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 15 Jan 2024 12:56:52 -0500
Subject: [PATCH 038/118] get select text in js view and display

---
 .../static/cloudcare/js/formplayer/menus/collections.js     | 1 +
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js | 2 ++
 .../templates/formplayer/multi_select_continue_button.html  | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
index 20990d11ecfc..c4ff9656b4ed 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
@@ -58,6 +58,7 @@ hqDefine("cloudcare/js/formplayer/menus/collections", function () {
             'groupHeaderRows',
             'queryResponse',
             'endpointActions',
+            'selectText',
         ],
 
         commandProperties: [
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 15c021e08299..44110a2ae6ce 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -595,6 +595,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
             self.styles = options.styles;
             self.hasNoItems = options.collection.length === 0 || options.triggerEmptyCaseList;
             self.noItemsText = options.triggerEmptyCaseList ? sidebarNoItemsText : this.options.collection.noItemsText;
+            self.selectText = this.options.collection.selectText;
             self.headers = options.triggerEmptyCaseList ? [] : this.options.headers;
             self.redoLast = options.redoLast;
             if (sessionStorage.selectedValues !== undefined) {
@@ -950,6 +951,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
                 startPage: paginateItems.startPage,
                 title: title.trim(),
                 description: description === undefined ? "" : markdown.render(description.trim()),
+                selectText: this.selectText === undefined ? "" : this.selectText.trim(),
                 headers: this.headers,
                 widthHints: this.options.widthHints,
                 actions: this.options.actions,
diff --git a/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html b/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
index 46ff23dce34e..e00946577768 100644
--- a/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
+++ b/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
@@ -1,6 +1,10 @@
 {% load i18n %}
 <button type="button" class="btn btn-success btn-lg formplayer-request multi-select-continue-btn" disabled="true">
-  {% trans "Continue" %}
+  <% if (selectText.length > 0) { %>
+    <%= selectText %>
+    <% } else { %>
+      {% trans "Continue" %}
+    <% } %>
   <span id="multi-select-btn-text" class="badge">
     <%- selectedCaseIds.length %>
   </span>

From 86f807ab7b71d27f56b436524e0ee9a284bdc13c Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Mon, 15 Jan 2024 10:29:36 -0800
Subject: [PATCH 039/118] specify case where "sidebar" region is emptied

---
 .../static/cloudcare/js/formplayer/menus/controller.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index f204d0f6f7e9..82c8254d2e6d 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -150,7 +150,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
                     groupHeaders: menuResponse.groupHeaders,
                 }).render()
             );
-        } else {
+        } else if (!sidebarEnabled) {
             FormplayerFrontend.regions.getRegion('sidebar').empty();
         }
 

From 4a94ce47195f6a07d15d62fc6fad50595e81ad78 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Mon, 15 Jan 2024 11:27:52 -0800
Subject: [PATCH 040/118] mostly a refactor to pull out main region setting for
 split screen case search and limited to only display case list when sidebar
 is enabled

Previously, it the main region would show the respective menuResponse view. As long as sidebar is enabled and it is not a query view. But
this is not used for any workflows so adds unneccessary complexity
---
 .../js/formplayer/menus/controller.js         | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 82c8254d2e6d..86cea5179c35 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -108,14 +108,8 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
         var appPreview = FormplayerFrontend.currentUser.displayOptions.singleAppMode;
         var queryResponse = menuResponse.queryResponse;
         var sidebarEnabled = !appPreview && menusUtils.isSidebarEnabled(menuResponse);
-        if (sidebarEnabled && menuResponse.type === constants.QUERY) {
-            var menuData = menusUtils.getMenuData(menuResponse);
-            menuData["triggerEmptyCaseList"] = true;
-            menuData["sidebarEnabled"] = true;
-            menuData["description"] = menuResponse.description;
-
-            var caseListView = menusUtils.getCaseListView(menuResponse);
-            FormplayerFrontend.regions.getRegion('main').show(caseListView(menuData));
+        if (sidebarEnabled) {
+            showSplitScreenQuery(menuResponse);
         } else if (menuListView) {
             FormplayerFrontend.regions.getRegion('main').show(menuListView);
         }
@@ -173,6 +167,17 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
         }
     };
 
+    var showSplitScreenQuery = function (menuResponse) {
+        var menuData = menusUtils.getMenuData(menuResponse);
+        if (menuResponse.type === constants.QUERY) {
+            menuData["triggerEmptyCaseList"] = true;
+            menuData["sidebarEnabled"] = true;
+            menuData["description"] = menuResponse.description;
+        }
+        var caseListView = menusUtils.getCaseListView(menuResponse);
+        FormplayerFrontend.regions.getRegion('main').show(caseListView(menuData));
+    };
+
     var showPersistentCaseTile = function (persistentCaseTile) {
         var detailView = getCaseTile(persistentCaseTile);
         FormplayerFrontend.regions.getRegion('persistentCaseTile').show(detailView.render());

From 4cb6e9101526e6f53be22e90a6cde593c837c990 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Mon, 15 Jan 2024 11:59:50 -0800
Subject: [PATCH 041/118] refactor: pull sidebar region views into separate
 method

---
 .../js/formplayer/menus/controller.js         | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 86cea5179c35..5416f4ee94f9 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -106,12 +106,14 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
     var showMenu = function (menuResponse) {
         var menuListView = menusUtils.getMenuView(menuResponse);
         var appPreview = FormplayerFrontend.currentUser.displayOptions.singleAppMode;
-        var queryResponse = menuResponse.queryResponse;
         var sidebarEnabled = !appPreview && menusUtils.isSidebarEnabled(menuResponse);
+        if (menuListView) {
+            FormplayerFrontend.regions.getRegion('main').show(menuListView);
+        }
         if (sidebarEnabled) {
             showSplitScreenQuery(menuResponse);
-        } else if (menuListView) {
-            FormplayerFrontend.regions.getRegion('main').show(menuListView);
+        } else {
+            FormplayerFrontend.regions.getRegion('sidebar').empty();
         }
         if (menuResponse.persistentCaseTile && !appPreview) {
             showPersistentCaseTile(menuResponse.persistentCaseTile);
@@ -119,35 +121,6 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
             FormplayerFrontend.regions.getRegion('persistentCaseTile').empty();
         }
 
-        if (sidebarEnabled && menuResponse.type === constants.ENTITIES && queryResponse)  {
-            var queryCollection = new Collection(queryResponse.displays);
-            FormplayerFrontend.regions.getRegion('sidebar').show(
-                queryView.queryListView({
-                    collection: queryCollection,
-                    title: menuResponse.title,
-                    description: menuResponse.description,
-                    hasDynamicSearch: queryResponse.dynamicSearch,
-                    sidebarEnabled: true,
-                    disableDynamicSearch: !sessionStorage.submitPerformed,
-                    groupHeaders: queryResponse.groupHeaders,
-                }).render()
-            );
-        } else if (sidebarEnabled && menuResponse.type === constants.QUERY) {
-            FormplayerFrontend.regions.getRegion('sidebar').show(
-                queryView.queryListView({
-                    collection: menuResponse,
-                    title: menuResponse.title,
-                    description: menuResponse.description,
-                    hasDynamicSearch: menuResponse.dynamicSearch,
-                    sidebarEnabled: true,
-                    disableDynamicSearch: true,
-                    groupHeaders: menuResponse.groupHeaders,
-                }).render()
-            );
-        } else if (!sidebarEnabled) {
-            FormplayerFrontend.regions.getRegion('sidebar').empty();
-        }
-
         if (menuResponse.breadcrumbs) {
             menusUtils.showBreadcrumbs(menuResponse.breadcrumbs);
             if (!appPreview) {
@@ -169,11 +142,38 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
 
     var showSplitScreenQuery = function (menuResponse) {
         var menuData = menusUtils.getMenuData(menuResponse);
+        var queryResponse = menuResponse.queryResponse;
         if (menuResponse.type === constants.QUERY) {
             menuData["triggerEmptyCaseList"] = true;
             menuData["sidebarEnabled"] = true;
             menuData["description"] = menuResponse.description;
         }
+        if (menuResponse.type === constants.ENTITIES && queryResponse)  {
+            var queryCollection = new Collection(queryResponse.displays);
+            FormplayerFrontend.regions.getRegion('sidebar').show(
+                queryView.queryListView({
+                    collection: queryCollection,
+                    title: menuResponse.title,
+                    description: menuResponse.description,
+                    hasDynamicSearch: queryResponse.dynamicSearch,
+                    sidebarEnabled: true,
+                    disableDynamicSearch: !sessionStorage.submitPerformed,
+                    groupHeaders: queryResponse.groupHeaders,
+                }).render()
+            );
+        } else if (menuResponse.type === constants.QUERY) {
+            FormplayerFrontend.regions.getRegion('sidebar').show(
+                queryView.queryListView({
+                    collection: menuResponse,
+                    title: menuResponse.title,
+                    description: menuResponse.description,
+                    hasDynamicSearch: menuResponse.dynamicSearch,
+                    sidebarEnabled: true,
+                    disableDynamicSearch: true,
+                    groupHeaders: menuResponse.groupHeaders,
+                }).render()
+            );
+        }
         var caseListView = menusUtils.getCaseListView(menuResponse);
         FormplayerFrontend.regions.getRegion('main').show(caseListView(menuData));
     };

From e9d1b45c0353d8dcc3b60a9a1c3988b3a32daf85 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Mon, 15 Jan 2024 12:10:18 -0800
Subject: [PATCH 042/118] refactor: moves manipulation of menuDate for caselist
 view to be under existing conditional

---
 .../static/cloudcare/js/formplayer/menus/controller.js   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 5416f4ee94f9..93f857f9ac72 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -143,11 +143,6 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
     var showSplitScreenQuery = function (menuResponse) {
         var menuData = menusUtils.getMenuData(menuResponse);
         var queryResponse = menuResponse.queryResponse;
-        if (menuResponse.type === constants.QUERY) {
-            menuData["triggerEmptyCaseList"] = true;
-            menuData["sidebarEnabled"] = true;
-            menuData["description"] = menuResponse.description;
-        }
         if (menuResponse.type === constants.ENTITIES && queryResponse)  {
             var queryCollection = new Collection(queryResponse.displays);
             FormplayerFrontend.regions.getRegion('sidebar').show(
@@ -173,6 +168,10 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
                     groupHeaders: menuResponse.groupHeaders,
                 }).render()
             );
+
+            menuData["triggerEmptyCaseList"] = true;
+            menuData["sidebarEnabled"] = true;
+            menuData["description"] = menuResponse.description;
         }
         var caseListView = menusUtils.getCaseListView(menuResponse);
         FormplayerFrontend.regions.getRegion('main').show(caseListView(menuData));

From 173c955a6bb7cfa5bc3a1cafe54bdca211a32719 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Tue, 16 Jan 2024 07:42:16 +0530
Subject: [PATCH 043/118] Refactor css

---
 .../static/cloudcare/less/formplayer-webapp/form.less         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
index 3505f08a2229..76b02f290803 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
@@ -211,7 +211,9 @@
   }
 }
 
-div[class*="gr"][class*="col-sm-"][class*="panel"][class*="panel-default"] {
+.question-tile-row {
+  .gr {
     padding-right: 0px !important;
     padding-left: 0px !important;
+  }
 }

From da815fe8addecafd1dd67fab0fba4226d8d22746 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Mon, 15 Jan 2024 21:07:01 -0800
Subject: [PATCH 044/118] feat: search on query clear when configuration is
 enabled

---
 .../static/cloudcare/js/formplayer/menus/collections.js        | 1 +
 .../static/cloudcare/js/formplayer/menus/controller.js         | 2 ++
 .../static/cloudcare/js/formplayer/menus/views/query.js        | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
index 20990d11ecfc..fb9289643027 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
@@ -75,6 +75,7 @@ hqDefine("cloudcare/js/formplayer/menus/collections", function () {
 
         queryProperties: [
             'groupHeaders',
+            'searchOnClear',
         ],
 
         parse: function (response) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 93f857f9ac72..147ef3db41bd 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -154,6 +154,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
                     sidebarEnabled: true,
                     disableDynamicSearch: !sessionStorage.submitPerformed,
                     groupHeaders: queryResponse.groupHeaders,
+                    searchOnClear: queryResponse.searchOnClear,
                 }).render()
             );
         } else if (menuResponse.type === constants.QUERY) {
@@ -166,6 +167,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
                     sidebarEnabled: true,
                     disableDynamicSearch: true,
                     groupHeaders: menuResponse.groupHeaders,
+                    searchOnClear: menuResponse.searchOnClear,
                 }).render()
             );
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index 302477a4b2d4..5db83218282c 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -584,7 +584,6 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
 
             this.dynamicSearchEnabled = !(options.disableDynamicSearch || this.smallScreenEnabled) &&
                 (toggles.toggleEnabled('DYNAMICALLY_UPDATE_SEARCH_RESULTS') && this.options.sidebarEnabled);
-
             if (Object.keys(options.groupHeaders).length > 0) {
                 const groupedCollection = groupDisplays(options.collection, options.groupHeaders);
                 this.collection = new Collection(groupedCollection);
@@ -705,7 +704,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
                 childView.clear();
             });
             self.setStickyQueryInputs();
-            if (self.dynamicSearchEnabled) {
+            if (self.dynamicSearchEnabled || this.options.searchOnClear) {
                 self.updateSearchResults();
             }
         },

From 4cfb7c486a214c43bfa441714dc3b3a73000687c Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Tue, 16 Jan 2024 11:15:42 +0530
Subject: [PATCH 045/118] Add rel_ix for GroupedElementTileRow

---
 corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 2cdc8561a365..b10c7c411458 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -726,6 +726,8 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         self.parent = parent;
         Container.call(self, json);
 
+        self.rel_ix = ko.observable(relativeIndex(self.ix()));
+
         self.hasAnyNestedQuestions = function () {
             return _.any(self.children(), function (d) {
                 if (d.type() === constants.QUESTION_TYPE) {

From 80730cfcd989e15bf033d808ffbc08a5056c599f Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Tue, 16 Jan 2024 12:18:13 +0530
Subject: [PATCH 046/118] Change repeat.parent to repeat.parent.parent in
 deleteRepeat to get the juncture

---
 .../static/cloudcare/js/form_entry/web_form_session.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
index 65b3563df328..142b379b80ea 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
@@ -437,7 +437,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", function () {
         };
 
         self.deleteRepeat = function (repetition) {
-            var juncture = formUI.getIx(repetition.parent);
+            var juncture = formUI.getIx(repetition.parent.parent);
             var repIx = +(repetition.rel_ix().replace(/_/g, ':').split(":").slice(-1)[0]);
             this.serverRequest(
                 {

From 022b4fcbe2303733d761451acfc00b430fe26d87 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Tue, 16 Jan 2024 11:52:45 -0500
Subject: [PATCH 047/118] scope select text to correct modules

---
 corehq/apps/app_manager/app_strings.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/app_manager/app_strings.py b/corehq/apps/app_manager/app_strings.py
index a3bc28c6fa2b..13304205ae5d 100644
--- a/corehq/apps/app_manager/app_strings.py
+++ b/corehq/apps/app_manager/app_strings.py
@@ -142,10 +142,11 @@ def _create_module_details_app_strings(module, langs):
             clean_trans(module.case_details.short.no_items_text, langs)
         )
 
-    yield (
-        id_strings.select_text_detail(module),
-        clean_trans(module.case_details.short.select_text, langs)
-    )
+    if hasattr(module, 'case_details'):
+        yield (
+            id_strings.select_text_detail(module),
+            clean_trans(module.case_details.short.select_text, langs)
+        )
 
     for detail_type, detail, _ in module.get_details():
         for column in detail.get_columns():

From c5508237d3f82f144de468d3abb57590eba89224 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Tue, 16 Jan 2024 12:08:38 -0500
Subject: [PATCH 048/118] lint

---
 corehq/apps/app_manager/tests/app_factory.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/tests/app_factory.py b/corehq/apps/app_manager/tests/app_factory.py
index c61ddba7802b..0a44871f177d 100644
--- a/corehq/apps/app_manager/tests/app_factory.py
+++ b/corehq/apps/app_manager/tests/app_factory.py
@@ -173,7 +173,10 @@ def form_opens_case(form, case_type=None, is_subcase=False, parent_tag=None, is_
                 if not parent_tag:
                     parent_tag = form.actions.load_update_cases[-1].case_tag
 
-                action.case_indices = [CaseIndex(tag=parent_tag, relationship='extension' if is_extension else 'child')]
+                action.case_indices = [CaseIndex(
+                    tag=parent_tag,
+                    relationship='extension' if is_extension else 'child'
+                )]
 
             form.actions.open_cases.append(action)
 

From 645f6070056826fe0b01c72bde1e1f0080e863d1 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Tue, 16 Jan 2024 13:11:15 -0500
Subject: [PATCH 049/118] add feature support check

---
 corehq/apps/app_manager/app_strings.py     | 2 +-
 corehq/apps/app_manager/feature_support.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/app_strings.py b/corehq/apps/app_manager/app_strings.py
index 13304205ae5d..c757cd3d0409 100644
--- a/corehq/apps/app_manager/app_strings.py
+++ b/corehq/apps/app_manager/app_strings.py
@@ -142,7 +142,7 @@ def _create_module_details_app_strings(module, langs):
             clean_trans(module.case_details.short.no_items_text, langs)
         )
 
-    if hasattr(module, 'case_details'):
+    if module.get_app().supports_select_text and hasattr(module, 'case_details'):
         yield (
             id_strings.select_text_detail(module),
             clean_trans(module.case_details.short.select_text, langs)
diff --git a/corehq/apps/app_manager/feature_support.py b/corehq/apps/app_manager/feature_support.py
index 423c7e43449b..d744bbbaea5b 100644
--- a/corehq/apps/app_manager/feature_support.py
+++ b/corehq/apps/app_manager/feature_support.py
@@ -216,6 +216,13 @@ def supports_empty_case_list_text(self):
             and self._require_minimum_version('2.54')
         )
 
+    @property
+    def supports_select_text(self):
+        """
+        Ability to configure select button text through bulk translations
+        """
+        return self._require_minimum_version('2.54')
+
     @property
     def supports_menu_instances(self):
         return self._require_minimum_version('2.54')

From 53d96aa662ddaf61c590309a8166d6a14e3b8a1f Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Tue, 16 Jan 2024 12:07:52 -0800
Subject: [PATCH 050/118] bug: when response is type entity, the main region
 shouldn't show just the empty case list view.

The change also avoids populating "main" region twice
---
 .../cloudcare/js/formplayer/menus/controller.js      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 147ef3db41bd..c43aff06c72d 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -107,11 +107,11 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
         var menuListView = menusUtils.getMenuView(menuResponse);
         var appPreview = FormplayerFrontend.currentUser.displayOptions.singleAppMode;
         var sidebarEnabled = !appPreview && menusUtils.isSidebarEnabled(menuResponse);
-        if (menuListView) {
+        if (menuListView && !sidebarEnabled) {
             FormplayerFrontend.regions.getRegion('main').show(menuListView);
         }
         if (sidebarEnabled) {
-            showSplitScreenQuery(menuResponse);
+            showSplitScreenQuery(menuResponse, menuListView);
         } else {
             FormplayerFrontend.regions.getRegion('sidebar').empty();
         }
@@ -140,7 +140,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
         }
     };
 
-    var showSplitScreenQuery = function (menuResponse) {
+    var showSplitScreenQuery = function (menuResponse, menuListView) {
         var menuData = menusUtils.getMenuData(menuResponse);
         var queryResponse = menuResponse.queryResponse;
         if (menuResponse.type === constants.ENTITIES && queryResponse)  {
@@ -157,6 +157,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
                     searchOnClear: queryResponse.searchOnClear,
                 }).render()
             );
+            FormplayerFrontend.regions.getRegion('main').show(menuListView);
         } else if (menuResponse.type === constants.QUERY) {
             FormplayerFrontend.regions.getRegion('sidebar').show(
                 queryView.queryListView({
@@ -174,9 +175,10 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
             menuData["triggerEmptyCaseList"] = true;
             menuData["sidebarEnabled"] = true;
             menuData["description"] = menuResponse.description;
+
+            var caseListView = menusUtils.getCaseListView(menuResponse);
+            FormplayerFrontend.regions.getRegion('main').show(caseListView(menuData));
         }
-        var caseListView = menusUtils.getCaseListView(menuResponse);
-        FormplayerFrontend.regions.getRegion('main').show(caseListView(menuData));
     };
 
     var showPersistentCaseTile = function (persistentCaseTile) {

From 870c3d940f536bdab2798f3f6f81539c6304a476 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Tue, 16 Jan 2024 16:26:44 -0500
Subject: [PATCH 051/118] handle null selectText

---
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js     | 2 +-
 .../templates/formplayer/multi_select_continue_button.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 44110a2ae6ce..14e40a98f283 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -951,7 +951,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
                 startPage: paginateItems.startPage,
                 title: title.trim(),
                 description: description === undefined ? "" : markdown.render(description.trim()),
-                selectText: this.selectText === undefined ? "" : this.selectText.trim(),
+                selectText: this.selectText === undefined ? "" : this.selectText,
                 headers: this.headers,
                 widthHints: this.options.widthHints,
                 actions: this.options.actions,
diff --git a/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html b/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
index e00946577768..d85673e509fb 100644
--- a/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
+++ b/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <button type="button" class="btn btn-success btn-lg formplayer-request multi-select-continue-btn" disabled="true">
-  <% if (selectText.length > 0) { %>
+  <% if (selectText && selectText.length > 0) { %>
     <%= selectText %>
     <% } else { %>
       {% trans "Continue" %}

From 6d8838e30ef2440ab4e22dfa053532882852b640 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Tue, 16 Jan 2024 13:51:11 -0800
Subject: [PATCH 052/118] bug: don't search on clear when screen is small since
 query view is a popup and not perpetually displayed at the same time as
 entity view

---
 .../static/cloudcare/js/formplayer/menus/views/query.js       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index 5db83218282c..72d5e60d87c4 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -584,6 +584,8 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
 
             this.dynamicSearchEnabled = !(options.disableDynamicSearch || this.smallScreenEnabled) &&
                 (toggles.toggleEnabled('DYNAMICALLY_UPDATE_SEARCH_RESULTS') && this.options.sidebarEnabled);
+            this.searchOnClear = (options.searchOnClear && !this.smallScreenEnabled);
+
             if (Object.keys(options.groupHeaders).length > 0) {
                 const groupedCollection = groupDisplays(options.collection, options.groupHeaders);
                 this.collection = new Collection(groupedCollection);
@@ -704,7 +706,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
                 childView.clear();
             });
             self.setStickyQueryInputs();
-            if (self.dynamicSearchEnabled || this.options.searchOnClear) {
+            if (self.dynamicSearchEnabled || this.searchOnClear) {
                 self.updateSearchResults();
             }
         },

From 62c94bae085c675575baef3450e82c2a8e2fced3 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Tue, 16 Jan 2024 14:22:32 -0800
Subject: [PATCH 053/118] test: tests search_on_clear is populated in suite

---
 .../test_suite_split_screen_case_search.py     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/tests/test_suite_split_screen_case_search.py b/corehq/apps/app_manager/tests/test_suite_split_screen_case_search.py
index 7aa856fd13e2..5e68a30a06ff 100644
--- a/corehq/apps/app_manager/tests/test_suite_split_screen_case_search.py
+++ b/corehq/apps/app_manager/tests/test_suite_split_screen_case_search.py
@@ -56,8 +56,10 @@ def setUp(self):
         self.module.search_config = CaseSearch(
             properties=[
                 CaseSearchProperty(name='name', label={'en': 'Name'}),
-            ]
+            ],
+            search_on_clear=True,
         )
+
         self.module.assign_references()
         # wrap to have assign_references called
         self.app = Application.wrap(self.app.to_json())
@@ -78,3 +80,17 @@ def test_dynamic_search_suite_disable_with_auto_select(self, mock):
         suite = parse_normalize(suite, to_string=False)
         self.assertEqual(True, self.module.is_auto_select())
         self.assertEqual("false", suite.xpath("./remote-request[1]/session/query/@dynamic_search")[0])
+
+    @flag_enabled('SPLIT_SCREEN_CASE_SEARCH')
+    def test_search_on_clear(self):
+        suite = self.app.create_suite()
+        suite = parse_normalize(suite, to_string=False)
+        self.assertEqual("true", suite.xpath("./remote-request[1]/session/query/@search_on_clear")[0])
+
+    @patch('corehq.apps.app_manager.models.ModuleBase.is_auto_select', return_value=True)
+    @flag_enabled('SPLIT_SCREEN_CASE_SEARCH')
+    def test_search_on_clear_disable_with_auto_select(self, mock):
+        suite = self.app.create_suite()
+        suite = parse_normalize(suite, to_string=False)
+        self.assertEqual(True, self.module.is_auto_select())
+        self.assertEqual("false", suite.xpath("./remote-request[1]/session/query/@search_on_clear")[0])

From 7e87d8368ba86113b1c486a1866906dcde5b8540 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Tue, 16 Jan 2024 15:40:17 -0800
Subject: [PATCH 054/118] adds validation for incompatibility of autoselect
 with search on clear

when both are configured, it will cause an infinite rerunning of searches in a loop
---
 corehq/apps/app_manager/helpers/validators.py                | 5 +++++
 .../templates/app_manager/partials/build_errors.html         | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/corehq/apps/app_manager/helpers/validators.py b/corehq/apps/app_manager/helpers/validators.py
index 42a32bd5f218..58641177882c 100644
--- a/corehq/apps/app_manager/helpers/validators.py
+++ b/corehq/apps/app_manager/helpers/validators.py
@@ -545,6 +545,11 @@ def validate_search_config(self):
                         "module": self.get_module_info(),
                         "property": prop.name,
                     }
+            if search_config.search_on_clear and self.module.is_auto_select():
+                yield {
+                    "type": "search on clear with auto select",
+                    "module": self.get_module_info(),
+                }
 
     def validate_case_list_field_actions(self):
         if hasattr(self.module, 'case_details'):
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/build_errors.html b/corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
index 8bef064bb30e..e444587bc9bd 100644
--- a/corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+++ b/corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
@@ -195,6 +195,11 @@ <h4 class="alert-heading">
               {% blocktrans with module_name=error.module.name|trans:langs %}
               The case list in <a href="{{ module_url }}">{{ module_name }}</a> can not use the same "search input instance name" as its Parent Select Menu.
               {% endblocktrans %}
+            {% case "search on clear with auto select" %}
+              {% blocktrans with module_name=error.module.name|trans:langs %}
+              The case list in <a href="{{ module_url }}">{{ module_name }}</a> uses both multi-select auto select and "Clearing search terms resets search results".
+              These two features are not compatible.
+              {% endblocktrans %}
             {% case "inline search to display only forms" %}
               {% blocktrans with module_name=error.module.name|trans:langs %}
                 <a href="{{ module_url }}">{{ module_name }}</a>

From f535e4e4dca158a5dd22eae36d2ebf4dde479010 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Tue, 16 Jan 2024 16:17:20 -0800
Subject: [PATCH 055/118] feat: hides config if dynamic search is enabled

dynamic search includes "search on clear" behavior
---
 .../app_manager/partials/modules/case_search_properties.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html b/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html
index d59ebc4ebf89..3af572b67f55 100644
--- a/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html
+++ b/corehq/apps/app_manager/templates/app_manager/partials/modules/case_search_properties.html
@@ -466,7 +466,7 @@ <h4 class="panel-title panel-title-nolink">{% trans "Search and Claim Options" %
             </div>
           </div>
           {% endif %}
-          {% if request|toggle_enabled:'SPLIT_SCREEN_CASE_SEARCH' %}
+          {% if request|toggle_enabled:'SPLIT_SCREEN_CASE_SEARCH' and not app.split_screen_dynamic_search%}
           <div class="form-group">
             <label class="control-label {% css_label_class %}">
               {% trans "Clearing search terms resets search results" %}

From d7390cbf955b95bcff5587010f5e4d26e9a3860d Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Wed, 17 Jan 2024 13:40:56 +0530
Subject: [PATCH 056/118] Add css padding for question-tile-row

---
 .../static/cloudcare/less/formplayer-common/form.less      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/form.less
index 088b9b2d61f5..968cb164a5be 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/form.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/form.less
@@ -43,3 +43,10 @@ legend {
     border-top: @cc-neutral-hi solid 1px;
     padding-top: 20px;
 }
+
+.question-tile-row {
+  .gr {
+    padding-right: 20px !important;
+    padding-left: 20px !important;
+  }
+}

From 7411119f9e179289d7acddc59726b9047cc9e0a3 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Wed, 17 Jan 2024 12:50:36 -0500
Subject: [PATCH 057/118] add methods to reduce complexity

---
 corehq/apps/app_manager/views/modules.py | 235 ++++++++++++-----------
 1 file changed, 122 insertions(+), 113 deletions(-)

diff --git a/corehq/apps/app_manager/views/modules.py b/corehq/apps/app_manager/views/modules.py
index 367735163e28..a947a14706e6 100644
--- a/corehq/apps/app_manager/views/modules.py
+++ b/corehq/apps/app_manager/views/modules.py
@@ -1207,7 +1207,6 @@ def edit_module_detail_screens(request, domain, app_id, module_unique_id):
     fixture_select = params.get('fixture_select', None)
     sort_elements = params.get('sort_elements', None)
     print_template = params.get('printTemplate', None)
-    search_properties = params.get("search_properties")
     custom_variables_dict = {
         'short': params.get("short_custom_variables_dict", None),
         'long': params.get("long_custom_variables_dict", None)
@@ -1276,127 +1275,137 @@ def edit_module_detail_screens(request, domain, app_id, module_unique_id):
             return HttpResponseBadRequest(_("The case hierarchy contains a circular reference."))
     if fixture_select is not None:
         module.fixture_select = FixtureSelect.wrap(fixture_select)
-    if search_properties is not None:
-        if (
-            search_properties.get('properties') is not None
-            or search_properties.get('default_properties') is not None
-        ):
-            title_label = module.search_config.title_label
-            title_label[lang] = search_properties.get('title_label', '')
-
-            description = module.search_config.description
-            description[lang] = search_properties.get('description', '')
-
-            search_label = module.search_config.search_label
-            search_label.label[lang] = search_properties.get('search_label', '')
-            if search_properties.get('search_label_image_for_all'):
-                search_label.use_default_image_for_all = (
-                    search_properties.get('search_label_image_for_all') == 'true')
-            if search_properties.get('search_label_audio_for_all'):
-                search_label.use_default_audio_for_all = (
-                    search_properties.get('search_label_audio_for_all') == 'true')
-            search_label.set_media("media_image", lang, search_properties.get('search_label_image'))
-            search_label.set_media("media_audio", lang, search_properties.get('search_label_audio'))
-
-            search_again_label = module.search_config.search_again_label
-            search_again_label.label[lang] = search_properties.get('search_again_label', '')
-            if search_properties.get('search_again_label_image_for_all'):
-                search_again_label.use_default_image_for_all = (
-                    search_properties.get('search_again_label_image_for_all') == 'true')
-            if search_properties.get('search_again_label_audio_for_all'):
-                search_again_label.use_default_audio_for_all = (
-                    search_properties.get('search_again_label_audio_for_all') == 'true')
-            search_again_label.set_media("media_image", lang, search_properties.get('search_again_label_image'))
-            search_again_label.set_media("media_audio", lang, search_properties.get('search_again_label_audio'))
 
-            try:
-                properties = [
-                    CaseSearchProperty.wrap(p)
-                    for p in _update_search_properties(
-                        module,
-                        search_properties.get('properties'), lang
-                    )
-                ]
-            except CaseSearchConfigError as e:
-                return HttpResponseBadRequest(e)
-            xpath_props = [
-                "search_filter", "blacklisted_owner_ids_expression",
-                "search_button_display_condition", "additional_relevant"
+    _gather_and_update_search_properties(params, app, module, lang)
+
+    resp = {}
+    app.save(resp)
+    return JsonResponse(resp)
+
+
+def _gather_and_update_search_properties(params, app, module, lang):
+    search_properties = params.get("search_properties")
+
+    def _has_search_properties(search_properties):
+        if search_properties is not None:
+            has_properties = search_properties.get('properties') is not None
+            has_default_properties = search_properties.get('default_properties') is not None
+            return has_properties or has_default_properties
+        return False
+
+    if _has_search_properties(search_properties):
+        title_label = module.search_config.title_label
+        title_label[lang] = search_properties.get('title_label', '')
+
+        description = module.search_config.description
+        description[lang] = search_properties.get('description', '')
+
+        search_label = module.search_config.search_label
+        search_label.label[lang] = search_properties.get('search_label', '')
+        if search_properties.get('search_label_image_for_all'):
+            search_label.use_default_image_for_all = (
+                search_properties.get('search_label_image_for_all') == 'true')
+        if search_properties.get('search_label_audio_for_all'):
+            search_label.use_default_audio_for_all = (
+                search_properties.get('search_label_audio_for_all') == 'true')
+        search_label.set_media("media_image", lang, search_properties.get('search_label_image'))
+        search_label.set_media("media_audio", lang, search_properties.get('search_label_audio'))
+
+        search_again_label = module.search_config.search_again_label
+        search_again_label.label[lang] = search_properties.get('search_again_label', '')
+        if search_properties.get('search_again_label_image_for_all'):
+            search_again_label.use_default_image_for_all = (
+                search_properties.get('search_again_label_image_for_all') == 'true')
+        if search_properties.get('search_again_label_audio_for_all'):
+            search_again_label.use_default_audio_for_all = (
+                search_properties.get('search_again_label_audio_for_all') == 'true')
+        search_again_label.set_media("media_image", lang, search_properties.get('search_again_label_image'))
+        search_again_label.set_media("media_audio", lang, search_properties.get('search_again_label_audio'))
+
+        try:
+            properties = [
+                CaseSearchProperty.wrap(p)
+                for p in _update_search_properties(
+                    module,
+                    search_properties.get('properties'), lang
+                )
             ]
+        except CaseSearchConfigError as e:
+            return HttpResponseBadRequest(e)
+        xpath_props = [
+            "search_filter", "blacklisted_owner_ids_expression",
+            "search_button_display_condition", "additional_relevant"
+        ]
 
-            def _check_xpath(xpath, location):
-                is_valid, message = validate_xpath(xpath)
-                if not is_valid:
-                    raise ValueError(
-                        f"Please fix the errors in xpath expression '{xpath}' "
-                        f"in {location}. The error is {message}"
-                    )
-
-            for prop in xpath_props:
-                xpath = search_properties.get(prop, "")
-                if xpath:
-                    try:
-                        _check_xpath(xpath, "Search and Claim Options")
-                    except ValueError as e:
-                        return HttpResponseBadRequest(str(e))
-
-            additional_registry_cases = []
-            for case_id_xpath in search_properties.get('additional_registry_cases', []):
-                if not case_id_xpath:
-                    continue
+        def _check_xpath(xpath, location):
+            is_valid, message = validate_xpath(xpath)
+            if not is_valid:
+                raise ValueError(
+                    f"Please fix the errors in xpath expression '{xpath}' "
+                    f"in {location}. The error is {message}"
+                )
 
+        for prop in xpath_props:
+            xpath = search_properties.get(prop, "")
+            if xpath:
                 try:
-                    _check_xpath(case_id_xpath, "the Case ID of Additional Data Registry Query")
+                    _check_xpath(xpath, "Search and Claim Options")
                 except ValueError as e:
                     return HttpResponseBadRequest(str(e))
 
-                additional_registry_cases.append(case_id_xpath)
-
-            data_registry_slug = search_properties.get('data_registry', "")
-            data_registry_workflow = search_properties.get('data_registry_workflow', "")
-            # force auto launch when data registry load case workflow selected
-            force_auto_launch = data_registry_slug and data_registry_workflow == REGISTRY_WORKFLOW_LOAD_CASE
-
-            instance_name = search_properties.get('instance_name', "")
-            if instance_name and not re.match(r"^[a-zA-Z]\w*$", instance_name):
-                return HttpResponseBadRequest(_(
-                    "'{}' is an invalid instance name. It can contain only letters, numbers, and underscores."
-                ).format(instance_name))
-
-            module.search_config = CaseSearch(
-                search_label=search_label,
-                search_again_label=search_again_label,
-                title_label=title_label,
-                description=description,
-                properties=properties,
-                additional_case_types=module.search_config.additional_case_types,
-                additional_relevant=search_properties.get('additional_relevant', ''),
-                auto_launch=force_auto_launch or bool(search_properties.get('auto_launch')),
-                default_search=bool(search_properties.get('default_search')),
-                search_filter=search_properties.get('search_filter', ""),
-                search_button_display_condition=search_properties.get('search_button_display_condition', ""),
-                blacklisted_owner_ids_expression=search_properties.get('blacklisted_owner_ids_expression', ""),
-                default_properties=[
-                    DefaultCaseSearchProperty.wrap(p)
-                    for p in search_properties.get('default_properties')
-                ],
-                custom_sort_properties=[
-                    CaseSearchCustomSortProperty.wrap(p)
-                    for p in search_properties.get('custom_sort_properties')
-                ],
-                data_registry=data_registry_slug,
-                data_registry_workflow=data_registry_workflow,
-                additional_registry_cases=additional_registry_cases,
-                custom_related_case_property=search_properties.get('custom_related_case_property', ""),
-                inline_search=search_properties.get('inline_search', False),
-                instance_name=instance_name,
-                include_all_related_cases=search_properties.get('include_all_related_cases', False),
-                dynamic_search=app.split_screen_dynamic_search and not module.is_auto_select(),
-            )
+        additional_registry_cases = []
+        for case_id_xpath in search_properties.get('additional_registry_cases', []):
+            if not case_id_xpath:
+                continue
 
-    resp = {}
-    app.save(resp)
-    return JsonResponse(resp)
+            try:
+                _check_xpath(case_id_xpath, "the Case ID of Additional Data Registry Query")
+            except ValueError as e:
+                return HttpResponseBadRequest(str(e))
+
+            additional_registry_cases.append(case_id_xpath)
+
+        data_registry_slug = search_properties.get('data_registry', "")
+        data_registry_workflow = search_properties.get('data_registry_workflow', "")
+        # force auto launch when data registry load case workflow selected
+        force_auto_launch = data_registry_slug and data_registry_workflow == REGISTRY_WORKFLOW_LOAD_CASE
+
+        instance_name = search_properties.get('instance_name', "")
+        if instance_name and not re.match(r"^[a-zA-Z]\w*$", instance_name):
+            return HttpResponseBadRequest(_(
+                "'{}' is an invalid instance name. It can contain only letters, numbers, and underscores."
+            ).format(instance_name))
+
+        module.search_config = CaseSearch(
+            search_label=search_label,
+            search_again_label=search_again_label,
+            title_label=title_label,
+            description=description,
+            properties=properties,
+            additional_case_types=module.search_config.additional_case_types,
+            additional_relevant=search_properties.get('additional_relevant', ''),
+            auto_launch=force_auto_launch or bool(search_properties.get('auto_launch')),
+            default_search=bool(search_properties.get('default_search')),
+            search_filter=search_properties.get('search_filter', ""),
+            search_button_display_condition=search_properties.get('search_button_display_condition', ""),
+            blacklisted_owner_ids_expression=search_properties.get('blacklisted_owner_ids_expression', ""),
+            default_properties=[
+                DefaultCaseSearchProperty.wrap(p)
+                for p in search_properties.get('default_properties')
+            ],
+            custom_sort_properties=[
+                CaseSearchCustomSortProperty.wrap(p)
+                for p in search_properties.get('custom_sort_properties')
+            ],
+            data_registry=data_registry_slug,
+            data_registry_workflow=data_registry_workflow,
+            additional_registry_cases=additional_registry_cases,
+            custom_related_case_property=search_properties.get('custom_related_case_property', ""),
+            inline_search=search_properties.get('inline_search', False),
+            instance_name=instance_name,
+            include_all_related_cases=search_properties.get('include_all_related_cases', False),
+            dynamic_search=app.split_screen_dynamic_search and not module.is_auto_select(),
+        )
 
 
 def _update_short_details(detail, short, params, lang):

From b52eced512c8c1dcbdcb918df790aa6e5e0f607d Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Wed, 17 Jan 2024 10:28:54 -0800
Subject: [PATCH 058/118] test: validation error is triggered when app
 configured with both "search on clear" and auto select

---
 corehq/apps/app_manager/tests/test_build_errors.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/corehq/apps/app_manager/tests/test_build_errors.py b/corehq/apps/app_manager/tests/test_build_errors.py
index 3795381a1d70..35b842f6a37e 100644
--- a/corehq/apps/app_manager/tests/test_build_errors.py
+++ b/corehq/apps/app_manager/tests/test_build_errors.py
@@ -375,3 +375,16 @@ def test_form_link_validation_mismatched_shadow_module(self, *args):
             'module': {'id': 0, 'name': {'en': 'm0 module'}},
             'form': {'id': 0, 'name': {'en': 'm0 form 0'}},
         }, errors)
+
+    @patch('corehq.apps.app_manager.models.ModuleBase.is_auto_select', return_value=True)
+    def test_search_on_clear_with_auto_select(self, *args):
+        factory = AppFactory()
+        module = factory.new_basic_module('basic', 'person', with_form=False)
+        module.search_config = CaseSearch(
+            search_on_clear=True,
+        )
+        errors = factory.app.validate_app()
+        self.assertIn({
+            'type': 'search on clear with auto select',
+            'module': {'id': 0, 'unique_id': 'basic_module', 'name': {'en': 'basic module'}},
+        }, errors)

From 2168b86fc9f306bf50a6e00792f8d0797338c0d9 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Wed, 17 Jan 2024 11:27:01 -0800
Subject: [PATCH 059/118] bug: search_on_clear should only be enabled Split
 screen case search is also enabled

If module has search_on_clear enabled, but then turns of SSCS FF,
previously, formplayer menuResponse would still respond searchOnClear = True. With this change,
response is false for searchOnClear
---
 .../apps/app_manager/suite_xml/post_process/remote_requests.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py b/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
index 98c101613ff3..1c200f827b58 100644
--- a/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
+++ b/corehq/apps/app_manager/suite_xml/post_process/remote_requests.py
@@ -219,7 +219,7 @@ def build_remote_request_queries(self):
             "default_search": self.module.search_config.default_search,
             "dynamic_search": self.app.split_screen_dynamic_search and not self.module.is_auto_select()
         }
-        if self.module.search_config.search_on_clear:
+        if self.module.search_config.search_on_clear and toggles.SPLIT_SCREEN_CASE_SEARCH.enabled(self.app.domain):
             kwargs["search_on_clear"] = (self.module.search_config.search_on_clear
                 and not self.module.is_auto_select())
         return [

From ce1739435a64ee77bc219dc2ce7be5787cc29980 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Wed, 17 Jan 2024 17:58:45 -0500
Subject: [PATCH 060/118] add app string test

---
 corehq/apps/app_manager/tests/app_factory.py   |  4 +---
 .../apps/app_manager/tests/test_app_strings.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/app_manager/tests/app_factory.py b/corehq/apps/app_manager/tests/app_factory.py
index 0a44871f177d..64fa3d5655b7 100644
--- a/corehq/apps/app_manager/tests/app_factory.py
+++ b/corehq/apps/app_manager/tests/app_factory.py
@@ -237,9 +237,7 @@ def case_claim_app_factory(cls):
         case_module.search_config.description = {
             'en': 'More information',
         }
-        case_module.search_config.select_text = {
-            'en': 'Continue with case',
-        }
+
         case_module.search_config.properties = [CaseSearchProperty(
             name='name',
             label={'en': 'Name of Mother'}
diff --git a/corehq/apps/app_manager/tests/test_app_strings.py b/corehq/apps/app_manager/tests/test_app_strings.py
index 55a46ea8e603..b3ddb758273f 100644
--- a/corehq/apps/app_manager/tests/test_app_strings.py
+++ b/corehq/apps/app_manager/tests/test_app_strings.py
@@ -287,3 +287,21 @@ def test_form_submit_label(self):
         self.assertEqual(default_strings['forms.m0f0.submit_label'], form.submit_label['en'])
         self.assertEqual(default_strings['forms.m0f0.submit_notification_label'],
                          form.submit_notification_label['en'])
+
+    def test_select_text_app_strings(self):
+        factory = AppFactory(build_version='2.54.0')
+        factory.app.langs = ['en', 'fra']
+        factory.app.build_profiles = OrderedDict({
+            'en': BuildProfile(langs=['en'], name='en-profile'),
+            'fra': BuildProfile(langs=['fra'], name='fra-profile'),
+        })
+        module, form = factory.new_basic_module('my_module', 'cases')
+        module.case_details.short.select_text = {'en': 'Continue with case', 'fra': 'Continuer avec le cas'}
+
+        app = Application.wrap(factory.app.to_json())
+
+        en_app_strings = self._generate_app_strings(app, 'default', build_profile_id='en')
+        self.assertEqual(en_app_strings['m0_select_text'], 'Continue with case')
+
+        es_app_strings = self._generate_app_strings(app, 'fra', build_profile_id='fra')
+        self.assertEqual(es_app_strings['m0_select_text'], 'Continuer avec le cas')

From 38bd3281708f97b3f1a8ee4729d2f4a4918896a8 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Thu, 18 Jan 2024 10:16:20 -0500
Subject: [PATCH 061/118] escaped html in underscore template

---
 .../templates/formplayer/multi_select_continue_button.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html b/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
index d85673e509fb..aac79cdaf029 100644
--- a/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
+++ b/corehq/apps/cloudcare/templates/formplayer/multi_select_continue_button.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <button type="button" class="btn btn-success btn-lg formplayer-request multi-select-continue-btn" disabled="true">
   <% if (selectText && selectText.length > 0) { %>
-    <%= selectText %>
+    <%- selectText %>
     <% } else { %>
       {% trans "Continue" %}
     <% } %>

From 837c62087f321fa0a17502b39154468ed3a560ce Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Thu, 18 Jan 2024 16:08:51 -0600
Subject: [PATCH 062/118] Use bbox on geocoder results

* Save domains default location bbox
* Limit geocoder search results to said bbox
---
 corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js | 3 +++
 corehq/apps/hqwebapp/static/hqwebapp/js/widgets.js            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
index 0c8f8d751974..47f4ce9bd5ca 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
@@ -106,6 +106,9 @@ hqDefine("cloudcare/js/form_entry/utils", function () {
         } else if (defaultGeocoderLocation.coordinates) {
             geocoder.setProximity(defaultGeocoderLocation.coordinates);
         }
+        if (setProximity && defaultGeocoderLocation.bbox) {
+            geocoder.setBbox(defaultGeocoderLocation.bbox);
+        }
         geocoder.on('clear', clearCallBack);
         geocoder.on('result', (item) => itemCallback(item.result));
         geocoder.addTo('#' + divId);
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/widgets.js b/corehq/apps/hqwebapp/static/hqwebapp/js/widgets.js
index 6fcabd0d42cd..86872fef77dc 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/widgets.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/widgets.js
@@ -79,6 +79,7 @@ hqDefine("hqwebapp/js/widgets",[
                         longitude: item.geometry.coordinates[0],
                         latitude: item.geometry.coordinates[1],
                     };
+                    geoObj.bbox = item.bbox;
                     inputEl.attr("value", JSON.stringify(geoObj));
                     return item.place_name;
                 }

From 205d951526d731fc8badfe1aedb0113b9bd735df Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Fri, 19 Jan 2024 09:48:09 -0600
Subject: [PATCH 063/118] Update description

Update descriptions of feature flag and function parameter to better reflect the new functionality
---
 .../cloudcare/static/cloudcare/js/form_entry/utils.js     | 2 +-
 corehq/toggles/__init__.py                                | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
index 47f4ce9bd5ca..5978989bd4f2 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
@@ -76,7 +76,7 @@ hqDefine("cloudcare/js/form_entry/utils", function () {
      * @param {function|undefined} inputOnKeyDown - inputOnKeyDown function (optional)
      * @param {boolean} showGeolocationButton - show geolocation button. Defaults to false. (optional)
      * @param {boolean} geolocateOnLoad - geolocate the user's location on load. Defaults to false. (optional)
-     * @param {boolean} setProximity - set proximity to user's location. Defaults to false. (optional)
+     * @param {boolean} setProximity - set proximity to user's location and use default locations bbox. Defaults to false. (optional)
      * @param {string} responseDataTypes - set Mapbox's data type response https://docs.mapbox.com/api/search/geocoding/#data-types (optional)
     */
     module.renderMapboxInput = function ({
diff --git a/corehq/toggles/__init__.py b/corehq/toggles/__init__.py
index a7cff835c6f2..37cfec2022a4 100644
--- a/corehq/toggles/__init__.py
+++ b/corehq/toggles/__init__.py
@@ -1019,12 +1019,14 @@ def _ensure_valid_randomness(randomness):
 
 GEOCODER_USER_PROXIMITY = StaticToggle(
     "geocoder_user_proximity",
-    "USH: Set the geocoder widget's proximity based on the user's location.",
+    "USH: Adjust geo coder result to be more relevant to user and project.",
     TAG_CUSTOM,
     namespaces=[NAMESPACE_DOMAIN],
     description="""
-    This has the effect of getting search results that are closer to the user's location. This will override
-    the domains default proximity setting ("Default project location").
+    This has two effects on getting geo coder search results:
+    1. Based on the bounding box of the project default location all result falling outside of it
+       will be filtered out.
+    2. Proximity to the users location will be taken into account for the results order.
     """,
     parent_toggles=[USH_CASE_CLAIM_UPDATES],
 )

From 501bcf08407cdb186e2283a7d4c663014fdbd314 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Fri, 19 Jan 2024 11:14:22 -0800
Subject: [PATCH 064/118] refactor: add enum constant for tracking queryData
 initiatedBy

---
 .../static/cloudcare/js/formplayer/constants.js       |  4 ++++
 .../static/cloudcare/js/formplayer/menus/api.js       |  2 +-
 .../cloudcare/js/formplayer/menus/views/query.js      | 11 ++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
index b1825fb9e9f2..d8e521bb1285 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
@@ -30,6 +30,10 @@ hqDefine("cloudcare/js/formplayer/constants", function () {
         ENTITIES: "entities",
         QUERY: "query",
 
+        queryInitiatedBy: {
+            DYNAMIC_SEARCH: 'dynamicSearch',
+        },
+
         SMALL_SCREEN_WIDTH_PX: 992,
 
         BREADCRUMB_HEIGHT_PX: 46.125,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
index 437235349281..05344ea9219c 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
@@ -172,7 +172,7 @@ hqDefine("cloudcare/js/formplayer/menus/api", function () {
 
                 var callStartTime = performance.now();
                 menus.fetch($.extend(true, {}, options)).always(function () {
-                    if (data.query_data && data.query_data.results && data.query_data.results.initiatedBy === "dynamicSearch") {
+                    if (data.query_data && data.query_data.results && data.query_data.results.initiatedBy === constants.queryInitiatedBy.DYNAMIC_SEARCH) {
                         var callEndTime = performance.now();
                         var callResponseTime = callEndTime - callStartTime;
                         $.ajax(initialPageData.reverse('api_histogram_metrics'), {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index 302477a4b2d4..1a20ae8b6536 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -6,7 +6,8 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
     var kissmetrics = hqImport("analytix/js/kissmetrix"),
         cloudcareUtils = hqImport("cloudcare/js/utils"),
         markdown = hqImport("cloudcare/js/markdown"),
-        constants = hqImport("cloudcare/js/form_entry/const"),
+        formEntryConstants = hqImport("cloudcare/js/form_entry/const"),
+        formplayerConstants = hqImport("cloudcare/js/formplayer/constants"),
         formEntryUtils = hqImport("cloudcare/js/form_entry/utils"),
         FormplayerFrontend = hqImport("cloudcare/js/formplayer/app"),
         formplayerUtils = hqImport("cloudcare/js/formplayer/utils/utils"),
@@ -128,7 +129,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
         geocoderOnClearCallback = function (addressTopic) {
             return function () {
                 kissmetrics.track.event("Accessibility Tracking - Geocoder Interaction in Case Search");
-                $.publish(addressTopic, constants.NO_ANSWER);
+                $.publish(addressTopic, formEntryConstants.NO_ANSWER);
             };
         },
         updateReceiver = function (element) {
@@ -137,8 +138,8 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
                 var receiveExpression = element.data().receive;
                 var receiveField = receiveExpression.split("-")[1];
                 var value = null;
-                if (broadcastObj === undefined || broadcastObj === constants.NO_ANSWER) {
-                    value = constants.NO_ANSWER;
+                if (broadcastObj === undefined || broadcastObj === formEntryConstants.NO_ANSWER) {
+                    value = formEntryConstants.NO_ANSWER;
                 } else if (broadcastObj[receiveField]) {
                     value = broadcastObj[receiveField];
                 } else {
@@ -741,7 +742,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
                 }
             });
             if (invalidRequiredFields.length === 0) {
-                self.performSubmit("dynamicSearch");
+                self.performSubmit(formplayerConstants.queryInitiatedBy.DYNAMIC_SEARCH);
             }
         },
 

From cd5a410790f8481bc8ed11378216d02eaf63f276 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Fri, 19 Jan 2024 13:57:54 -0600
Subject: [PATCH 065/118] Only use the bounding box for case search

Instead of using the bounding box to restrict all search results only uses for case search
---
 .../cloudcare/static/cloudcare/js/form_entry/utils.js     | 8 ++++----
 .../static/cloudcare/js/formplayer/menus/views/query.js   | 1 +
 corehq/toggles/__init__.py                                | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
index 5978989bd4f2..6e7e96b6d7d0 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
@@ -76,7 +76,7 @@ hqDefine("cloudcare/js/form_entry/utils", function () {
      * @param {function|undefined} inputOnKeyDown - inputOnKeyDown function (optional)
      * @param {boolean} showGeolocationButton - show geolocation button. Defaults to false. (optional)
      * @param {boolean} geolocateOnLoad - geolocate the user's location on load. Defaults to false. (optional)
-     * @param {boolean} setProximity - set proximity to user's location and use default locations bbox. Defaults to false. (optional)
+     * @param {boolean} useBoundingBox - use default locations bbox to filter results. Defaults to false. (optional)
      * @param {string} responseDataTypes - set Mapbox's data type response https://docs.mapbox.com/api/search/geocoding/#data-types (optional)
     */
     module.renderMapboxInput = function ({
@@ -86,12 +86,12 @@ hqDefine("cloudcare/js/form_entry/utils", function () {
         inputOnKeyDown,
         showGeolocationButton = false,
         geolocateOnLoad = false,
-        setProximity = false,
+        useBoundingBox = false,
         responseDataTypes = 'address'
     }) {
         showGeolocationButton = showGeolocationButton || toggles.toggleEnabled('GEOCODER_MY_LOCATION_BUTTON');
         geolocateOnLoad = geolocateOnLoad || toggles.toggleEnabled('GEOCODER_AUTOLOAD_USER_LOCATION');
-        setProximity = setProximity || toggles.toggleEnabled('GEOCODER_USER_PROXIMITY');
+        var setProximity = toggles.toggleEnabled('GEOCODER_USER_PROXIMITY');
         var defaultGeocoderLocation = initialPageData.get('default_geocoder_location') || {};
         var geocoder = new MapboxGeocoder({
             accessToken: initialPageData.get("mapbox_access_token"),
@@ -106,7 +106,7 @@ hqDefine("cloudcare/js/form_entry/utils", function () {
         } else if (defaultGeocoderLocation.coordinates) {
             geocoder.setProximity(defaultGeocoderLocation.coordinates);
         }
-        if (setProximity && defaultGeocoderLocation.bbox) {
+        if (setProximity && useBoundingBox && defaultGeocoderLocation.bbox) {
             geocoder.setBbox(defaultGeocoderLocation.bbox);
         }
         geocoder.on('clear', clearCallBack);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index 302477a4b2d4..a5a268627276 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -208,6 +208,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
                     itemCallback: geocoderItemCallback(id, model),
                     clearCallBack: geocoderOnClearCallback(id),
                     responseDataTypes: 'address,region,place,postcode',
+                    useBoundingBox: true,
                 });
                 var divEl = $field.find('.mapboxgl-ctrl-geocoder');
                 divEl.css("max-width", "none");
diff --git a/corehq/toggles/__init__.py b/corehq/toggles/__init__.py
index 37cfec2022a4..e152a3e28dbd 100644
--- a/corehq/toggles/__init__.py
+++ b/corehq/toggles/__init__.py
@@ -1025,7 +1025,7 @@ def _ensure_valid_randomness(randomness):
     description="""
     This has two effects on getting geo coder search results:
     1. Based on the bounding box of the project default location all result falling outside of it
-       will be filtered out.
+       will be filtered out when used in the case search.
     2. Proximity to the users location will be taken into account for the results order.
     """,
     parent_toggles=[USH_CASE_CLAIM_UPDATES],

From 5b928788f7e54cbea5e7cbbdafe2ecd078f6b2b6 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Fri, 19 Jan 2024 16:18:29 -0800
Subject: [PATCH 066/118] feat: adds tag for query initiated by field changes.
 This tag will be used on datadog

---
 .../static/cloudcare/js/formplayer/constants.js    |  1 +
 .../cloudcare/js/formplayer/menus/views/query.js   | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
index d8e521bb1285..bba17ddbcf3e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
@@ -32,6 +32,7 @@ hqDefine("cloudcare/js/formplayer/constants", function () {
 
         queryInitiatedBy: {
             DYNAMIC_SEARCH: 'dynamicSearch',
+            FIELD_CHANGE: "fieldChange",
         },
 
         SMALL_SCREEN_WIDTH_PX: 992,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index 1a20ae8b6536..462edfa4cfac 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -400,7 +400,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
                 // Geocoder doesn't have a real value, doesn't need to be sent to formplayer
                 return;
             }
-            this.parentView.notifyFieldChange(e, this, useDynamicSearch);
+            this.parentView.notifyFieldChange(e, this, useDynamicSearch, formplayerConstants.queryInitiatedBy.FIELD_CHANGE);
         },
 
         toggleBlankSearch: function (e) {
@@ -664,10 +664,10 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
             return answers;
         },
 
-        notifyFieldChange: function (e, changedChildView, useDynamicSearch) {
+        notifyFieldChange: function (e, changedChildView, useDynamicSearch, initiatedBy) {
             e.preventDefault();
             var self = this;
-            self.validateFieldChange(changedChildView).always(function (response) {
+            self.validateFieldChange(changedChildView, initiatedBy).always(function (response) {
                 var $fields = $(".query-field");
                 for (var i = 0; i < response.models.length; i++) {
                     var choices = response.models[i].get('itemsetChoices');
@@ -746,11 +746,11 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
             }
         },
 
-        validateFieldChange: function (changedChildView) {
+        validateFieldChange: function (changedChildView, initiatedBy) {
             var self = this;
             var promise = $.Deferred();
 
-            self._updateModelsForValidation().done(function (response) {
+            self._updateModelsForValidation(initiatedBy).done(function (response) {
                 //Gather error messages
                 self._getChildren().forEach(function (childView) {
                     //Filter out empty required fields and check for validity
@@ -800,7 +800,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
             return promise;
         },
 
-        _updateModelsForValidation: function () {
+        _updateModelsForValidation: function (initiatedBy) {
             var self = this;
             var promise = $.Deferred();
             self.updateModelsForValidation = promise;
@@ -810,7 +810,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", function () {
                 inputs: self.getAnswers(),
                 execute: false,
                 forceManualSearch: true,
-
+                initiatedBy: initiatedBy,
             });
             var fetchingPrompts = FormplayerFrontend.getChannel().request("app:select:menus", urlObject);
             $.when(fetchingPrompts).done(function (response) {

From 76a412fb6937cfb6402a1e15666b85dee2e6a3e7 Mon Sep 17 00:00:00 2001
From: Jonathan Tang <Jonahtang738@gmail.com>
Date: Fri, 19 Jan 2024 19:13:34 -0800
Subject: [PATCH 067/118] style: change to snakecase for compatibility as a
 Datadog tag.

dynamic_search value is currently not used as a Datadog tag but
this is changed here anyways pre-emptively
---
 .../cloudcare/static/cloudcare/js/formplayer/constants.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
index bba17ddbcf3e..2579bf3d106e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
@@ -30,9 +30,10 @@ hqDefine("cloudcare/js/formplayer/constants", function () {
         ENTITIES: "entities",
         QUERY: "query",
 
+        // values are snake case as recommended for Datadog tags
         queryInitiatedBy: {
-            DYNAMIC_SEARCH: 'dynamicSearch',
-            FIELD_CHANGE: "fieldChange",
+            DYNAMIC_SEARCH: 'dynamic_search',
+            FIELD_CHANGE: "field_change",
         },
 
         SMALL_SCREEN_WIDTH_PX: 992,

From f91a9e266247a63957d729e1516928e3581b9718 Mon Sep 17 00:00:00 2001
From: Akash Jain <akashjain@work.com>
Date: Sat, 20 Jan 2024 12:24:48 +0530
Subject: [PATCH 068/118] Remove self.rel_ix assignment from
 GroupedElementTileRow

---
 corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index f4fb36bc1f87..aeb7055e8001 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -727,8 +727,6 @@ hqDefine("cloudcare/js/form_entry/form_ui", function () {
         self.parent = parent;
         Container.call(self, json);
 
-        self.rel_ix = ko.observable(relativeIndex(self.ix()));
-
         self.hasAnyNestedQuestions = function () {
             return _.any(self.children(), function (d) {
                 if (d.type() === constants.QUESTION_TYPE) {

From cda8f2a60f629f8071dc5ca50bdc3e592e8d2bc9 Mon Sep 17 00:00:00 2001
From: Graham Herceg <gherceg@dimagi.com>
Date: Sat, 20 Jan 2024 10:14:00 -0500
Subject: [PATCH 069/118] Add test to ensure foreign key integrity in domain
 dump

Currently there are some SQL models included in the domain dump that
reference other models via a foreign key that are not included in the
domain dump. This leads to constraint violations when attempting to
load the dumped models.

Here is the output of this test at the time it was added:

AssertionError: Not all foreign key relationships will not be included in the domain dump.

data_interfaces.CaseRuleAction foreign keys to these uncovered models:
	data_interfaces.CaseDeduplicationActionDefinition

generic_inbound.ConfigurableAPI foreign keys to these uncovered models:
	userreports.UCRExpression

generic_inbound.ConfigurableApiValidation foreign keys to these uncovered models:
	userreports.UCRExpression

scheduling.AlertEvent foreign keys to these uncovered models:
	scheduling.SMSCallbackContent

scheduling.CasePropertyTimedEvent foreign keys to these uncovered models:
	scheduling.SMSCallbackContent

scheduling.RandomTimedEvent foreign keys to these uncovered models:
	scheduling.SMSCallbackContent

scheduling.TimedEvent foreign keys to these uncovered models:
	scheduling.SMSCallbackContent

users.RolePermission foreign keys to these uncovered models:
	users.Permission
---
 .../dump_reload/tests/test_dump_models.py     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/corehq/apps/dump_reload/tests/test_dump_models.py b/corehq/apps/dump_reload/tests/test_dump_models.py
index 0ad058f3b104..09ff1b83d261 100644
--- a/corehq/apps/dump_reload/tests/test_dump_models.py
+++ b/corehq/apps/dump_reload/tests/test_dump_models.py
@@ -1,6 +1,7 @@
 import itertools
 
 from django.apps import apps
+from django.db.models.fields.related import ForeignKey
 
 from corehq.apps.dump_reload.sql.dump import _get_app_list
 from corehq.apps.dump_reload.util import get_model_label
@@ -195,3 +196,24 @@ def _ignore_model(model):
     ]
     assert not uncovered_models, ("Not all Django models are covered by domain dump.\n"
         + '\n'.join(sorted(uncovered_models)))
+
+
+def test_foreign_keys_for_dumped_sql_models_are_also_included():
+    dump_apps = _get_app_list(set(), set())
+    covered_models = set(itertools.chain.from_iterable(dump_apps.values()))
+
+    uncovered_fks_by_model = {}
+    for model in covered_models:
+        foreign_keys = {field.remote_field.model for field in model._meta.fields if isinstance(field, ForeignKey)}
+        uncovered_foreign_keys = foreign_keys - covered_models
+        if uncovered_foreign_keys:
+            uncovered_fks_by_model[get_model_label(model)] = [get_model_label(m) for m in uncovered_foreign_keys]
+
+    assert (
+        not uncovered_fks_by_model
+    ), "Not all foreign key relationships will not be included in the domain dump.\n\n" + "\n\n".join(
+        [
+            f"{model} foreign keys to these uncovered models:\n\t" + "\n\t".join(fks)
+            for model, fks in sorted(uncovered_fks_by_model.items())
+        ]
+    )

From 873802be1aa02f851eab7b3234b64a6a72b43896 Mon Sep 17 00:00:00 2001
From: Graham Herceg <gherceg@dimagi.com>
Date: Sat, 20 Jan 2024 11:10:26 -0500
Subject: [PATCH 070/118] Make foreign key test for domain dump pass

CaseDeduplicationActionDefinition and UCRExpression were simply in
the UNKNOWN_MODELS list, so moving those into the dumped models was
straightforward. I double checked that the filters specified for each
model are correct, and tested by running dump_domain_data locally.

SMSCallbackContent appears to no longer be in use, and there is not
an easy way to fetch it by domain anyway. It is easiest to just
confirm if a domain has any entries for this object independently when
performing a domain dump.

Permission is an interesting one. While permissions are created on
fresh install, it seems precarious to rely on the creation to remain
consistent to the point where RolePermissions will always foreign
key to the correct Permission.
---
 corehq/apps/dump_reload/sql/dump.py              |  3 +++
 .../apps/dump_reload/tests/test_dump_models.py   | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/dump_reload/sql/dump.py b/corehq/apps/dump_reload/sql/dump.py
index b40ecd151ccd..9f26ff8b20af 100644
--- a/corehq/apps/dump_reload/sql/dump.py
+++ b/corehq/apps/dump_reload/sql/dump.py
@@ -114,6 +114,8 @@
                                        SimpleFilter('caserulecriteria__rule__domain')),
     FilteredModelIteratorBuilder('data_interfaces.CreateScheduleInstanceActionDefinition',
                                  SimpleFilter('caseruleaction__rule__domain')),
+    FilteredModelIteratorBuilder('data_interfaces.CaseDeduplicationActionDefinition',
+                                 SimpleFilter('caseruleaction__rule__domain')),
     FilteredModelIteratorBuilder('data_interfaces.CaseRuleAction', SimpleFilter('rule__domain')),
     FilteredModelIteratorBuilder('data_interfaces.CaseRuleCriteria', SimpleFilter('rule__domain')),
     FilteredModelIteratorBuilder('data_interfaces.CaseRuleSubmission', SimpleFilter('domain')),
@@ -211,6 +213,7 @@
     FilteredModelIteratorBuilder('fixtures.LookupTableRow', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('fixtures.LookupTableRowOwner', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('hqmedia.LogoForSystemEmailsReference', SimpleFilter('domain')),
+    FilteredModelIteratorBuilder('userreports.UCRExpression', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('generic_inbound.ConfigurableAPI', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('generic_inbound.ConfigurableApiValidation', SimpleFilter('api__domain')),
     FilteredModelIteratorBuilder('generic_inbound.RequestLog', SimpleFilter('domain')),
diff --git a/corehq/apps/dump_reload/tests/test_dump_models.py b/corehq/apps/dump_reload/tests/test_dump_models.py
index 09ff1b83d261..96b2407c8c6e 100644
--- a/corehq/apps/dump_reload/tests/test_dump_models.py
+++ b/corehq/apps/dump_reload/tests/test_dump_models.py
@@ -117,7 +117,6 @@
     "blobs.DeletedBlobMeta",
     "couchforms.UnfinishedArchiveStub",
     "couchforms.UnfinishedSubmissionStub",
-    "data_interfaces.CaseDeduplicationActionDefinition",
     "data_interfaces.CaseDuplicate",
     "dhis2.SQLDataSetMap",
     "dhis2.SQLDataValueMap",
@@ -163,7 +162,6 @@
     "userreports.AsyncIndicator",
     "userreports.DataSourceActionLog",
     "userreports.InvalidUCRData",
-    "userreports.UCRExpression",
     "users.HQApiKey",
     "users.UserHistory",
     "users.UserReportingMetadataStaging",
@@ -199,15 +197,25 @@ def _ignore_model(model):
 
 
 def test_foreign_keys_for_dumped_sql_models_are_also_included():
+    IGNORE_FK_MODELS = [
+        "scheduling.SMSCallbackContent",  # Model is no longer supported, so this would only impact old domains
+        "users.Permission",  # Permissions are created on fresh install
+        # -- If you add a model here, be sure to provide justification why it is safe to ignore --
+    ]
     dump_apps = _get_app_list(set(), set())
     covered_models = set(itertools.chain.from_iterable(dump_apps.values()))
 
     uncovered_fks_by_model = {}
     for model in covered_models:
         foreign_keys = {field.remote_field.model for field in model._meta.fields if isinstance(field, ForeignKey)}
-        uncovered_foreign_keys = foreign_keys - covered_models
+        uncovered_fk_models = foreign_keys - covered_models
+        uncovered_foreign_keys = [
+            label
+            for label in [get_model_label(model) for model in uncovered_fk_models]
+            if label not in IGNORE_FK_MODELS
+        ]
         if uncovered_foreign_keys:
-            uncovered_fks_by_model[get_model_label(model)] = [get_model_label(m) for m in uncovered_foreign_keys]
+            uncovered_fks_by_model[get_model_label(model)] = uncovered_foreign_keys
 
     assert (
         not uncovered_fks_by_model

From 2473d8fa98b6ceb1b06f77424547ae5bc22d865a Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Mon, 22 Jan 2024 12:04:32 +0530
Subject: [PATCH 071/118] don't show password in response

---
 corehq/apps/user_importer/importer.py            | 2 +-
 corehq/apps/user_importer/tests/test_importer.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/user_importer/importer.py b/corehq/apps/user_importer/importer.py
index c7105ae8b4b2..5020c9b9202b 100644
--- a/corehq/apps/user_importer/importer.py
+++ b/corehq/apps/user_importer/importer.py
@@ -502,7 +502,7 @@ def _parse_password(self):
         else:
             password = None
         self.column_values['password'] = password
-        self.status_row['row']['password'] = password
+        self.status_row['row']['password'] = ''
         if self.column_values['user_id'] and is_password(password):
             self.status_row['row']['password'] = 'REDACTED'
 
diff --git a/corehq/apps/user_importer/tests/test_importer.py b/corehq/apps/user_importer/tests/test_importer.py
index 4d0d90ae3fe4..53b591812a9c 100644
--- a/corehq/apps/user_importer/tests/test_importer.py
+++ b/corehq/apps/user_importer/tests/test_importer.py
@@ -892,7 +892,7 @@ def test_password_is_not_string(self):
             self.upload_record.pk,
             False
         )['messages']['rows']
-        self.assertEqual(rows[0]['row']['password'], "123")
+        self.user.check_password('123')
 
     def test_update_user_no_username(self):
         import_users_and_groups(

From e95ba67e7c2a24e61a782a546fac8ef367b0de3a Mon Sep 17 00:00:00 2001
From: Sravan Reddy <sravfeyn@gmail.com>
Date: Mon, 22 Jan 2024 14:06:28 +0530
Subject: [PATCH 072/118] refactor setup_users

---
 .../apps/user_importer/tests/test_importer.py | 34 +++++--------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/corehq/apps/user_importer/tests/test_importer.py b/corehq/apps/user_importer/tests/test_importer.py
index 78de5f76f30c..744bac323b07 100644
--- a/corehq/apps/user_importer/tests/test_importer.py
+++ b/corehq/apps/user_importer/tests/test_importer.py
@@ -4,6 +4,7 @@
 from django.contrib.admin.models import LogEntry
 from django.test import SimpleTestCase, TestCase, override_settings
 from django.utils.translation import gettext as _
+from django.test.utils import tag
 
 from unittest.mock import patch
 
@@ -1691,6 +1692,13 @@ def tearDown(self):
         Invitation.objects.all().delete()
         delete_all_users()
 
+    def setUp(self):
+        method = getattr(self, self._testMethodName)
+        tags = getattr(method, 'tags', {})
+        if 'skip_setup_users' in tags:
+            return
+        self.setup_users()
+
     def setup_users(self):
         self.user1 = WebUser.create(self.domain_name, 'hello@world.com', 'password', None, None,
                                     email='hello@world.com', is_superuser=False, first_name='Sally',
@@ -1735,7 +1743,6 @@ def _get_invited_spec(self, delete_keys=None, **kwargs):
         return spec
 
     def test_upload_with_missing_role(self):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_invited_spec(role='')],
@@ -1747,7 +1754,6 @@ def test_upload_with_missing_role(self):
         self.assertIsNone(self.user_invite)
 
     def test_upload_existing_web_user(self):
-        self.setup_users()
         web_user = WebUser.create(self.other_domain.name, 'existing@user.com', 'abc', None, None,
                                   email='existing@user.com')
         self.assertIsNone(Invitation.objects.filter(email='existing@user.com').first())
@@ -1774,7 +1780,6 @@ def test_upload_existing_web_user(self):
         self.assertEqual(user_history.changes, {})
 
     def test_web_user_user_name_change(self):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_spec(first_name='', last_name='')],
@@ -1792,7 +1797,6 @@ def test_web_user_user_name_change(self):
         self.assertNotIn('last_name', user_history.changes)
 
     def test_upper_case_email(self):
-        self.setup_users()
         email = 'hELlo@WoRld.Com'
         import_users_and_groups(
             self.domain.name,
@@ -1809,47 +1813,36 @@ def test_upper_case_email(self):
         self.assertNotIn('email', user_history.changes)
 
     def test_user_data(self):
-        self.setup_users()
         self._test_user_data(is_web_upload=True)
 
     def test_user_data_profile(self):
-        self.setup_users()
         self._test_user_data_profile(is_web_upload=True)
 
     def test_user_data_profile_redundant(self):
-        self.setup_users()
         self._test_user_data_profile_redundant(is_web_upload=True)
 
     def test_user_data_profile_blank(self):
-        self.setup_users()
         self._test_user_data_profile_blank(is_web_upload=True)
 
     def test_required_field_optional_if_profile_set(self):
-        self.setup_users()
         self._test_required_field_optional_if_profile_set(is_web_upload=True)
 
     def test_user_data_profile_conflict(self):
-        self.setup_users()
         self._test_user_data_profile_conflict(is_web_upload=True)
 
     def test_profile_cant_overwrite_existing_data(self):
-        self.setup_users()
         self._test_profile_cant_overwrite_existing_data(is_web_upload=True)
 
     def test_user_data_profile_unknown(self):
-        self.setup_users()
         self._test_user_data_profile_unknown(is_web_upload=True)
 
     def test_uncategorized_data(self):
-        self.setup_users()
         self._test_uncategorized_data(is_web_upload=True)
 
     def test_user_data_ignore_system_fields(self):
-        self.setup_users()
         self._test_user_data_ignore_system_fields(is_web_upload=True)
 
     def test_set_role(self):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_spec(role=self.role.name)],
@@ -1868,7 +1861,6 @@ def test_set_role(self):
         self.assertEqual(user_history.changes, {})
 
     def test_update_role_current_user(self):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_spec(role=self.role.name)],
@@ -1889,7 +1881,6 @@ def test_update_role_current_user(self):
         self.assertEqual(self.user.get_role(self.domain_name).name, self.other_role.name)
 
     def test_update_role_invited_user(self):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_invited_spec(role=self.role.name)],
@@ -1911,7 +1902,6 @@ def test_update_role_invited_user(self):
         self.assertEqual(self.user_invite.get_role_name(), self.other_role.name)
 
     def test_remove_user(self):
-        self.setup_users()
         username = 'a@a.com'
         WebUser.create(self.domain.name, username, 'password', None, None)
         import_users_and_groups(
@@ -1934,7 +1924,6 @@ def test_remove_user(self):
 
     def test_remove_invited_user(self):
         Invitation.objects.all().delete()
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_invited_spec()],
@@ -1955,7 +1944,6 @@ def test_remove_invited_user(self):
         self.assertIsNone(self.user_invite)
 
     def test_remove_uploading_user(self):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_spec(username=self.uploading_user.username, remove='True')],
@@ -1969,7 +1957,6 @@ def test_remove_uploading_user(self):
 
     @patch('corehq.apps.user_importer.importer.Invitation.send_activation_email')
     def test_upload_invite(self, mock_send_activation_email):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_invited_spec()],
@@ -1981,7 +1968,6 @@ def test_upload_invite(self, mock_send_activation_email):
         self.assertEqual(mock_send_activation_email.call_count, 1)
 
     def test_multi_domain(self):
-        self.setup_users()
         import_users_and_groups(
             self.domain.name,
             [self._get_spec(username='123@email.com',
@@ -1999,7 +1985,6 @@ def test_multi_domain(self):
 
     @patch('corehq.apps.user_importer.importer.domain_has_privilege', lambda x, y: True)
     def test_web_user_location_add(self):
-        self.setup_users()
         self.setup_locations()
         import_users_and_groups(
             self.domain.name,
@@ -2024,7 +2009,6 @@ def test_web_user_location_add(self):
 
     @patch('corehq.apps.user_importer.importer.domain_has_privilege', lambda x, y: True)
     def test_web_user_location_remove(self):
-        self.setup_users()
         self.setup_locations()
         import_users_and_groups(
             self.domain.name,
@@ -2061,7 +2045,6 @@ def test_web_user_location_remove(self):
 
     @patch('corehq.apps.user_importer.importer.domain_has_privilege', lambda x, y: True)
     def test_invite_location_add(self):
-        self.setup_users()
         self.setup_locations()
         import_users_and_groups(
             self.domain.name,
@@ -2111,6 +2094,7 @@ def _mock_update_user_responses(self, username):
             self.tableau_instance.add_user_to_group_response()
         ]
 
+    @tag('skip_setup_users')
     @flag_enabled('TABLEAU_USER_SYNCING')
     @patch('corehq.apps.reports.models.requests.request')
     def test_tableau_users(self, mock_request):

From 52a4cce012c7e3cb6c4b6863e104288f8aafce36 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Mon, 22 Jan 2024 14:57:05 +0200
Subject: [PATCH 073/118] add HTML template

---
 corehq/apps/geospatial/templates/map_visualization.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/geospatial/templates/map_visualization.html b/corehq/apps/geospatial/templates/map_visualization.html
index 1774f3c427b4..eb2ae55d32a7 100644
--- a/corehq/apps/geospatial/templates/map_visualization.html
+++ b/corehq/apps/geospatial/templates/map_visualization.html
@@ -106,7 +106,13 @@
         Previous disbursement was cleared.
     {% endblocktrans %}
 </div>
-<div id="geospatial-map" style="height: 500px"></div>
+<div id="geospatial-map" style="height: 500px">
+    <div id="layer-toggle-menu" class="btn-group-vertical">
+        <h4 class="text-center">
+            {% trans 'Layers' %}
+        </h4>
+    </div>
+</div>
 
 <!-- For Pagination -->
 <div class="panel-body-datatable">

From e9db230a492cde4aa0873225fec34205744b9267 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Mon, 22 Jan 2024 14:57:31 +0200
Subject: [PATCH 074/118] add styling for layers template

---
 corehq/apps/geospatial/templates/base_template.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/corehq/apps/geospatial/templates/base_template.html b/corehq/apps/geospatial/templates/base_template.html
index 2c5e99c10c08..7ae2a549f15a 100644
--- a/corehq/apps/geospatial/templates/base_template.html
+++ b/corehq/apps/geospatial/templates/base_template.html
@@ -14,6 +14,19 @@
  {{ block.super }}
  <link rel="stylesheet" href="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.css">
  <link rel="stylesheet" href="https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.4.0/mapbox-gl-draw.css" type="text/css">
+ <style>
+    #layer-toggle-menu {
+      background: #fff;
+      position: absolute;
+      z-index: 1;
+      top: 10px;
+      left: 10px;
+      max-height: 150px;
+      border: 1px solid rgba(0, 0, 0, 0.4);
+      overflow-y: auto;
+    }
+  </style>
+
  {% endblock %}
 
 

From ca2a055c88c42f323daeed26e681a622528bbc38 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Mon, 22 Jan 2024 14:59:14 +0200
Subject: [PATCH 075/118] implement func to add streets layers to map

---
 .../geospatial/static/geospatial/js/models.js | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 5f6d06eb90b4..488f0f888611 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -132,8 +132,56 @@ hqDefine('geospatial/js/models', [
             if (self.usesClusters) {
                 createClusterLayers();
             }
+
+            loadMapBoxStreetsLayers();
         };
 
+        function loadMapBoxStreetsLayers() {
+            self.mapInstance.on('load', () => {
+                self.mapInstance.addSource('mapbox-streets', {
+                    type: 'vector',
+                    url: 'mapbox://mapbox.mapbox-streets-v8',
+                });
+
+                self.mapInstance.addLayer({
+                    id: 'landuse_overlay',
+                    source: 'mapbox-streets',
+                    'source-layer': 'landuse_overlay',
+                    type: 'line',
+                    paint: {
+                        'line-color': '#800080', // purple
+                    },
+                    layout: {
+                        'visibility': 'none',
+                    },
+                });
+                self.mapInstance.addLayer({
+                    id: 'road',
+                    source: 'mapbox-streets',
+                    'source-layer': 'road',
+                    type: 'line',
+                    paint: {
+                        'line-color': '#000000', // black
+                    },
+                    'layout': {
+                        'visibility': 'none',
+                    },
+                });
+                self.mapInstance.addLayer({
+                    id: 'admin',
+                    source: 'mapbox-streets',
+                    'source-layer': 'admin',
+                    type: 'line',
+                    paint: {
+                        'line-color': '#800080', // purple
+                    },
+                    'layout': {
+                        'visibility': 'none',
+                    },
+                });
+            });
+        }
+
         function createClusterLayers() {
             // const mapInstance = self.mapInstance;
             self.mapInstance.on('load', () => {

From 62d86c52944ad9bcb61b7cd606a30e54dadd6d76 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Mon, 22 Jan 2024 15:00:39 +0200
Subject: [PATCH 076/118] implement func to toggle streets layers

---
 .../geospatial/static/geospatial/js/models.js | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 488f0f888611..6f86320ba50f 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -134,6 +134,7 @@ hqDefine('geospatial/js/models', [
             }
 
             loadMapBoxStreetsLayers();
+            addLayersToPanel();
         };
 
         function loadMapBoxStreetsLayers() {
@@ -182,6 +183,42 @@ hqDefine('geospatial/js/models', [
             });
         }
 
+        function addLayersToPanel() {
+            self.mapInstance.on('idle', () => {
+                const toggleableLayerIds = ['landuse_overlay', 'admin', 'road'];
+                const menuElement = document.getElementById('layer-toggle-menu');
+                for (const layerId of toggleableLayerIds) {
+                    // Skip if layer doesn't exist or button is already present
+                    if (!self.mapInstance.getLayer(layerId) || document.getElementById(layerId)) {
+                        continue;
+                    }
+
+                    const link = document.createElement('a');
+                    link.id = layerId;
+                    link.role = 'button';
+                    link.href = '#';
+                    link.textContent = layerId;
+                    link.className = 'btn btn-secondary';
+                    link.onclick = function (e) {
+                        const clickedLayer = this.textContent;
+                        e.preventDefault();
+                        e.stopPropagation();
+
+                        const visibility = self.mapInstance.getLayoutProperty(clickedLayer, 'visibility');
+                        if (visibility === 'visible') {
+                            self.mapInstance.setLayoutProperty(clickedLayer, 'visibility', 'none');
+                            this.classList.remove('active');
+                        } else {
+                            this.classList.add('active');
+                            self.mapInstance.setLayoutProperty(clickedLayer, 'visibility', 'visible');
+                        }
+                    };
+
+                    menuElement.appendChild(link);
+                }
+            });
+        }
+
         function createClusterLayers() {
             // const mapInstance = self.mapInstance;
             self.mapInstance.on('load', () => {

From 4c1b9a0d1e0fff2cbf662183701284b085fa85ae Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Mon, 22 Jan 2024 15:00:50 +0200
Subject: [PATCH 077/118] remove commented code

---
 corehq/apps/geospatial/static/geospatial/js/models.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 6f86320ba50f..28e204efca13 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -220,7 +220,6 @@ hqDefine('geospatial/js/models', [
         }
 
         function createClusterLayers() {
-            // const mapInstance = self.mapInstance;
             self.mapInstance.on('load', () => {
                 self.mapInstance.addSource('caseWithGPS', {
                     type: 'geojson',

From a1c4a8893509b5096c01ac8de2d5c55174ad8b3d Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Mon, 22 Jan 2024 15:15:37 +0200
Subject: [PATCH 078/118] conditionally load streets layers

---
 .../geospatial/static/geospatial/js/geospatial_map.js    | 2 +-
 corehq/apps/geospatial/static/geospatial/js/models.js    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js b/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
index bbb3f0f979cb..58c996b0b957 100644
--- a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+++ b/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
@@ -225,7 +225,7 @@ hqDefine("geospatial/js/geospatial_map", [
     };
 
     function initMap() {
-        mapModel = new models.Map();
+        mapModel = new models.Map(false, true);
         mapModel.initMap(MAP_CONTAINER_ID);
 
         let selectedCases = ko.computed(function () {
diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 28e204efca13..1d37ec69878d 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -91,10 +91,11 @@ hqDefine('geospatial/js/models', [
         };
     };
 
-    var Map = function (usesClusters) {
+    var Map = function (usesClusters, usesStreetsLayers) {
         var self = this;
 
         self.usesClusters = usesClusters;
+        self.usesStreetsLayers = usesStreetsLayers;
 
         self.mapInstance;
         self.drawControls;
@@ -133,8 +134,10 @@ hqDefine('geospatial/js/models', [
                 createClusterLayers();
             }
 
-            loadMapBoxStreetsLayers();
-            addLayersToPanel();
+            if (self.usesStreetsLayers) {
+                loadMapBoxStreetsLayers();
+                addLayersToPanel();
+            }
         };
 
         function loadMapBoxStreetsLayers() {

From a665c41aaf5cbbea90b153ba58b8e56101cac005 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Mon, 22 Jan 2024 15:15:57 +0200
Subject: [PATCH 079/118] hide layers toggle menu until loaded

---
 corehq/apps/geospatial/static/geospatial/js/models.js   | 1 +
 corehq/apps/geospatial/templates/map_visualization.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 1d37ec69878d..965030040530 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -219,6 +219,7 @@ hqDefine('geospatial/js/models', [
 
                     menuElement.appendChild(link);
                 }
+                menuElement.classList.remove('hidden');
             });
         }
 
diff --git a/corehq/apps/geospatial/templates/map_visualization.html b/corehq/apps/geospatial/templates/map_visualization.html
index eb2ae55d32a7..77195945853b 100644
--- a/corehq/apps/geospatial/templates/map_visualization.html
+++ b/corehq/apps/geospatial/templates/map_visualization.html
@@ -107,7 +107,7 @@
     {% endblocktrans %}
 </div>
 <div id="geospatial-map" style="height: 500px">
-    <div id="layer-toggle-menu" class="btn-group-vertical">
+    <div id="layer-toggle-menu" class="btn-group-vertical hidden">
         <h4 class="text-center">
             {% trans 'Layers' %}
         </h4>

From c9c90d9cf3d7810ca440393c7875cd3b3221685b Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 22 Jan 2024 10:22:25 -0500
Subject: [PATCH 080/118] check feature support when adding to detail

---
 corehq/apps/app_manager/suite_xml/sections/details.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/app_manager/suite_xml/sections/details.py b/corehq/apps/app_manager/suite_xml/sections/details.py
index 5dec28d5d8e1..abb7ad55a288 100644
--- a/corehq/apps/app_manager/suite_xml/sections/details.py
+++ b/corehq/apps/app_manager/suite_xml/sections/details.py
@@ -557,7 +557,7 @@ def add_no_items_text_to_detail(detail, app, detail_type, module):
 
     @staticmethod
     def add_select_text_to_detail(detail, app, detail_type, module):
-        if detail_type.endswith('short'):
+        if detail_type.endswith('short') and app.supports_select_text:
             detail.select_text = Text(locale_id=id_strings.select_text_detail(module))
 
 

From e0bd5f57d0e471b665e5dba5c872f810cf4463b4 Mon Sep 17 00:00:00 2001
From: Graham Herceg <gherceg@dimagi.com>
Date: Mon, 22 Jan 2024 10:29:44 -0500
Subject: [PATCH 081/118] Fix assertion text typo

Co-authored-by: Norman Hooper <708421+kaapstorm@users.noreply.github.com>
---
 corehq/apps/dump_reload/tests/test_dump_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/dump_reload/tests/test_dump_models.py b/corehq/apps/dump_reload/tests/test_dump_models.py
index 96b2407c8c6e..4adaf1b383ba 100644
--- a/corehq/apps/dump_reload/tests/test_dump_models.py
+++ b/corehq/apps/dump_reload/tests/test_dump_models.py
@@ -219,7 +219,7 @@ def test_foreign_keys_for_dumped_sql_models_are_also_included():
 
     assert (
         not uncovered_fks_by_model
-    ), "Not all foreign key relationships will not be included in the domain dump.\n\n" + "\n\n".join(
+    ), "Not all foreign key relationships will be included in the domain dump.\n\n" + "\n\n".join(
         [
             f"{model} foreign keys to these uncovered models:\n\t" + "\n\t".join(fks)
             for model, fks in sorted(uncovered_fks_by_model.items())

From 8491d58cb21040005c89519b0d682282c6829ed2 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Mon, 22 Jan 2024 12:29:13 -0500
Subject: [PATCH 082/118] test non-default text

---
 .../tests/data/bulk_app_translation/download/app.json         | 1 +
 corehq/apps/translations/tests/test_bulk_app_translation.py   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json b/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json
index 1ea7b7524d63..429dd180f47f 100644
--- a/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json
+++ b/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json
@@ -2105,6 +2105,7 @@
           "lookup_field_header": {},
           "custom_variables": null,
           "pull_down_tile": null,
+          "select_text": {"en": "Continue with Case(s)"},
           "columns": [
             {
               "doc_type": "DetailColumn",
diff --git a/corehq/apps/translations/tests/test_bulk_app_translation.py b/corehq/apps/translations/tests/test_bulk_app_translation.py
index f6a9b4f441db..6323b53d1104 100644
--- a/corehq/apps/translations/tests/test_bulk_app_translation.py
+++ b/corehq/apps/translations/tests/test_bulk_app_translation.py
@@ -146,7 +146,7 @@
     ('menu5', ()),
     ('menu6',
      (('no_items_text', 'list', 'List is empty.'),
-      ('select_text', 'list', 'Continue'),
+      ('select_text', 'list', 'Continue with Case(s)'),
       ('name', 'list', 'Name'),
       ('name', 'detail', 'Name'))),
     ('menu6_form1',
@@ -1305,7 +1305,7 @@ def test_bulk_app_single_sheet_rows(self):
             ['menu5', '', '', '', 'Empty Reports Module', '', '', '', '703eb807ae584d1ba8bf9457d7ac7590'],
 
             ['menu6', '', '', '', 'Advanced Module', None, None, '', '7f75ed4c15be44509591f41b3d80746e'],
-            ['menu6', 'select_text', 'list', '', 'Continue', '', '', '', ''],
+            ['menu6', 'select_text', 'list', '', 'Continue with Case(s)', '', '', '', ''],
             ['menu6', 'name', 'list', '', 'Name', '', '', '', ''],
             ['menu6', 'name', 'detail', '', 'Name', '', '', '', ''],
 

From b853f3f49f997a1713186ea579235d88da8ac313 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Mon, 22 Jan 2024 11:36:32 -0600
Subject: [PATCH 083/118] Save bounding box for default location in bootstrap 3

---
 corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js
index 326df8ea267f..53449869cda3 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js
@@ -79,6 +79,7 @@ hqDefine("hqwebapp/js/bootstrap3/widgets",[
                         longitude: item.geometry.coordinates[0],
                         latitude: item.geometry.coordinates[1],
                     };
+                    geoObj.bbox = item.bbox;
                     inputEl.attr("value", JSON.stringify(geoObj));
                     return item.place_name;
                 }

From d6ab6d3377eda2a0b53302a992b34fc82ff44451 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Mon, 22 Jan 2024 13:33:12 -0600
Subject: [PATCH 084/118] Linting

---
 .../static/cloudcare/js/form_entry/utils.js   |   2 +-
 .../static/hqwebapp/js/bootstrap3/widgets.js  | 215 +++++++++---------
 2 files changed, 108 insertions(+), 109 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
index 6e7e96b6d7d0..fa93aa24338f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
@@ -87,7 +87,7 @@ hqDefine("cloudcare/js/form_entry/utils", function () {
         showGeolocationButton = false,
         geolocateOnLoad = false,
         useBoundingBox = false,
-        responseDataTypes = 'address'
+        responseDataTypes = 'address',
     }) {
         showGeolocationButton = showGeolocationButton || toggles.toggleEnabled('GEOCODER_MY_LOCATION_BUTTON');
         geolocateOnLoad = geolocateOnLoad || toggles.toggleEnabled('GEOCODER_AUTOLOAD_USER_LOCATION');
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js
index 53449869cda3..5b801c56edac 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/widgets.js
@@ -1,126 +1,125 @@
 hqDefine("hqwebapp/js/bootstrap3/widgets",[
-        'jquery',
-        'underscore',
-        '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.min',
-        'hqwebapp/js/initial_page_data',
-        'select2/dist/js/select2.full.min',
-        'jquery-ui/ui/widgets/datepicker',
-    ], function ($, _, MapboxGeocoder, initialPageData) {
-        var init = function () {
-            var MAPBOX_ACCESS_TOKEN = initialPageData.get(
-                "mapbox_access_token"
-            );
-            // .hqwebapp-select2 is a basic select2-based dropdown or multiselect
-            _.each($(".hqwebapp-select2"), function (element) {
-                $(element).select2({
-                    width: '100%',
-                });
-                if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-invalid')) {
-                    $(element).data('select2').$container.addClass('is-invalid');
-                }
-                if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-valid')) {
-                    $(element).data('select2').$container.addClass('is-valid');
-                }
+    'jquery',
+    'underscore',
+    '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.min',
+    'hqwebapp/js/initial_page_data',
+    'select2/dist/js/select2.full.min',
+    'jquery-ui/ui/widgets/datepicker',
+], function ($, _, MapboxGeocoder, initialPageData) {
+    var init = function () {
+        var MAPBOX_ACCESS_TOKEN = initialPageData.get(
+            "mapbox_access_token"
+        );
+        // .hqwebapp-select2 is a basic select2-based dropdown or multiselect
+        _.each($(".hqwebapp-select2"), function (element) {
+            $(element).select2({
+                width: '100%',
             });
+            if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-invalid')) {
+                $(element).data('select2').$container.addClass('is-invalid');
+            }
+            if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-valid')) {
+                $(element).data('select2').$container.addClass('is-valid');
+            }
+        });
 
-            // .hqwebapp-autocomplete also allows for free text entry
-            _.each($(".hqwebapp-autocomplete"), function (input) {
-                var $input = $(input);
-                $input.select2({
-                    multiple: true,
-                    tags: true,
-                    width: '100%',
-                });
+        // .hqwebapp-autocomplete also allows for free text entry
+        _.each($(".hqwebapp-autocomplete"), function (input) {
+            var $input = $(input);
+            $input.select2({
+                multiple: true,
+                tags: true,
+                width: '100%',
             });
+        });
 
-            _.each($(".hqwebapp-autocomplete-email"), function (input) {
-                var $input = $(input);
-                $input.select2({
-                    multiple: true,
-                    placeholder: ' ',
-                    tags: true,
-                    tokenSeparators: [','],
-                    width: '100%',
-                    createTag: function (params) {
-                        // Support pasting in comma-separated values
-                        var terms = parseEmails(params.term);
-                        if (terms.length === 1) {
-                            return {
-                                id: terms[0],
-                                text: terms[0],
-                            };
-                        }
-                        $input.select2('close');
-                        var values = $input.val() || [];
-                        if (!_.isArray(values)) {
-                            values = [values];
+        _.each($(".hqwebapp-autocomplete-email"), function (input) {
+            var $input = $(input);
+            $input.select2({
+                multiple: true,
+                placeholder: ' ',
+                tags: true,
+                tokenSeparators: [','],
+                width: '100%',
+                createTag: function (params) {
+                    // Support pasting in comma-separated values
+                    var terms = parseEmails(params.term);
+                    if (terms.length === 1) {
+                        return {
+                            id: terms[0],
+                            text: terms[0],
+                        };
+                    }
+                    $input.select2('close');
+                    var values = $input.val() || [];
+                    if (!_.isArray(values)) {
+                        values = [values];
+                    }
+                    _.each(terms, function (term) {
+                        if (!_.contains(values, term)) {
+                            $input.append(new Option(term, term));
+                            values.push(term);
                         }
-                        _.each(terms, function (term) {
-                            if (!_.contains(values, term)) {
-                                $input.append(new Option(term, term));
-                                values.push(term);
-                            }
-                        });
-                        $input.val(values).trigger("change");
+                    });
+                    $input.val(values).trigger("change");
 
-                        return null;
-                    },
-                });
+                    return null;
+                },
             });
+        });
 
-            _.each($(".geocoder-proximity"), function (input) {
-                var $input = $(input).find('input');
-
-                function getGeocoderItem(item) {
-                    var inputEl = $input;
-                    var geoObj = {};
-                    geoObj.place_name = item.place_name;
-                    geoObj.coordinates = {
-                        longitude: item.geometry.coordinates[0],
-                        latitude: item.geometry.coordinates[1],
-                    };
-                    geoObj.bbox = item.bbox;
-                    inputEl.attr("value", JSON.stringify(geoObj));
-                    return item.place_name;
-                }
-
-                function getGeocoderValue() {
-                    var geocoderValue = $input.val();
-                    if (geocoderValue) {
-                        geocoderValue = JSON.parse(geocoderValue);
-                        return geocoderValue.place_name;
-                    }
-                    return null;
-                }
+        _.each($(".geocoder-proximity"), function (input) {
+            var $input = $(input).find('input');
 
-                var geocoder = new MapboxGeocoder({
-                    accessToken: MAPBOX_ACCESS_TOKEN,
-                    types:
-                        "country,region,place,postcode,locality,neighborhood",
-                    getItemValue: getGeocoderItem,
-                });
+            function getGeocoderItem(item) {
+                var inputEl = $input;
+                var geoObj = {};
+                geoObj.place_name = item.place_name;
+                geoObj.coordinates = {
+                    longitude: item.geometry.coordinates[0],
+                    latitude: item.geometry.coordinates[1],
+                };
+                geoObj.bbox = item.bbox;
+                inputEl.attr("value", JSON.stringify(geoObj));
+                return item.place_name;
+            }
 
-                geocoder.addTo(".geocoder-proximity");
-                var geocoderValue = getGeocoderValue();
+            function getGeocoderValue() {
+                var geocoderValue = $input.val();
                 if (geocoderValue) {
-                    geocoder.setInput(getGeocoderValue());
+                    geocoderValue = JSON.parse(geocoderValue);
+                    return geocoderValue.place_name;
                 }
+                return null;
+            }
+
+            var geocoder = new MapboxGeocoder({
+                accessToken: MAPBOX_ACCESS_TOKEN,
+                types:
+                    "country,region,place,postcode,locality,neighborhood",
+                getItemValue: getGeocoderItem,
             });
 
-            $('.date-picker').datepicker({ dateFormat: "yy-mm-dd" });
-        };
+            geocoder.addTo(".geocoder-proximity");
+            var geocoderValue = getGeocoderValue();
+            if (geocoderValue) {
+                geocoder.setInput(getGeocoderValue());
+            }
+        });
+
+        $('.date-picker').datepicker({ dateFormat: "yy-mm-dd" });
+    };
 
-        var parseEmails = function (input) {
-            return $.trim(input).split(/[, ]\s*/);
-        };
+    var parseEmails = function (input) {
+        return $.trim(input).split(/[, ]\s*/);
+    };
 
-        $(function () {
-            init();
-        });
+    $(function () {
+        init();
+    });
 
-        return {
-            init: init,
-            parseEmails: parseEmails, // export for testing
-        };
-    }
-);
+    return {
+        init: init,
+        parseEmails: parseEmails, // export for testing
+    };
+});

From 0beb2c040680ca4bdf06fbea18a3edde4301753c Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Mon, 22 Jan 2024 13:45:24 -0600
Subject: [PATCH 085/118] That was just for fixing the indentation according to
 the linter

---
 .../javascript/hqwebapp/widgets.js.diff.txt   | 251 +++++++++++++++++-
 1 file changed, 247 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/widgets.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/widgets.js.diff.txt
index fe9905195bb0..9d1a04318d6f 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/widgets.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/widgets.js.diff.txt
@@ -1,8 +1,251 @@
 --- 
 +++ 
-@@ -1,4 +1,4 @@
+@@ -1,125 +1,126 @@
 -hqDefine("hqwebapp/js/bootstrap3/widgets",[
+-    'jquery',
+-    'underscore',
+-    '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.min',
+-    'hqwebapp/js/initial_page_data',
+-    'select2/dist/js/select2.full.min',
+-    'jquery-ui/ui/widgets/datepicker',
+-], function ($, _, MapboxGeocoder, initialPageData) {
+-    var init = function () {
+-        var MAPBOX_ACCESS_TOKEN = initialPageData.get(
+-            "mapbox_access_token"
+-        );
+-        // .hqwebapp-select2 is a basic select2-based dropdown or multiselect
+-        _.each($(".hqwebapp-select2"), function (element) {
+-            $(element).select2({
+-                width: '100%',
 +hqDefine("hqwebapp/js/bootstrap5/widgets",[
-         'jquery',
-         'underscore',
-         '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.min',
++        'jquery',
++        'underscore',
++        '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.min',
++        'hqwebapp/js/initial_page_data',
++        'select2/dist/js/select2.full.min',
++        'jquery-ui/ui/widgets/datepicker',
++    ], function ($, _, MapboxGeocoder, initialPageData) {
++        var init = function () {
++            var MAPBOX_ACCESS_TOKEN = initialPageData.get(
++                "mapbox_access_token"
++            );
++            // .hqwebapp-select2 is a basic select2-based dropdown or multiselect
++            _.each($(".hqwebapp-select2"), function (element) {
++                $(element).select2({
++                    width: '100%',
++                });
++                if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-invalid')) {
++                    $(element).data('select2').$container.addClass('is-invalid');
++                }
++                if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-valid')) {
++                    $(element).data('select2').$container.addClass('is-valid');
++                }
+             });
+-            if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-invalid')) {
+-                $(element).data('select2').$container.addClass('is-invalid');
+-            }
+-            if (window.USE_BOOTSTRAP5 && $(element).hasClass('is-valid')) {
+-                $(element).data('select2').$container.addClass('is-valid');
+-            }
++
++            // .hqwebapp-autocomplete also allows for free text entry
++            _.each($(".hqwebapp-autocomplete"), function (input) {
++                var $input = $(input);
++                $input.select2({
++                    multiple: true,
++                    tags: true,
++                    width: '100%',
++                });
++            });
++
++            _.each($(".hqwebapp-autocomplete-email"), function (input) {
++                var $input = $(input);
++                $input.select2({
++                    multiple: true,
++                    placeholder: ' ',
++                    tags: true,
++                    tokenSeparators: [','],
++                    width: '100%',
++                    createTag: function (params) {
++                        // Support pasting in comma-separated values
++                        var terms = parseEmails(params.term);
++                        if (terms.length === 1) {
++                            return {
++                                id: terms[0],
++                                text: terms[0],
++                            };
++                        }
++                        $input.select2('close');
++                        var values = $input.val() || [];
++                        if (!_.isArray(values)) {
++                            values = [values];
++                        }
++                        _.each(terms, function (term) {
++                            if (!_.contains(values, term)) {
++                                $input.append(new Option(term, term));
++                                values.push(term);
++                            }
++                        });
++                        $input.val(values).trigger("change");
++
++                        return null;
++                    },
++                });
++            });
++
++            _.each($(".geocoder-proximity"), function (input) {
++                var $input = $(input).find('input');
++
++                function getGeocoderItem(item) {
++                    var inputEl = $input;
++                    var geoObj = {};
++                    geoObj.place_name = item.place_name;
++                    geoObj.coordinates = {
++                        longitude: item.geometry.coordinates[0],
++                        latitude: item.geometry.coordinates[1],
++                    };
++                    geoObj.bbox = item.bbox;
++                    inputEl.attr("value", JSON.stringify(geoObj));
++                    return item.place_name;
++                }
++
++                function getGeocoderValue() {
++                    var geocoderValue = $input.val();
++                    if (geocoderValue) {
++                        geocoderValue = JSON.parse(geocoderValue);
++                        return geocoderValue.place_name;
++                    }
++                    return null;
++                }
++
++                var geocoder = new MapboxGeocoder({
++                    accessToken: MAPBOX_ACCESS_TOKEN,
++                    types:
++                        "country,region,place,postcode,locality,neighborhood",
++                    getItemValue: getGeocoderItem,
++                });
++
++                geocoder.addTo(".geocoder-proximity");
++                var geocoderValue = getGeocoderValue();
++                if (geocoderValue) {
++                    geocoder.setInput(getGeocoderValue());
++                }
++            });
++
++            $('.date-picker').datepicker({ dateFormat: "yy-mm-dd" });
++        };
++
++        var parseEmails = function (input) {
++            return $.trim(input).split(/[, ]\s*/);
++        };
++
++        $(function () {
++            init();
+         });
+ 
+-        // .hqwebapp-autocomplete also allows for free text entry
+-        _.each($(".hqwebapp-autocomplete"), function (input) {
+-            var $input = $(input);
+-            $input.select2({
+-                multiple: true,
+-                tags: true,
+-                width: '100%',
+-            });
+-        });
+-
+-        _.each($(".hqwebapp-autocomplete-email"), function (input) {
+-            var $input = $(input);
+-            $input.select2({
+-                multiple: true,
+-                placeholder: ' ',
+-                tags: true,
+-                tokenSeparators: [','],
+-                width: '100%',
+-                createTag: function (params) {
+-                    // Support pasting in comma-separated values
+-                    var terms = parseEmails(params.term);
+-                    if (terms.length === 1) {
+-                        return {
+-                            id: terms[0],
+-                            text: terms[0],
+-                        };
+-                    }
+-                    $input.select2('close');
+-                    var values = $input.val() || [];
+-                    if (!_.isArray(values)) {
+-                        values = [values];
+-                    }
+-                    _.each(terms, function (term) {
+-                        if (!_.contains(values, term)) {
+-                            $input.append(new Option(term, term));
+-                            values.push(term);
+-                        }
+-                    });
+-                    $input.val(values).trigger("change");
+-
+-                    return null;
+-                },
+-            });
+-        });
+-
+-        _.each($(".geocoder-proximity"), function (input) {
+-            var $input = $(input).find('input');
+-
+-            function getGeocoderItem(item) {
+-                var inputEl = $input;
+-                var geoObj = {};
+-                geoObj.place_name = item.place_name;
+-                geoObj.coordinates = {
+-                    longitude: item.geometry.coordinates[0],
+-                    latitude: item.geometry.coordinates[1],
+-                };
+-                geoObj.bbox = item.bbox;
+-                inputEl.attr("value", JSON.stringify(geoObj));
+-                return item.place_name;
+-            }
+-
+-            function getGeocoderValue() {
+-                var geocoderValue = $input.val();
+-                if (geocoderValue) {
+-                    geocoderValue = JSON.parse(geocoderValue);
+-                    return geocoderValue.place_name;
+-                }
+-                return null;
+-            }
+-
+-            var geocoder = new MapboxGeocoder({
+-                accessToken: MAPBOX_ACCESS_TOKEN,
+-                types:
+-                    "country,region,place,postcode,locality,neighborhood",
+-                getItemValue: getGeocoderItem,
+-            });
+-
+-            geocoder.addTo(".geocoder-proximity");
+-            var geocoderValue = getGeocoderValue();
+-            if (geocoderValue) {
+-                geocoder.setInput(getGeocoderValue());
+-            }
+-        });
+-
+-        $('.date-picker').datepicker({ dateFormat: "yy-mm-dd" });
+-    };
+-
+-    var parseEmails = function (input) {
+-        return $.trim(input).split(/[, ]\s*/);
+-    };
+-
+-    $(function () {
+-        init();
+-    });
+-
+-    return {
+-        init: init,
+-        parseEmails: parseEmails, // export for testing
+-    };
+-});
++        return {
++            init: init,
++            parseEmails: parseEmails, // export for testing
++        };
++    }
++);

From 3fab2f7966571faac8ccedb353be1c6fae4e6b6c Mon Sep 17 00:00:00 2001
From: Graham Herceg <gherceg@dimagi.com>
Date: Mon, 22 Jan 2024 13:59:02 -0500
Subject: [PATCH 086/118]     Remove SMSCallbackContent from IGNORE_FK_MODELS

    It's easier to include SMSCallbackContent in the dumped data than it is
    to ensure future operators of dump_domain_data are aware of potentially
    ignored models that impact a domain. IGNORE_FK_MODELS should be reserved
    for truly unique instances, like the users.Permission model which will
    be recreated on the fresh environment domain data is loaded into.
---
 corehq/apps/dump_reload/sql/dump.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/corehq/apps/dump_reload/sql/dump.py b/corehq/apps/dump_reload/sql/dump.py
index 9f26ff8b20af..726869a83911 100644
--- a/corehq/apps/dump_reload/sql/dump.py
+++ b/corehq/apps/dump_reload/sql/dump.py
@@ -46,6 +46,14 @@
                                        SimpleFilter('randomtimedevent__schedule__domain')),
     UniqueFilteredModelIteratorBuilder('scheduling.SMSContent',
                                        SimpleFilter('casepropertytimedevent__schedule__domain')),
+    UniqueFilteredModelIteratorBuilder('scheduling.SMSCallbackContent',
+                                       SimpleFilter('alertevent__schedule__domain')),
+    UniqueFilteredModelIteratorBuilder('scheduling.SMSCallbackContent',
+                                       SimpleFilter('timedevent__schedule__domain')),
+    UniqueFilteredModelIteratorBuilder('scheduling.SMSCallbackContent',
+                                       SimpleFilter('randomtimedevent__schedule__domain')),
+    UniqueFilteredModelIteratorBuilder('scheduling.SMSCallbackContent',
+                                       SimpleFilter('casepropertytimedevent__schedule__domain')),
     UniqueFilteredModelIteratorBuilder('scheduling.EmailContent', SimpleFilter('alertevent__schedule__domain')),
     UniqueFilteredModelIteratorBuilder('scheduling.EmailContent', SimpleFilter('timedevent__schedule__domain')),
     UniqueFilteredModelIteratorBuilder('scheduling.EmailContent',

From 7856bfcb9a0943af0c08aa272c9b470e0b419327 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Mon, 22 Jan 2024 17:21:04 -0500
Subject: [PATCH 087/118] Added unregister function

---
 .../hqwebapp/static/hqwebapp/js/initial_page_data.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/initial_page_data.js b/corehq/apps/hqwebapp/static/hqwebapp/js/initial_page_data.js
index 2895a5763029..fc4de2b5d29b 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/initial_page_data.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/initial_page_data.js
@@ -55,6 +55,17 @@ hqDefine('hqwebapp/js/initial_page_data', ['jquery', 'underscore'], function ($,
         _initData[name] = value;
     };
 
+    /*
+     * Remove item from initial page data.
+     * Useful for mocha test cleanup.
+     */
+    var unregister = function (name) {
+        if (_initData[name] === undefined) {
+            throw new Error("Could not unregister initial page data: " + name);
+        }
+        delete _initData[name];
+    };
+
     // http://stackoverflow.com/a/21903119/240553
     var getUrlParameter = function (param) {
         return getUrlParameterFromString(param, window.location.search);
@@ -116,6 +127,7 @@ hqDefine('hqwebapp/js/initial_page_data', ['jquery', 'underscore'], function ($,
         gather: gather,
         get: get,
         register: register,
+        unregister: unregister,
         getUrlParameter: getUrlParameter,
         getUrlParameterFromString: getUrlParameterFromString,
         registerUrl: registerUrl,

From 41f499f8bcfd2bbd73ef4f3fef1d7b68058aff3a Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Mon, 22 Jan 2024 17:27:51 -0500
Subject: [PATCH 088/118] Updated form_entry tests

---
 .../cloudcare/js/form_entry/spec/entries_spec.js   |  4 ++++
 .../cloudcare/js/form_entry/spec/form_ui_spec.js   | 14 ++++++++++++++
 .../js/form_entry/spec/integration_spec.js         |  8 ++++++++
 .../cloudcare/js/form_entry/spec/utils_spec.js     |  3 +++
 .../js/form_entry/spec/web_form_session_spec.js    |  8 ++++++++
 5 files changed, 37 insertions(+)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js
index 8218729d7ad4..e75b924e1add 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js
@@ -23,6 +23,10 @@ hqDefine("cloudcare/js/form_entry/spec/entries_spec", function () {
             );
         });
 
+        after(function () {
+            hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
+        });
+
         beforeEach(function () {
             window.MAPBOX_ACCESS_TOKEN = 'xxx';
             questionJSON = {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
index ae2c1ff647ac..74682de463f5 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
@@ -13,6 +13,20 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", function () {
             repeatJSON,
             repeatNestJSON;
 
+        before(function () {
+            hqImport("hqwebapp/js/initial_page_data").register(
+                "toggles_dict",
+                {
+                    WEB_APPS_UPLOAD_QUESTIONS: true,
+                    WEB_APPS_ANCHORED_SUBMIT: false,
+                }
+            );
+        });
+
+        after(function () {
+            hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
+        });
+
         beforeEach(function () {
             questionJSON = fixtures.selectJSON();
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js
index a700d55effec..c978bd8b0809 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js
@@ -7,6 +7,14 @@ hqDefine("cloudcare/js/form_entry/spec/integration_spec", function () {
             questionJSONMulti,
             questionJSONString;
 
+        before(function () {
+            hqImport("hqwebapp/js/initial_page_data").register("toggles_dict", { WEB_APPS_ANCHORED_SUBMIT: false });
+        });
+
+        after(function () {
+            hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
+        });
+
         beforeEach(function () {
             questionJSONMulti = {
                 "caption_audio": null,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
index ca7c14f2a092..14c11b0a2987 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
@@ -31,6 +31,7 @@ hqDefine("cloudcare/js/form_entry/spec/utils_spec", function () {
              *         groupInRepeat
              *             textInRepeat
              */
+            hqImport("hqwebapp/js/initial_page_data").register("toggles_dict", { WEB_APPS_ANCHORED_SUBMIT: false });
             var text = fixtures.textJSON({ix: "0"}),
                 textInGroup = fixtures.textJSON({ix: "1,0"}),
                 group = fixtures.groupJSON({ix: "1", children: [textInGroup]}),
@@ -52,6 +53,8 @@ hqDefine("cloudcare/js/form_entry/spec/utils_spec", function () {
 
             assert.equal(utils.getBroadcastContainer(text), form);
             assert.equal(utils.getBroadcastContainer(textInRepeat), groupInRepeat);
+
+            hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
         });
     });
 });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js
index efcc99f3475a..4d4f1144e382 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js
@@ -5,6 +5,14 @@ hqDefine("cloudcare/js/form_entry/spec/web_form_session_spec", function () {
         var constants = hqImport("cloudcare/js/form_entry/const"),
             formUI = hqImport("cloudcare/js/form_entry/form_ui");
 
+        before(function () {
+            hqImport("hqwebapp/js/initial_page_data").register("toggles_dict", { WEB_APPS_ANCHORED_SUBMIT: false });
+        });
+
+        after(function () {
+            hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
+        });
+
         describe('TaskQueue', function () {
             var callCount,
                 flag,

From 6ed39a7a04520eef4e15b7f3d7c4b7f8758c3cac Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Mon, 22 Jan 2024 17:33:32 -0500
Subject: [PATCH 089/118] Updated formplayer tests

---
 .../cloudcare/js/formplayer/spec/menu_list_spec.js    |  4 ++++
 .../static/cloudcare/js/formplayer/spec/query_spec.js |  6 ++++++
 .../static/cloudcare/js/formplayer/spec/utils_spec.js | 11 +++++++++++
 3 files changed, 21 insertions(+)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js
index 0560d201b470..5df2927dfff9 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js
@@ -17,6 +17,10 @@ hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", function () {
             sinon.stub(Utils, 'getCurrentQueryInputs').callsFake(function () { return {}; });
         });
 
+        after(function () {
+            hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
+        });
+
         describe('#getMenuView', function () {
             let FormplayerFrontend = hqImport("cloudcare/js/formplayer/app"),
                 server,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js
index 03daf1251f9b..6b041c79f0f3 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js
@@ -11,6 +11,8 @@ hqDefine("cloudcare/js/formplayer/spec/query_spec", function () {
                 const QueryListView = hqImport("cloudcare/js/formplayer/menus/views/query");
                 const Utils = hqImport("cloudcare/js/formplayer/utils/utils");
 
+                hqImport("hqwebapp/js/initial_page_data").register("toggles_dict", { DYNAMICALLY_UPDATE_SEARCH_RESULTS: false });
+
                 const QueryViewModel = Backbone.Model.extend();
                 const QueryViewCollection = Backbone.Collection.extend();
                 const keyModel = new QueryViewModel({
@@ -34,6 +36,10 @@ hqDefine("cloudcare/js/formplayer/spec/query_spec", function () {
                 keyQueryView = new childViewConstructor({ parentView: keyQueryListView, model: keyModel});
             });
 
+            after(function () {
+                hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
+            });
+
             it('should create dictionary with either keys', function () {
                 const expectedKeyItemsetChoicesDict = { "CA": "California", "MA": "Massachusetts", "FL": "Florida"};
                 assert.deepEqual(expectedKeyItemsetChoicesDict, keyQueryView.model.get("itemsetChoicesDict"));
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js
index 2f96660da488..ad26a35ccff2 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js
@@ -37,6 +37,17 @@ hqDefine("cloudcare/js/formplayer/spec/utils_spec", function () {
         describe('CloudcareUrl', function () {
             let stubs = {};
 
+            before(function () {
+                hqImport("hqwebapp/js/initial_page_data").register("toggles_dict", {
+                    SPLIT_SCREEN_CASE_SEARCH: false,
+                    DYNAMICALLY_UPDATE_SEARCH_RESULTS: false,
+                });
+            });
+
+            after(function () {
+                hqImport("hqwebapp/js/initial_page_data").unregister("toggles_dict");
+            });
+
             beforeEach(function () {
                 let currentUrl = new Utils.CloudcareUrl({appId: 'abc123'});
 

From ea770026b22e3b4cecf87d91dc73e6fbefb3c7e3 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 12:27:06 +0200
Subject: [PATCH 090/118] toggle popup on marker click

---
 .../geospatial/static/geospatial/js/models.js | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 5f6d06eb90b4..9f0cfad808aa 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -226,35 +226,20 @@ hqDefine('geospatial/js/models', [
             // Add the marker to the map
             marker.addTo(self.mapInstance);
 
-            let popupDiv = document.createElement("div");
+            const popupDiv = document.createElement("div");
             popupDiv.setAttribute("data-bind", "template: 'select-case'");
 
-            let popup = new mapboxgl.Popup({ offset: 25, anchor: "bottom" })  // eslint-disable-line no-undef
+            const popup = new mapboxgl.Popup({ offset: 25, anchor: "bottom" })  // eslint-disable-line no-undef
                 .setLngLat(coordinates)
-                .setDOMContent(popupDiv);
-
-            marker.setPopup(popup);
-
-            const markerDiv = marker.getElement();
-            // Show popup on hover
-            markerDiv.addEventListener('mouseenter', () => marker.togglePopup());
-            markerDiv.addEventListener('mouseenter', () => highlightMarkerGroup(marker));
-            markerDiv.addEventListener('mouseleave', () => resetMarkersOpacity());
-
-            // Hide popup if mouse leaves marker and popup
-            var addLeaveEvent = function (fromDiv, toDiv) {
-                fromDiv.addEventListener('mouseleave', function () {
-                    setTimeout(function () {
-                        if (!$(toDiv).is(':hover')) {
-                            // mouse left toDiv as well
-                            marker.togglePopup();
-                        }
-                    }, 100);
+                .setDOMContent(popupDiv)
+                .on('open', () => {
+                    highlightMarkerGroup(marker);
+                })
+                .on('close', () => {
+                    resetMarkersOpacity();
                 });
-            };
-            addLeaveEvent(markerDiv, popupDiv);
-            addLeaveEvent(popupDiv, markerDiv);
 
+            marker.setPopup(popup);
             const mapItemInstance = new MapItem(itemId, itemData, marker, colors);
             $(popupDiv).koApplyBindings(mapItemInstance);
 

From 48532b6963fe277d5303fbefdd29b16920076189 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 12:28:05 +0200
Subject: [PATCH 091/118] use item ID as index instead of coords

---
 .../apps/geospatial/static/geospatial/js/geospatial_map.js  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js b/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
index bbb3f0f979cb..6e0cdeb79b8b 100644
--- a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+++ b/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
@@ -94,15 +94,13 @@ hqDefine("geospatial/js/geospatial_map", [
             var groupId = 0;
             Object.keys(result).forEach((userId) => {
                 let user = mapModel.userMapItems().find((userModel) => {return userModel.itemId === userId;});
-                const userCoordString = user.itemData.coordinates['lng'] + " " + user.itemData.coordinates['lat'];
-                mapModel.caseGroupsIndex[userCoordString] = {groupId: groupId, item: user};
+                mapModel.caseGroupsIndex[userId] = {groupId: groupId, item: user};
 
                 let cases = [];
                 mapModel.caseMapItems().forEach((caseModel) => {
                     if (result[userId].includes(caseModel.itemId)) {
                         cases.push(caseModel);
-                        const coordString = caseModel.itemData.coordinates['lng'] + " " + caseModel.itemData.coordinates['lat'];
-                        mapModel.caseGroupsIndex[coordString] = {groupId: groupId, item: caseModel};
+                        mapModel.caseGroupsIndex[caseModel.itemId] = {groupId: groupId, item: caseModel};
                     }
                 });
                 connectUserWithCasesOnMap(user, cases);

From d3a180aefe62fc771c2cb359f3435c8a2f54fe04 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 12:28:59 +0200
Subject: [PATCH 092/118] pass item ID instead of marker object

---
 corehq/apps/geospatial/static/geospatial/js/models.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 9f0cfad808aa..601c3cfb6ba0 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -233,7 +233,7 @@ hqDefine('geospatial/js/models', [
                 .setLngLat(coordinates)
                 .setDOMContent(popupDiv)
                 .on('open', () => {
-                    highlightMarkerGroup(marker);
+                    highlightMarkerGroup(itemId);
                 })
                 .on('close', () => {
                     resetMarkersOpacity();
@@ -260,14 +260,10 @@ hqDefine('geospatial/js/models', [
             changeMarkersOpacity(markers, 1);
         }
 
-        function highlightMarkerGroup(marker) {
-            const markerCoords = marker.getLngLat();
-            const currentMarkerPosition = markerCoords.lng + " " + markerCoords.lat;
-            const markerItem = self.caseGroupsIndex[currentMarkerPosition];
-
+        function highlightMarkerGroup(itemId) {
+            const markerItem = self.caseGroupsIndex[itemId];
             if (markerItem) {
                 const groupId = markerItem.groupId;
-
                 let markersToHide = [];
                 Object.keys(self.caseGroupsIndex).forEach(itemCoordinates => {
                     const mapMarkerItem = self.caseGroupsIndex[itemCoordinates];

From 32c14e150f076f22ecb99a864f35d9acc90cdd96 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 12:29:28 +0200
Subject: [PATCH 093/118] fix opacity changes resetting on map move

---
 corehq/apps/geospatial/static/geospatial/js/models.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 601c3cfb6ba0..68a10945f082 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -43,8 +43,9 @@ hqDefine('geospatial/js/models', [
         self.groupCoordinates = null;
 
         self.setMarkerOpacity = function (opacity) {
-            let element = self.marker.getElement();
-            element.style.opacity = opacity;
+            const element = self.marker.getElement();
+            const svg = element.getElementsByTagName("svg")[0];
+            svg.setAttribute("opacity", opacity);
         };
 
         function changeMarkerColor(selectedCase, newColor) {

From 05739fbded90280f9146102c6bd6ddbdcec8ac2c Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 12:29:45 +0200
Subject: [PATCH 094/118] remove opacity change delay

---
 corehq/apps/geospatial/static/geospatial/js/models.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 68a10945f082..6ddf7be240c7 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -11,7 +11,6 @@ hqDefine('geospatial/js/models', [
     initialPageData,
     utils
 ) {
-    const HOVER_DELAY = 400;
     const DOWNPLAY_OPACITY = 0.2;
     const FEATURE_QUERY_PARAM = 'features';
     const DEFAULT_CENTER_COORD = [-20.0, -0.0];
@@ -282,13 +281,9 @@ hqDefine('geospatial/js/models', [
         }
 
         function changeMarkersOpacity(markers, opacity) {
-            // It's necessary to delay obscuring the markers since mapbox does not play nice
-            // if we try to do it all at once.
-            setTimeout(function () {
-                markers.forEach(marker => {
-                    marker.setMarkerOpacity(opacity);
-                });
-            }, HOVER_DELAY);
+            markers.forEach(marker => {
+                marker.setMarkerOpacity(opacity);
+            });
         }
 
         self.getLineFeatureId = function (itemId) {

From 8ad4bb9050c5abbd0c784aa795d9a72064cd92fc Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 12:41:51 +0200
Subject: [PATCH 095/118] change variable types

---
 corehq/apps/geospatial/static/geospatial/js/geospatial_map.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js b/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
index 6e0cdeb79b8b..3343333d5a03 100644
--- a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+++ b/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
@@ -91,9 +91,9 @@ hqDefine("geospatial/js/geospatial_map", [
             // Clean stale disbursement results
             mapModel.removeDisbursementLayers();
 
-            var groupId = 0;
+            let groupId = 0;
             Object.keys(result).forEach((userId) => {
-                let user = mapModel.userMapItems().find((userModel) => {return userModel.itemId === userId;});
+                const user = mapModel.userMapItems().find((userModel) => {return userModel.itemId === userId;});
                 mapModel.caseGroupsIndex[userId] = {groupId: groupId, item: user};
 
                 let cases = [];

From 446fc5d23f3e85530348d8c7e6ad67d2b5c13fa5 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 16:17:12 +0200
Subject: [PATCH 096/118] pull out popup creation to a util func

---
 .../geospatial/static/geospatial/js/models.js   | 17 ++++++-----------
 .../geospatial/static/geospatial/js/utils.js    | 11 +++++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 6ddf7be240c7..8c4a30df7c41 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -227,17 +227,12 @@ hqDefine('geospatial/js/models', [
             marker.addTo(self.mapInstance);
 
             const popupDiv = document.createElement("div");
-            popupDiv.setAttribute("data-bind", "template: 'select-case'");
-
-            const popup = new mapboxgl.Popup({ offset: 25, anchor: "bottom" })  // eslint-disable-line no-undef
-                .setLngLat(coordinates)
-                .setDOMContent(popupDiv)
-                .on('open', () => {
-                    highlightMarkerGroup(itemId);
-                })
-                .on('close', () => {
-                    resetMarkersOpacity();
-                });
+            const popup = utils.createMapPopup(
+                coordinates,
+                popupDiv,
+                () => highlightMarkerGroup(itemId),
+                resetMarkersOpacity
+            );
 
             marker.setPopup(popup);
             const mapItemInstance = new MapItem(itemId, itemData, marker, colors);
diff --git a/corehq/apps/geospatial/static/geospatial/js/utils.js b/corehq/apps/geospatial/static/geospatial/js/utils.js
index 2bd2675ff098..477e11fdcc44 100644
--- a/corehq/apps/geospatial/static/geospatial/js/utils.js
+++ b/corehq/apps/geospatial/static/geospatial/js/utils.js
@@ -22,9 +22,20 @@ hqDefine('geospatial/js/utils', [], function () {
         return todayDate.toLocaleDateString();
     };
 
+    var createMapPopup = function (coordinates, popupDiv, openEventFunc, closeEventFunc) {
+        popupDiv.setAttribute("data-bind", "template: 'select-case'");
+        const popup = new mapboxgl.Popup({ offset: 25, anchor: "bottom" })  // eslint-disable-line no-undef
+            .setLngLat(coordinates)
+            .setDOMContent(popupDiv)
+            .on('open', openEventFunc)
+            .on('close', closeEventFunc);
+        return popup;
+    };
+
     return {
         getRandomRGBColor: getRandomRGBColor,
         uuidv4: uuidv4,
         getTodayDate: getTodayDate,
+        createMapPopup: createMapPopup,
     };
 });
\ No newline at end of file

From 0f3f077a901bf0654f2fbdf187c63896b3c556b8 Mon Sep 17 00:00:00 2001
From: Zandre Engelbrecht <zengelbrecht@dimagi.com>
Date: Tue, 23 Jan 2024 16:17:48 +0200
Subject: [PATCH 097/118] show popup on click for grouping page

---
 .../static/geospatial/js/case_grouping_map.js | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js b/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
index 07063a206087..3b8802eea288 100644
--- a/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+++ b/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
@@ -300,32 +300,10 @@ hqDefine("geospatial/js/case_grouping_map",[
                 marker.addTo(mapModel.mapInstance);
                 mapMarkers.push(marker);
 
-                let popupDiv = document.createElement("div");
-                popupDiv.setAttribute("data-bind", "template: 'select-case'");
-
-                let popup = new mapboxgl.Popup({ offset: 25, anchor: "bottom" })  // eslint-disable-line no-undef
-                    .setLngLat(coordinates)
-                    .setDOMContent(popupDiv);
+                const popupDiv = document.createElement("div");
+                const popup = utils.createMapPopup(coordinates, popupDiv, marker.togglePopup, marker.togglePopup);
 
                 marker.setPopup(popup);
-
-                const markerDiv = marker.getElement();
-                // Show popup on hover
-                markerDiv.addEventListener('mouseenter', marker.togglePopup);
-
-                // Hide popup if mouse leaves marker and popup
-                var addLeaveEvent = function (fromDiv, toDiv) {
-                    fromDiv.addEventListener('mouseleave', function () {
-                        setTimeout(function () {
-                            if (!$(toDiv).is(':hover')) {
-                                // mouse left toDiv as well
-                                marker.togglePopup();
-                            }
-                        }, 100);
-                    });
-                };
-                addLeaveEvent(markerDiv, popupDiv);
-                addLeaveEvent(popupDiv, markerDiv);
                 const colors = {default: color, selected: color};
 
                 const mapMarkerInstance = new mapMarkerModel(caseItem.itemId, caseItem, marker, colors);

From 067b3ef7ca8ed4026c62ea0dcee26ddfa459cc95 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Tue, 23 Jan 2024 11:04:54 -0500
Subject: [PATCH 098/118] Fixed bad merge

---
 .../static/cloudcare/js/formplayer/menus/controller.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index fba48d0c15a6..a0a4b58bdbb1 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -126,7 +126,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", function () {
             if (!appPreview) {
                 let isFormEntry = !menuResponse.queryKey;
                 if (isFormEntry) {
-                    menusUtils.showMenuDropdown(menuResponse.langs, initialPageData('lang_code_name_mapping'));
+                    menusUtils.showMenuDropdown(menuResponse.langs, initialPageData.get('lang_code_name_mapping'));
                 }
                 if (menuResponse.type === constants.ENTITIES) {
                     menusUtils.showMenuDropdown();

From e9a4cb8dab309b247460d5f4f8a24c4eb618b738 Mon Sep 17 00:00:00 2001
From: nospame <mapson.evan@gmail.com>
Date: Tue, 23 Jan 2024 09:44:34 -0800
Subject: [PATCH 099/118] Check if parent is <a> for case list clicks action

---
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 24883ddecbe2..e80cfb644801 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -363,7 +363,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
             if (!(
                 e.target.classList.contains('module-case-list-column-checkbox') ||  // multiselect checkbox
                 e.target.classList.contains("select-row-checkbox") ||               // multiselect select all
-                $(e.target).is('a') ||                                              // actual link, as in markdown
+                $(e.target).parent().is('a') ||                                     // actual link, as in markdown
                 e.target.classList.contains('show-more') ||
                 $(e.target).parent().hasClass('show-more')
             )) {

From 0ddaeb6b7745a501d28b2f1a5a4c1174179f6793 Mon Sep 17 00:00:00 2001
From: nospame <mapson.evan@gmail.com>
Date: Tue, 23 Jan 2024 11:10:16 -0800
Subject: [PATCH 100/118] Check if e.target is itself or has any ancestors that
 are <a>

---
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index e80cfb644801..804931e29bdd 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -363,7 +363,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
             if (!(
                 e.target.classList.contains('module-case-list-column-checkbox') ||  // multiselect checkbox
                 e.target.classList.contains("select-row-checkbox") ||               // multiselect select all
-                $(e.target).parent().is('a') ||                                     // actual link, as in markdown
+                $(e.target).closest('a').length ||                                  // actual link, as in markdown
                 e.target.classList.contains('show-more') ||
                 $(e.target).parent().hasClass('show-more')
             )) {

From 1c60565f048a78593227e867eac7560689382331 Mon Sep 17 00:00:00 2001
From: AddisonDunn <dunnaddisonw@gmail.com>
Date: Tue, 23 Jan 2024 14:42:15 -0500
Subject: [PATCH 101/118] create ES filter

---
 corehq/apps/es/filters.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/corehq/apps/es/filters.py b/corehq/apps/es/filters.py
index 3f0ae31158ed..5229dfb9a104 100644
--- a/corehq/apps/es/filters.py
+++ b/corehq/apps/es/filters.py
@@ -22,6 +22,10 @@ def match_all():
     return {"match_all": {}}
 
 
+def match_none():
+    return {"match_none": {}}
+
+
 def prefix(field, value):
     return {"prefix": {field: value}}
 

From 3df5b9b3681e082fea76d7b1a10e15d8001f0902 Mon Sep 17 00:00:00 2001
From: AddisonDunn <dunnaddisonw@gmail.com>
Date: Tue, 23 Jan 2024 14:43:00 -0500
Subject: [PATCH 102/118] add tests for CSQL

---
 .../tests/test_case_search_filters.py         | 19 +++++++++++++++++++
 .../apps/case_search/tests/test_filter_dsl.py |  8 ++++++++
 2 files changed, 27 insertions(+)

diff --git a/corehq/apps/case_search/tests/test_case_search_filters.py b/corehq/apps/case_search/tests/test_case_search_filters.py
index 4f13542ff72e..04bed0d9dcd2 100644
--- a/corehq/apps/case_search/tests/test_case_search_filters.py
+++ b/corehq/apps/case_search/tests/test_case_search_filters.py
@@ -221,3 +221,22 @@ def test_match_all(self):
             None,
             ['c1', 'c2', 'c3']
         )
+
+    def test_match_none(self):
+        self._create_case_search_config()
+        cases = [
+            {'_id': 'c1', 'case_type': 'song', 'description': 'New York'},
+            {'_id': 'c2', 'case_type': 'song', 'description': 'Manchester'},
+            {'_id': 'c3', 'case_type': 'song', 'description': 'Manchester Boston'},
+        ]
+        self._assert_query_runs_correctly(
+            self.domain,
+            cases,
+            get_case_search_query(
+                self.domain,
+                ['song'],
+                {'_xpath_query': "match-none()"},
+            ),
+            None,
+            []
+        )
diff --git a/corehq/apps/case_search/tests/test_filter_dsl.py b/corehq/apps/case_search/tests/test_filter_dsl.py
index c48738b435b3..10005a41ef9c 100644
--- a/corehq/apps/case_search/tests/test_filter_dsl.py
+++ b/corehq/apps/case_search/tests/test_filter_dsl.py
@@ -746,6 +746,14 @@ def test_match_all(self):
         built_filter = build_filter_from_ast(parsed, SearchFilterContext("domain"))
         self.checkQuery(built_filter, expected_filter, is_raw_query=True)
 
+    def test_match_none(self):
+        parsed = parse_xpath("match-none()")
+        expected_filter = {
+            "match_none": {}
+        }
+        built_filter = build_filter_from_ast(parsed, SearchFilterContext("domain"))
+        self.checkQuery(built_filter, expected_filter, is_raw_query=True)
+
 
 @es_test(requires=[case_search_adapter], setup_class=True)
 class TestFilterDslLookups(ElasticTestMixin, TestCase):

From 62ec9d15bdb0469cfca68aca2a15bf378b868516 Mon Sep 17 00:00:00 2001
From: AddisonDunn <dunnaddisonw@gmail.com>
Date: Tue, 23 Jan 2024 14:44:13 -0500
Subject: [PATCH 103/118] linting

---
 corehq/apps/case_search/tests/test_filter_dsl.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/case_search/tests/test_filter_dsl.py b/corehq/apps/case_search/tests/test_filter_dsl.py
index 10005a41ef9c..585e09dc975c 100644
--- a/corehq/apps/case_search/tests/test_filter_dsl.py
+++ b/corehq/apps/case_search/tests/test_filter_dsl.py
@@ -229,7 +229,6 @@ def test_date_comparison(self):
         query = build_filter_from_ast(parsed, SearchFilterContext("domain"))
         self.checkQuery(expected_filter, query, is_raw_query=True)
 
-
     @freeze_time('2021-08-02')
     def test_date_comparison__today(self):
         parsed = parse_xpath("dob >= today()")
@@ -880,7 +879,8 @@ def test_parent_lookups(self):
         }
         built_filter = build_filter_from_ast(parsed, SearchFilterContext(self.domain))
         self.checkQuery(built_filter, expected_filter, is_raw_query=True)
-        self.assertEqual([self.child_case1_id, self.child_case2_id], CaseSearchES().filter(built_filter).values_list('_id', flat=True))
+        self.assertEqual([self.child_case1_id, self.child_case2_id], CaseSearchES().filter(
+            built_filter).values_list('_id', flat=True))
 
     def test_nested_parent_lookups(self):
         parsed = parse_xpath("father/mother/house = 'Tyrell'")
@@ -917,7 +917,8 @@ def test_nested_parent_lookups(self):
         }
         built_filter = build_filter_from_ast(parsed, SearchFilterContext(self.domain))
         self.checkQuery(built_filter, expected_filter, is_raw_query=True)
-        self.assertEqual([self.child_case1_id, self.child_case2_id], CaseSearchES().filter(built_filter).values_list('_id', flat=True))
+        self.assertEqual([self.child_case1_id, self.child_case2_id], CaseSearchES().filter(
+            built_filter).values_list('_id', flat=True))
 
     def test_subcase_exists(self):
         parsed = parse_xpath("subcase-exists('father', name='Margaery')")

From 0d05f732b2264a889b60e277c1d4276b09c3f1cb Mon Sep 17 00:00:00 2001
From: AddisonDunn <dunnaddisonw@gmail.com>
Date: Tue, 23 Jan 2024 14:44:51 -0500
Subject: [PATCH 104/118] add new CSQL function

---
 corehq/apps/case_search/xpath_functions/__init__.py      | 6 ++++--
 .../apps/case_search/xpath_functions/query_functions.py  | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/case_search/xpath_functions/__init__.py b/corehq/apps/case_search/xpath_functions/__init__.py
index 252dd89c2fcb..b04388448427 100644
--- a/corehq/apps/case_search/xpath_functions/__init__.py
+++ b/corehq/apps/case_search/xpath_functions/__init__.py
@@ -6,7 +6,8 @@
     within_distance,
     phonetic_match,
     starts_with,
-    match_all
+    match_all,
+    match_none
 )
 from .subcase_functions import subcase
 from .ancestor_functions import ancestor_exists
@@ -33,5 +34,6 @@
     'phonetic-match': phonetic_match,
     'starts-with': starts_with,
     'ancestor-exists': ancestor_exists,
-    'match-all': match_all
+    'match-all': match_all,
+    'match-none': match_none,
 }
diff --git a/corehq/apps/case_search/xpath_functions/query_functions.py b/corehq/apps/case_search/xpath_functions/query_functions.py
index d74de4554b42..b3357b19d37a 100644
--- a/corehq/apps/case_search/xpath_functions/query_functions.py
+++ b/corehq/apps/case_search/xpath_functions/query_functions.py
@@ -114,3 +114,12 @@ def match_all(node, context):
             serialize(node)
         )
     return filters.match_all()
+
+
+def match_none(node, context):
+    if len(node.args):
+        raise XPathFunctionException(
+            _("'match-none()' does not take any arguments"),
+            serialize(node)
+        )
+    return filters.match_none()

From bfcd9463ec392a42cec31861fd9223949a5985d0 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Tue, 23 Jan 2024 15:12:56 -0500
Subject: [PATCH 105/118] remove HELPME flag

---
 corehq/apps/app_manager/views/modules.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/corehq/apps/app_manager/views/modules.py b/corehq/apps/app_manager/views/modules.py
index a947a14706e6..5c8aa2f5f365 100644
--- a/corehq/apps/app_manager/views/modules.py
+++ b/corehq/apps/app_manager/views/modules.py
@@ -1185,16 +1185,6 @@ def edit_module_detail_screens(request, domain, app_id, module_unique_id):
     provided in the request. Components are short, long, filter, parent_select,
     fixture_select and sort_elements.
     """
-    # 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
 
     params = json_request(request.POST)
     detail_type = params.get('type')

From 2d880d267c0889cbee0ea40ce916509b8ac14478 Mon Sep 17 00:00:00 2001
From: minhaminha <minhaminha@users.noreply.github.com>
Date: Wed, 24 Jan 2024 06:06:34 +0000
Subject: [PATCH 106/118] Update translations

---
 locale/en/LC_MESSAGES/django.po  | 34 +++++++++++++++++++++
 locale/es/LC_MESSAGES/django.po  | 51 ++++++++++++++++++++++++--------
 locale/fr/LC_MESSAGES/django.po  | 34 +++++++++++++++++++++
 locale/fra/LC_MESSAGES/django.po | 51 ++++++++++++++++++++++++--------
 locale/hi/LC_MESSAGES/django.po  | 34 +++++++++++++++++++++
 locale/hin/LC_MESSAGES/django.po | 34 +++++++++++++++++++++
 locale/por/LC_MESSAGES/django.po | 36 ++++++++++++++++++++++
 locale/pt/LC_MESSAGES/django.po  | 34 +++++++++++++++++++++
 locale/sw/LC_MESSAGES/django.po  | 34 +++++++++++++++++++++
 9 files changed, 318 insertions(+), 24 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 698c2304d685..e7e9b9524d14 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6457,6 +6457,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -11683,6 +11705,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -21858,6 +21884,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43022,6 +43052,10 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+msgid "Deduplication Rules"
+msgstr ""
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index dbf0fe292ab7..5c36c648a81e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -6891,6 +6891,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -12296,6 +12318,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -13499,16 +13525,12 @@ msgid "Add Case Type"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-#, fuzzy
-#| msgid "Show Deprecated Properties"
 msgid "Show Deprecated Case Types"
-msgstr "Mostrar Propiedades Obsoletas"
+msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-#, fuzzy
-#| msgid "Hide Deprecated Properties"
 msgid "Hide Deprecated Case Types"
-msgstr "Ocultar Propiedades Obsoletas"
+msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid "Create a new Case Type"
@@ -22692,6 +22714,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43957,10 +43983,8 @@ msgid "Forward Locations"
 msgstr "Re-enviar Ubicaciones"
 
 #: corehq/motech/repeaters/models.py
-#, fuzzy
-#| msgid "Create Data Source"
 msgid "Forward Data Source Data"
-msgstr "Crear Fuente de Datos"
+msgstr ""
 
 #: corehq/motech/repeaters/repeater_generators.py
 msgid "XML"
@@ -44503,6 +44527,12 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+#, fuzzy
+#| msgid "Application Profiles"
+msgid "Deduplication Rules"
+msgstr "Perfiles de Aplicaciones"
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr "Reportes de Desarrollador de Reportes"
@@ -45680,6 +45710,3 @@ msgstr ""
 #: manage.py
 msgid "Enter valid JSON"
 msgstr ""
-
-#~ msgid "Successful"
-#~ msgstr "Exitoso"
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 247bcac0146e..6de18e4a353b 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6458,6 +6458,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -11684,6 +11706,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -21859,6 +21885,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43021,6 +43051,10 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+msgid "Deduplication Rules"
+msgstr ""
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr ""
diff --git a/locale/fra/LC_MESSAGES/django.po b/locale/fra/LC_MESSAGES/django.po
index 7151d4a57748..3bb3a6ce3d68 100644
--- a/locale/fra/LC_MESSAGES/django.po
+++ b/locale/fra/LC_MESSAGES/django.po
@@ -6811,6 +6811,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -12207,6 +12229,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -13411,16 +13437,12 @@ msgid "Add Case Type"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-#, fuzzy
-#| msgid "Show Deprecated Properties"
 msgid "Show Deprecated Case Types"
-msgstr "Afficher les propriétés obsolètes"
+msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-#, fuzzy
-#| msgid "Hide Deprecated Properties"
 msgid "Hide Deprecated Case Types"
-msgstr "Masquer les propriétés obsolètes"
+msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid "Create a new Case Type"
@@ -22611,6 +22633,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43922,10 +43948,8 @@ msgid "Forward Locations"
 msgstr "Transférer les sites"
 
 #: corehq/motech/repeaters/models.py
-#, fuzzy
-#| msgid "Create Data Source"
 msgid "Forward Data Source Data"
-msgstr "Créer source de données"
+msgstr ""
 
 #: corehq/motech/repeaters/repeater_generators.py
 msgid "XML"
@@ -44468,6 +44492,12 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+#, fuzzy
+#| msgid "Application Profiles"
+msgid "Deduplication Rules"
+msgstr "Profiles d'application"
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr "Rapports de l'Éditeur de Rapports"
@@ -45680,6 +45710,3 @@ msgstr "Le Score à la Fonctionnalité"
 #: manage.py
 msgid "Enter valid JSON"
 msgstr "Saisir un JSON valide"
-
-#~ msgid "Successful"
-#~ msgstr "Succès"
diff --git a/locale/hi/LC_MESSAGES/django.po b/locale/hi/LC_MESSAGES/django.po
index b34341ee1ef1..d977e88d883b 100644
--- a/locale/hi/LC_MESSAGES/django.po
+++ b/locale/hi/LC_MESSAGES/django.po
@@ -6458,6 +6458,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -11684,6 +11706,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -21859,6 +21885,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43021,6 +43051,10 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+msgid "Deduplication Rules"
+msgstr ""
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr ""
diff --git a/locale/hin/LC_MESSAGES/django.po b/locale/hin/LC_MESSAGES/django.po
index 0735fd946815..2e50c1ea406d 100644
--- a/locale/hin/LC_MESSAGES/django.po
+++ b/locale/hin/LC_MESSAGES/django.po
@@ -6472,6 +6472,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -11698,6 +11720,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -21873,6 +21899,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43035,6 +43065,10 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+msgid "Deduplication Rules"
+msgstr ""
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr ""
diff --git a/locale/por/LC_MESSAGES/django.po b/locale/por/LC_MESSAGES/django.po
index 97a7c24dfb45..32418559edc6 100644
--- a/locale/por/LC_MESSAGES/django.po
+++ b/locale/por/LC_MESSAGES/django.po
@@ -6527,6 +6527,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -11775,6 +11797,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -22001,6 +22027,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43266,6 +43296,12 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+#, fuzzy
+#| msgid "Application Users"
+msgid "Deduplication Rules"
+msgstr "Usuários da Aplicação"
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr ""
diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po
index b34341ee1ef1..d977e88d883b 100644
--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -6458,6 +6458,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -11684,6 +11706,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -21859,6 +21885,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43021,6 +43051,10 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+msgid "Deduplication Rules"
+msgstr ""
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr ""
diff --git a/locale/sw/LC_MESSAGES/django.po b/locale/sw/LC_MESSAGES/django.po
index d2d1f83a0b3f..acfb81ad1486 100644
--- a/locale/sw/LC_MESSAGES/django.po
+++ b/locale/sw/LC_MESSAGES/django.po
@@ -6462,6 +6462,28 @@ msgid ""
 "              "
 msgstr ""
 
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an address popup configuration that should be moved to "
+"case detail.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
+#, python-format
+msgid ""
+"\n"
+"                The case list in\n"
+"                <a href=\"%(module_url)s\">%(module_name)s</a>\n"
+"                has an invalid clickable icon configuration. Reason: "
+"%(error_reason)s\n"
+"              "
+msgstr ""
+
 #: corehq/apps/app_manager/templates/app_manager/partials/build_errors.html
 #, python-format
 msgid ""
@@ -11688,6 +11710,10 @@ msgstr ""
 msgid "The first argument to '{node.name}' must be a valid case property name"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+msgid "'match-all()' does not take any arguments"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/subcase_functions.py
 #, python-brace-format
 msgid "Unsupported operator for use with 'subcase-count': {op}"
@@ -21863,6 +21889,10 @@ msgid ""
 "    "
 msgstr ""
 
+#: corehq/apps/geospatial/templates/map_visualization.html
+msgid "Layers"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/map_visualization.html
 msgid "Selected Mobile Workers"
 msgstr ""
@@ -43025,6 +43055,10 @@ msgstr ""
 msgid "Allow case copy from one user to another"
 msgstr ""
 
+#: corehq/privileges.py
+msgid "Deduplication Rules"
+msgstr ""
+
 #: corehq/reports.py
 msgid "Report Builder Reports"
 msgstr ""

From be37440a861a41f6cef98fd7a565ef413caf89b9 Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Wed, 24 Jan 2024 10:31:14 +0000
Subject: [PATCH 107/118] Add zandre-eng to CODEOWNERS

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5beaa7a815a8..ad533aea8e19 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -27,7 +27,7 @@
 /corehq/apps/callcenter/ @snopoke
 /corehq/apps/change_feed/ @dannyroberts
 /corehq/apps/commtrack/ @esoergel
-/corehq/apps/data_dictionary/ @esoergel @orangejenny
+/corehq/apps/data_dictionary/ @esoergel @orangejenny @zandre-eng
 /corehq/apps/domain/decorators.py @esoergel
 /corehq/apps/domain/auth.py @esoergel
 /corehq/apps/es/ @esoergel @amitphulera

From 02855c58009f65c7ef325dc6c918836d37865d1f Mon Sep 17 00:00:00 2001
From: Norman Hooper <nhooper@dimagi.com>
Date: Wed, 24 Jan 2024 11:36:26 +0000
Subject: [PATCH 108/118] Fix `array items[0,2] must be unique`

---
 docker/hq-compose-services.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker/hq-compose-services.yml b/docker/hq-compose-services.yml
index a77ad0d6d62b..15d056c666d4 100644
--- a/docker/hq-compose-services.yml
+++ b/docker/hq-compose-services.yml
@@ -42,7 +42,6 @@ services:
     command: elasticsearch --cluster.name=${ES_CLUSTER_NAME}
     environment:
       ES_CLUSTER_NAME: ES_CLUSTER_NAME
-      ES_JAVA_OPTS: "-Des.script.engine.groovy.inline.aggs=true -Des.script.engine.groovy.inline.search=true"
     ports:
       - "9205:9200"
 
@@ -53,7 +52,6 @@ services:
     command: elasticsearch
     environment:
       ES_CLUSTER_NAME: ${ES_CLUSTER_NAME}
-      ES_JAVA_OPTS: "-Xms750m -Xmx750m -Des.script.engine.groovy.inline.aggs=true -Des.script.engine.groovy.inline.search=true"
     ports:
       - "9200:9200"
 

From 42efec5ff1bcaee0ab6e3a9b2e327f21675dafda Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Wed, 24 Jan 2024 10:18:45 -0500
Subject: [PATCH 109/118] make var assignment uniform

---
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 14e40a98f283..85b6c6ce0d1b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -595,7 +595,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", function () {
             self.styles = options.styles;
             self.hasNoItems = options.collection.length === 0 || options.triggerEmptyCaseList;
             self.noItemsText = options.triggerEmptyCaseList ? sidebarNoItemsText : this.options.collection.noItemsText;
-            self.selectText = this.options.collection.selectText;
+            self.selectText = options.collection.selectText;
             self.headers = options.triggerEmptyCaseList ? [] : this.options.headers;
             self.redoLast = options.redoLast;
             if (sessionStorage.selectedValues !== undefined) {

From fd0f80d5450e147331137bc8a96f01fb2a9cabae Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Wed, 24 Jan 2024 10:32:06 -0500
Subject: [PATCH 110/118] populate row only if feature supported

---
 corehq/apps/translations/app_translations/download.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/corehq/apps/translations/app_translations/download.py b/corehq/apps/translations/app_translations/download.py
index db864806d1b4..acd2e2ba2e31 100644
--- a/corehq/apps/translations/app_translations/download.py
+++ b/corehq/apps/translations/app_translations/download.py
@@ -265,7 +265,10 @@ def _get_module_detail_no_items_text(langs, module):
 
 
 def _get_module_detail_select_text(langs, module):
+    app = module.get_app()
     short_detail = module.case_details.short
+    if not (app.supports_select_text):
+        return []
     return [
         ("select_text", "list") + tuple(short_detail.select_text.get(lang, '') for lang in langs)
     ]

From c88e880075c128be1ddc115662773f41e44878fa Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Wed, 24 Jan 2024 11:53:05 -0500
Subject: [PATCH 111/118] upgrade test app version

---
 .../tests/data/bulk_app_translation/download/app.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json b/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json
index 429dd180f47f..0ed405cb3d5c 100644
--- a/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json
+++ b/corehq/apps/translations/tests/data/bulk_app_translation/download/app.json
@@ -19,7 +19,7 @@
   "admin_password": null,
   "build_spec": {
     "doc_type": "BuildSpec",
-    "version": "2.13.0",
+    "version": "2.54.0",
     "build_number": null,
     "latest": true
   },

From c8ff3dd05c875a57cb07c2fababe07003cb9a841 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Thu, 5 Jan 2023 15:37:46 -0500
Subject: [PATCH 112/118] Updated build_requirejs string check

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

diff --git a/corehq/apps/hqwebapp/management/commands/build_requirejs.py b/corehq/apps/hqwebapp/management/commands/build_requirejs.py
index a1bcc1177e24..c8b3c462bbee 100644
--- a/corehq/apps/hqwebapp/management/commands/build_requirejs.py
+++ b/corehq/apps/hqwebapp/management/commands/build_requirejs.py
@@ -235,7 +235,7 @@ def _get_main_js_modules_by_dir(html_files):
                 main = match.group(1)
                 directory = match.group(2)
                 if os.path.exists(os.path.join(ROOT_DIR, 'staticfiles', main + '.js')):
-                    if not re.search(r'/spec/', main):
+                    if '/spec/' not in main:
                         dirs[directory].add(main)
     return dirs
 

From 32fd0baeaccea7445765494d02ae9fcaefe9345f Mon Sep 17 00:00:00 2001
From: mkangia <mkangia@dimagi.com>
Date: Thu, 25 Jan 2024 02:37:56 +0530
Subject: [PATCH 113/118] updates messages

---
 corehq/apps/domain/tests/test_views.py | 2 +-
 corehq/apps/domain/views/settings.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/domain/tests/test_views.py b/corehq/apps/domain/tests/test_views.py
index ac777dae66d6..816978e07b74 100644
--- a/corehq/apps/domain/tests/test_views.py
+++ b/corehq/apps/domain/tests/test_views.py
@@ -334,7 +334,7 @@ def test_limiting_active_alerts(self):
         )
 
         messages = list(get_messages(response.wsgi_request))
-        self.assertEqual(messages[0].message, 'Alert not updated. Only 3 active alerts allowed.')
+        self.assertEqual(messages[0].message, 'Alert not activated. Only 3 active alerts allowed.')
 
 
 class TestDeleteDomainAlertView(TestBaseDomainAlertView):
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index e5e3855403c2..d4667a4287da 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -731,7 +731,7 @@ def _apply_update(request, alert):
     command = request.POST.get('command')
     if command == "activate":
         if Alert.objects.filter(created_by_domain=request.domain, active=True).count() >= MAX_ACTIVE_ALERTS:
-            messages.error(request, _("Alert not updated. Only 3 active alerts allowed."))
+            messages.error(request, _("Alert not activated. Only 3 active alerts allowed."))
             return
 
     if command in ['activate', 'deactivate']:

From 8f796ce910afdad11b481d53bafd241627606a30 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Thu, 25 Jan 2024 12:35:59 -0500
Subject: [PATCH 114/118] Added paths config for sentry

---
 .../hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js | 3 +++
 .../hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js | 3 +++
 .../hqwebapp/static/hqwebapp/yaml/bootstrap3/requirejs.yml     | 3 +++
 .../hqwebapp/static/hqwebapp/yaml/bootstrap5/requirejs.yml     | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
index 6f4a0a038da5..b65b30f71c70 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
@@ -10,6 +10,8 @@ requirejs.config({
         "datatables": "datatables.net/js/jquery.dataTables.min",
         "datatables.fixedColumns": "datatables-fixedcolumns/js/dataTables.fixedColumns",
         "datatables.bootstrap": "datatables-bootstrap3/BS3/assets/js/datatables",
+        "sentry_browser": "sentry/js/sentry.browser.7.28.0.min",
+        "sentry_captureconsole": "sentry/js/sentry.captureconsole.7.28.0.min",
     },
     shim: {
         "ace-builds/src-min-noconflict/ace": { exports: "ace" },
@@ -32,6 +34,7 @@ requirejs.config({
         "hqwebapp/js/lib/modernizr": {
             exports: 'Modernizr',
         },
+        "sentry_browser": { exports: "Sentry" },
     },
     packages: [{
         name: 'moment',
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
index 9a2cbde902aa..d6cc3141422d 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
@@ -18,6 +18,8 @@ requirejs.config({
         "popper": "@popperjs/core/dist/umd/popper.min",
         "tempus-dominus": "eonasdan/tempus-dominus/dist/js/tempus-dominus.min",
         "datepicker": "@eonasdan/tempus-dominus/dist/js/jQuery-provider.min",  // import this if you need jquery plugin of tempus-dominus
+        "sentry_browser": "sentry/js/sentry.browser.7.28.0.min",
+        "sentry_captureconsole": "sentry/js/sentry.captureconsole.7.28.0.min",
     },
     shim: {
         "ace-builds/src-min-noconflict/ace": { exports: "ace" },
@@ -43,6 +45,7 @@ requirejs.config({
         "datepicker": {
             deps: ['popper', 'tempus-dominus'],
         },
+        "sentry_browser": { exports: "Sentry" },
     },
     packages: [{
         name: 'moment',
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap3/requirejs.yml b/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap3/requirejs.yml
index 910e31e75e2e..7f2a2eefa661 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap3/requirejs.yml
+++ b/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap3/requirejs.yml
@@ -9,6 +9,9 @@ skipDirOptimize: true   # could turn this off to minify everything
 generateSourceMaps: false
 optimize: none
 fileExclusionRegExp: ^\.|\.css$
+paths:
+  sentry_browser: "empty:"
+  sentry_captureconsole: "empty:"
 modules:
   # These two modules are referenced in hqwebapp/base.html, not in a requirejs_main tag,
   # so they won't get picked up by build_requirejs.py and instead need to be specified here
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap5/requirejs.yml b/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap5/requirejs.yml
index 3b3802cfb6b9..b9177a2078f6 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap5/requirejs.yml
+++ b/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap5/requirejs.yml
@@ -9,6 +9,9 @@ skipDirOptimize: true   # could turn this off to minify everything
 generateSourceMaps: false
 optimize: none
 fileExclusionRegExp: ^\.|\.css$
+paths:
+  sentry_browser: "empty:"
+  sentry_captureconsole: "empty:"
 modules:
   # These two modules are referenced in hqwebapp/base.html, not in a requirejs_main tag,
   # so they won't get picked up by build_requirejs.py and instead need to be specified here

From f32ebe75aaf2577b3e23ece88e3708081040ba00 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Thu, 25 Jan 2024 12:41:00 -0500
Subject: [PATCH 115/118] Updated config ordering

Alphabetize to reduce new items being added to the bottom of the list, which leads to staging conflicts.
---
 .../js/bootstrap3/requirejs_config.js         | 28 ++++++-------
 .../js/bootstrap5/requirejs_config.js         | 40 +++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
index b65b30f71c70..a1f8552debbe 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
@@ -2,38 +2,38 @@
 requirejs.config({
     baseUrl: '/static/',
     paths: {
-        "jquery": "jquery/dist/jquery.min",
-        "underscore": "underscore/underscore",
         "bootstrap": "bootstrap/dist/js/bootstrap.min",
-        "knockout": "knockout/build/output/knockout-latest.debug",
-        "ko.mapping": "hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min",
         "datatables": "datatables.net/js/jquery.dataTables.min",
-        "datatables.fixedColumns": "datatables-fixedcolumns/js/dataTables.fixedColumns",
         "datatables.bootstrap": "datatables-bootstrap3/BS3/assets/js/datatables",
+        "datatables.fixedColumns": "datatables-fixedcolumns/js/dataTables.fixedColumns",
+        "jquery": "jquery/dist/jquery.min",
+        "knockout": "knockout/build/output/knockout-latest.debug",
+        "ko.mapping": "hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min",
         "sentry_browser": "sentry/js/sentry.browser.7.28.0.min",
         "sentry_captureconsole": "sentry/js/sentry.captureconsole.7.28.0.min",
+        "underscore": "underscore/underscore",
     },
     shim: {
+        "accounting/js/lib/stripe": { exports: 'Stripe' },
         "ace-builds/src-min-noconflict/ace": { exports: "ace" },
         "bootstrap": { deps: ['jquery'] },
-        "ko.mapping": { deps: ['knockout'] },
-        "hqwebapp/js/bootstrap3/hq.helpers": { deps: ['jquery', 'bootstrap', 'knockout', 'underscore'] },
         "datatables.bootstrap": { deps: ['datatables'] },
+        "d3/d3.min": {
+            "exports": "d3",
+        },
+        "hqwebapp/js/bootstrap3/hq.helpers": { deps: ['jquery', 'bootstrap', 'knockout', 'underscore'] },
+        "hqwebapp/js/lib/modernizr": {
+            exports: 'Modernizr',
+        },
         "jquery.rmi/jquery.rmi": {
             deps: ['jquery', 'knockout', 'underscore'],
             exports: 'RMI',
         },
-        "accounting/js/lib/stripe": { exports: 'Stripe' },
-        "d3/d3.min": {
-            "exports": "d3",
-        },
+        "ko.mapping": { deps: ['knockout'] },
         "nvd3/nv.d3.min": {
             deps: ['d3/d3.min'],
             exports: 'nv',
         },
-        "hqwebapp/js/lib/modernizr": {
-            exports: 'Modernizr',
-        },
         "sentry_browser": { exports: "Sentry" },
     },
     packages: [{
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
index d6cc3141422d..27152b7d93e4 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
@@ -2,48 +2,48 @@
 requirejs.config({
     baseUrl: '/static/',
     paths: {
-        "es6": "requirejs-babel7/es6",
         "babel": "@babel/standalone/babel.min",
         "babel-plugin-transform-modules-requirejs-babel": "babel-plugin-transform-modules-requirejs-babel/index",
-        "jquery": "jquery/dist/jquery.min",
-        "underscore": "underscore/underscore",
         "bootstrap": "bootstrap/dist/js/bootstrap.min",
         "bootstrap5": "bootstrap5/dist/js/bootstrap.bundle.min",
-        "knockout": "knockout/build/output/knockout-latest.debug",
-        "ko.mapping": "hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min",
         "datatables": "datatables.net/js/jquery.dataTables.min",
+        "datatables.bootstrap": "datatables.net-bs5/js/dataTables.bootstrap5.min",
         "datatables.fixedColumns": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
         "datatables.fixedColumns.bootstrap": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
-        "datatables.bootstrap": "datatables.net-bs5/js/dataTables.bootstrap5.min",
-        "popper": "@popperjs/core/dist/umd/popper.min",
-        "tempus-dominus": "eonasdan/tempus-dominus/dist/js/tempus-dominus.min",
         "datepicker": "@eonasdan/tempus-dominus/dist/js/jQuery-provider.min",  // import this if you need jquery plugin of tempus-dominus
+        "es6": "requirejs-babel7/es6",
+        "jquery": "jquery/dist/jquery.min",
+        "knockout": "knockout/build/output/knockout-latest.debug",
+        "ko.mapping": "hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min",
+        "popper": "@popperjs/core/dist/umd/popper.min",
         "sentry_browser": "sentry/js/sentry.browser.7.28.0.min",
         "sentry_captureconsole": "sentry/js/sentry.captureconsole.7.28.0.min",
+        "tempus-dominus": "eonasdan/tempus-dominus/dist/js/tempus-dominus.min",
+        "underscore": "underscore/underscore",
     },
     shim: {
+        "accounting/js/lib/stripe": { exports: 'Stripe' },
         "ace-builds/src-min-noconflict/ace": { exports: "ace" },
-        "ko.mapping": { deps: ['knockout'] },
-        "hqwebapp/js/bootstrap5/hq.helpers": { deps: ['jquery', 'knockout', 'underscore'] },
         "datatables.bootstrap": { deps: ['datatables'] },
         "datatables.fixedColumns.bootstrap": { deps: ['datatables.fixedColumns'] },
-        "jquery.rmi/jquery.rmi": {
-            deps: ['jquery', 'knockout', 'underscore'],
-            exports: 'RMI',
+        "datepicker": {
+            deps: ['popper', 'tempus-dominus'],
         },
-        "accounting/js/lib/stripe": { exports: 'Stripe' },
         "d3/d3.min": {
             "exports": "d3",
         },
-        "nvd3/nv.d3.min": {
-            deps: ['d3/d3.min'],
-            exports: 'nv',
-        },
+        "hqwebapp/js/bootstrap5/hq.helpers": { deps: ['jquery', 'knockout', 'underscore'] },
         "hqwebapp/js/lib/modernizr": {
             exports: 'Modernizr',
         },
-        "datepicker": {
-            deps: ['popper', 'tempus-dominus'],
+        "jquery.rmi/jquery.rmi": {
+            deps: ['jquery', 'knockout', 'underscore'],
+            exports: 'RMI',
+        },
+        "ko.mapping": { deps: ['knockout'] },
+        "nvd3/nv.d3.min": {
+            deps: ['d3/d3.min'],
+            exports: 'nv',
         },
         "sentry_browser": { exports: "Sentry" },
     },

From d79c9b98791eea5337dcdf096166d25f0daebac7 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Thu, 25 Jan 2024 13:05:55 -0500
Subject: [PATCH 116/118] Ran build_bootstrap5_diffs

---
 .../javascript/hqwebapp/main.js.diff.txt      |  2 +-
 .../hqwebapp/requirejs_config.js.diff.txt     | 44 +++++++++----------
 .../imports/layouts._layouts.style.diff.txt   |  1 +
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/main.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/main.js.diff.txt
index f0d1a1e84882..49e920c95437 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/main.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/main.js.diff.txt
@@ -33,7 +33,7 @@
 -        $("input[type='submit']", $elem).button();
          $("input[type='text'], input[type='password'], textarea", $elem);
          $('.config', $elem).wrap('<div />').parent().addClass('container block ui-corner-all');
-
+ 
 @@ -129,7 +129,7 @@
          'use strict';
          var key;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt
index 67e1fcb69468..e74ab86dc90f 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt
@@ -1,50 +1,48 @@
 --- 
 +++ 
-@@ -2,21 +2,29 @@
+@@ -2,26 +2,37 @@
  requirejs.config({
      baseUrl: '/static/',
      paths: {
-+        "es6": "requirejs-babel7/es6",
 +        "babel": "@babel/standalone/babel.min",
 +        "babel-plugin-transform-modules-requirejs-babel": "babel-plugin-transform-modules-requirejs-babel/index",
-         "jquery": "jquery/dist/jquery.min",
-         "underscore": "underscore/underscore",
          "bootstrap": "bootstrap/dist/js/bootstrap.min",
 +        "bootstrap5": "bootstrap5/dist/js/bootstrap.bundle.min",
-         "knockout": "knockout/build/output/knockout-latest.debug",
-         "ko.mapping": "hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min",
          "datatables": "datatables.net/js/jquery.dataTables.min",
--        "datatables.fixedColumns": "datatables-fixedcolumns/js/dataTables.fixedColumns",
 -        "datatables.bootstrap": "datatables-bootstrap3/BS3/assets/js/datatables",
+-        "datatables.fixedColumns": "datatables-fixedcolumns/js/dataTables.fixedColumns",
++        "datatables.bootstrap": "datatables.net-bs5/js/dataTables.bootstrap5.min",
 +        "datatables.fixedColumns": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
 +        "datatables.fixedColumns.bootstrap": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
-+        "datatables.bootstrap": "datatables.net-bs5/js/dataTables.bootstrap5.min",
++        "datepicker": "@eonasdan/tempus-dominus/dist/js/jQuery-provider.min",  // import this if you need jquery plugin of tempus-dominus
++        "es6": "requirejs-babel7/es6",
+         "jquery": "jquery/dist/jquery.min",
+         "knockout": "knockout/build/output/knockout-latest.debug",
+         "ko.mapping": "hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min",
 +        "popper": "@popperjs/core/dist/umd/popper.min",
+         "sentry_browser": "sentry/js/sentry.browser.7.28.0.min",
+         "sentry_captureconsole": "sentry/js/sentry.captureconsole.7.28.0.min",
 +        "tempus-dominus": "eonasdan/tempus-dominus/dist/js/tempus-dominus.min",
-+        "datepicker": "@eonasdan/tempus-dominus/dist/js/jQuery-provider.min",  // import this if you need jquery plugin of tempus-dominus
+         "underscore": "underscore/underscore",
      },
      shim: {
+         "accounting/js/lib/stripe": { exports: 'Stripe' },
          "ace-builds/src-min-noconflict/ace": { exports: "ace" },
 -        "bootstrap": { deps: ['jquery'] },
-         "ko.mapping": { deps: ['knockout'] },
--        "hqwebapp/js/bootstrap3/hq.helpers": { deps: ['jquery', 'bootstrap', 'knockout', 'underscore'] },
-+        "hqwebapp/js/bootstrap5/hq.helpers": { deps: ['jquery', 'knockout', 'underscore'] },
          "datatables.bootstrap": { deps: ['datatables'] },
 +        "datatables.fixedColumns.bootstrap": { deps: ['datatables.fixedColumns'] },
-         "jquery.rmi/jquery.rmi": {
-             deps: ['jquery', 'knockout', 'underscore'],
-             exports: 'RMI',
-@@ -32,6 +40,9 @@
-         "hqwebapp/js/lib/modernizr": {
-             exports: 'Modernizr',
-         },
 +        "datepicker": {
 +            deps: ['popper', 'tempus-dominus'],
 +        },
-     },
-     packages: [{
-         name: 'moment',
-@@ -44,7 +55,7 @@
+         "d3/d3.min": {
+             "exports": "d3",
+         },
+-        "hqwebapp/js/bootstrap3/hq.helpers": { deps: ['jquery', 'bootstrap', 'knockout', 'underscore'] },
++        "hqwebapp/js/bootstrap5/hq.helpers": { deps: ['jquery', 'knockout', 'underscore'] },
+         "hqwebapp/js/lib/modernizr": {
+             exports: 'Modernizr',
+         },
+@@ -47,7 +58,7 @@
          },
      },
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/layouts._layouts.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/layouts._layouts.style.diff.txt
index b4c49a4dc3f9..5afce44202ad 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/layouts._layouts.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/layouts._layouts.style.diff.txt
@@ -23,3 +23,4 @@
 +  border-top: 1px solid $cc-neutral-hi;
    padding-top: 8px;
    margin-top:10px;
+ 

From 0e1d794a6971f5843d9aa9410532bf6d27b09603 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Thu, 25 Jan 2024 15:37:56 -0500
Subject: [PATCH 117/118] Fixed lint error

---
 .../hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js   | 1 -
 .../hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
index a1f8552debbe..a3d1dc30e164 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
@@ -1,4 +1,3 @@
-/* globals requirejs */
 requirejs.config({
     baseUrl: '/static/',
     paths: {
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
index 27152b7d93e4..091ee84ad38e 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
@@ -1,4 +1,3 @@
-/* globals requirejs */
 requirejs.config({
     baseUrl: '/static/',
     paths: {

From 6a8fd043e6f58a0416ece590a0c5ddcdaad3b931 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Thu, 25 Jan 2024 15:39:13 -0500
Subject: [PATCH 118/118] Ran build_bootstrap5_diffs

---
 .../javascript/hqwebapp/requirejs_config.js.diff.txt          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt
index e74ab86dc90f..d78a8573ed80 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -2,26 +2,37 @@
+@@ -1,26 +1,37 @@
  requirejs.config({
      baseUrl: '/static/',
      paths: {
@@ -42,7 +42,7 @@
          "hqwebapp/js/lib/modernizr": {
              exports: 'Modernizr',
          },
-@@ -47,7 +58,7 @@
+@@ -46,7 +57,7 @@
          },
      },