Merge pull request #33307 from dimagi/smh/sscs-subtitles-min-cc-build

SSCS: Add check for minimum version requirement on build
dimagi · Aug 1, 2023 · 705f47f · 705f47f
2 parents 798d698 + c944ddf
commit 705f47f
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 91 deletions.
diff --git a/corehq/apps/app_manager/feature_support.py b/corehq/apps/app_manager/feature_support.py
@@ -234,3 +234,10 @@ def supports_grouped_case_tiles(self):
             toggles.CASE_LIST_TILE.enabled(self.domain)
             and self._require_minimum_version('2.54')
         )
+
+    @property
+    def supports_split_screen_case_search(self):
+        return (
+            toggles.SPLIT_SCREEN_CASE_SEARCH.enabled(self.domain)
+            and self._require_minimum_version('2.54')
+        )
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
@@ -216,7 +216,7 @@ def build_remote_request_queries(self):
                 data=self._remote_request_query_datums,
                 prompts=self.build_query_prompts(),
                 default_search=self.module.search_config.default_search,
-                results_title=self.build_results_title(),
+                results_title=self.build_results_title() if self.app.supports_split_screen_case_search else None,
             )
         ]
 

diff --git a/corehq/apps/app_manager/tests/data/suite/multi_select_case_list/basic_remote_request.xml b/corehq/apps/app_manager/tests/data/suite/multi_select_case_list/basic_remote_request.xml
@@ -20,11 +20,6 @@
     <instance id="search_selected_cases" src="jr://instance/selected-entities/search_selected_cases"/>
     <session>
       <query default_search="false" storage-instance="results" template="case" url="https://www.example.com/a/multiple-referrals/phone/search/{app_id}/">
-        <results-title>
-          <text>
-            <locale id="case_search.m0"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.m0.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite/remote_request.xml b/corehq/apps/app_manager/tests/data/suite/remote_request.xml
@@ -25,11 +25,6 @@
              default_search="false"
              storage-instance="results"
              template="case">
-        <results-title>
-          <text>
-            <locale id="case_search.{module_id}"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.{module_id}.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite/remote_request_custom_detail.xml b/corehq/apps/app_manager/tests/data/suite/remote_request_custom_detail.xml
@@ -23,11 +23,6 @@
              default_search="false"
              storage-instance="results"
              template="case">
-        <results-title>
-          <text>
-            <locale id="case_search.m0"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.m0.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite/search_config_blacklisted_owners.xml b/corehq/apps/app_manager/tests/data/suite/search_config_blacklisted_owners.xml
@@ -22,11 +22,6 @@
              default_search="false"
              storage-instance="results"
              template="case">
-        <results-title>
-          <text>
-            <locale id="case_search.m0"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.m0.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite/search_config_default_only.xml b/corehq/apps/app_manager/tests/data/suite/search_config_default_only.xml
@@ -23,11 +23,6 @@
              default_search="false"
              storage-instance="results"
              template="case">
-        <results-title>
-          <text>
-            <locale id="case_search.m0"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.m0.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite/smart_link_remote_request.xml b/corehq/apps/app_manager/tests/data/suite/smart_link_remote_request.xml
@@ -16,11 +16,6 @@
     <instance id="results" src="jr://instance/remote/results"/>
     <session>
       <query default_search="false" storage-instance="results" template="case" url="https://www.example.com/a/test_domain/phone/search/{app_id}/">
-        <results-title>
-          <text>
-            <locale id="case_search.m1"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.m1.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite_inline_search/shadow_module_entry.xml b/corehq/apps/app_manager/tests/data/suite_inline_search/shadow_module_entry.xml
@@ -17,11 +17,6 @@
         <session>
             <query default_search="false" storage-instance="results:inline" template="case"
                    url="http://localhost:8000/a/test_domain/phone/search/456/">
-                <results-title>
-                  <text>
-                    <locale id="case_search.m1"/>
-                  </text>
-                </results-title>
                 <title>
                     <text>
                         <locale id="case_search.m1.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite_registry/form_link_followup_module_registry.xml b/corehq/apps/app_manager/tests/data/suite_registry/form_link_followup_module_registry.xml
@@ -11,11 +11,6 @@
         <instance id="results" src="jr://instance/remote/results"/>
         <session>
           <query url="http://localhost:8000/a/test_domain/phone/search/123/" storage-instance="results" template="case" default_search="false">
-            <results-title>
-              <text>
-                <locale id="case_search.m0"/>
-              </text>
-            </results-title>
             <title>
               <text>
                 <locale id="case_search.m0.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite_registry/shadow_module_entry.xml b/corehq/apps/app_manager/tests/data/suite_registry/shadow_module_entry.xml
@@ -11,11 +11,6 @@
     <instance id="results" src="jr://instance/remote/results"/>
     <session>
       <query default_search="false" storage-instance="results" template="case" url="https://www.example.com/a/test_domain/phone/search/456/">
-        <results-title>
-          <text>
-            <locale id="case_search.m1"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.m1.inputs"/>

diff --git a/corehq/apps/app_manager/tests/data/suite_registry/shadow_module_remote_request.xml b/corehq/apps/app_manager/tests/data/suite_registry/shadow_module_remote_request.xml
@@ -16,11 +16,6 @@
     <instance id="results" src="jr://instance/remote/results"/>
     <session>
       <query default_search="false" storage-instance="results" template="case" url="https://www.example.com/a/test_domain/phone/search/456/">
-        <results-title>
-          <text>
-            <locale id="case_search.m1"/>
-          </text>
-        </results-title>
         <title>
           <text>
             <locale id="case_search.m1.inputs"/>

diff --git a/corehq/apps/app_manager/tests/test_advanced_suite.py b/corehq/apps/app_manager/tests/test_advanced_suite.py
@@ -391,11 +391,6 @@ def test_advanced_module_remote_request(self, *args):
             <session>
               <query url="http://localhost:8000/a/domain/phone/search/123/"
                 storage-instance="results" template="case" default_search="false">
-                <results-title>
-                  <text>
-                    <locale id="case_search.m0"/>
-                  </text>
-                </results-title>
                 <title>
                     <text>
                         <locale id="case_search.m0.inputs"/>

diff --git a/corehq/apps/app_manager/tests/test_suite_inline_search.py b/corehq/apps/app_manager/tests/test_suite_inline_search.py
@@ -104,11 +104,6 @@ def test_inline_search(self):
             <session>
                 <query url="http://localhost:8000/a/test_domain/phone/search/123/"
                     storage-instance="{RESULTS_INSTANCE_INLINE}" template="case" default_search="false">
-                  <results-title>
-                    <text>
-                      <locale id="case_search.m0"/>
-                    </text>
-                  </results-title>
                   <title>
                     <text>
                       <locale id="case_search.m0.inputs"/>
@@ -152,11 +147,6 @@ def test_inline_search_case_list_item(self):
             <session>
                 <query url="http://localhost:8000/a/test_domain/phone/search/123/"
                     storage-instance="{RESULTS_INSTANCE_INLINE}" template="case" default_search="false">
-                  <results-title>
-                    <text>
-                      <locale id="case_search.m0"/>
-                    </text>
-                  </results-title>
                   <title>
                     <text>
                         <locale id="case_search.m0.inputs"/>
@@ -212,11 +202,6 @@ def test_inline_search_multi_select(self):
                 <query url="http://localhost:8000/a/test_domain/phone/search/123/"
                     storage-instance="{RESULTS_INSTANCE_INLINE}"
                     template="case" default_search="false">
-                  <results-title>
-                    <text>
-                      <locale id="case_search.m0"/>
-                    </text>
-                  </results-title>
                   <title>
                     <text>
                         <locale id="case_search.m0.inputs"/>
@@ -411,11 +396,6 @@ def test_inline_search_with_parent_select(self):
                 value="./@case_id" detail-select="m2_case_short"/>
               <query url="http://localhost:8000/a/test_domain/phone/search/123/"
                 storage-instance="{RESULTS_INSTANCE_INLINE}" template="case" default_search="false">
-                <results-title>
-                  <text>
-                    <locale id="case_search.m0"/>
-                  </text>
-                </results-title>
                 <title>
                   <text>
                       <locale id="case_search.m0.inputs"/>
@@ -585,11 +565,6 @@ def test_child_module_with_inline_search_entry(self):
                 value="./@case_id" detail-select="m0_case_short"/>
               <query url="http://localhost:8000/a/test_domain/phone/search/123/"
                 storage-instance="{RESULTS_INSTANCE_INLINE}" template="case" default_search="false">
-                <results-title>
-                  <text>
-                    <locale id="case_search.m1"/>
-                  </text>
-                </results-title>
                 <title>
                   <text>
                       <locale id="case_search.m1.inputs"/>

diff --git a/corehq/apps/app_manager/tests/test_suite_registry_search.py b/corehq/apps/app_manager/tests/test_suite_registry_search.py
@@ -104,11 +104,6 @@ def test_search_data_registry(self, *args):
           <session>
             <query url="http://localhost:8000/a/test_domain/phone/search/123/" storage-instance="results"
                 template="case" default_search="false">
-                <results-title>
-                  <text>
-                    <locale id="case_search.m0"/>
-                  </text>
-                </results-title>
                 <title>
                     <text>
                         <locale id="case_search.m0.inputs"/>
@@ -557,11 +552,6 @@ def test_inline_search_with_data_registry(self):
             <session>
                 <query url="http://localhost:8000/a/test_domain/phone/search/123/" storage-instance="{RESULTS_INSTANCE_INLINE}"
                     template="case" default_search="false">
-                  <results-title>
-                    <text>
-                      <locale id="case_search.m0"/>
-                    </text>
-                  </results-title>
                   <title>
                     <text>
                       <locale id="case_search.m0.inputs"/>