FF sync-on-form-entry and remove-special-chars

https://dimagi.atlassian.net/browse/USH-6459

Author: esoergel

corehq/apps/domain/templates/domain/admin/case_search.html

@@ -71,6 +71,7 @@ <h2>{% trans "Fuzzy Search Properties" %}</h2>
           </button>
         </div>
 
+        {% if request|toggle_enabled:"CASE_SEARCH_ADVANCED" %}
         <div data-bind="visible: toggleEnabled" class="mb-3">
           <h2>{% trans "Synchronous Web Apps Submissions" %}</h2>
           <p>
@@ -156,6 +157,8 @@ <h2>{% trans "Remove Special Characters" %}</h2>
             <i class="fa fa-plus"></i> {% trans "Add case property" %}
           </button>
         </div>
+        {% endif %}
+
       </form>
     </div>
   </div>

corehq/apps/domain/views/settings.py

@@ -439,7 +439,28 @@ def post(self, request, *args, **kwargs):
         )
         unneeded_fuzzies.delete()
 
-        ignore_patterns = request_json.get('ignore_patterns')
+        if enable:
+            enable_case_search(self.domain)
+        else:
+            disable_case_search(self.domain)
+
+        advanced_enabled = toggles.CASE_SEARCH_ADVANCED.enabled(self.domain)
+        config, _ = CaseSearchConfig.objects.update_or_create(domain=self.domain, defaults={
+            'enabled': request_json.get('enable'),
+            'synchronous_web_apps': request_json.get('synchronous_web_apps') if advanced_enabled else False,
+            'sync_cases_on_form_entry': (
+                request_json.get('sync_cases_on_form_entry')
+                if advanced_enabled else False
+            )
+        })
+        case_search_synchronous_web_apps_for_domain.clear(self.domain)
+        case_search_sync_cases_on_form_entry_enabled_for_domain.clear(self.domain)
+        config.fuzzy_properties.set(updated_fuzzies)
+        if advanced_enabled:
+            self.set_ignore_patterns(config, request_json.get('ignore_patterns'))
+        return json_response(self.page_context)
+
+    def set_ignore_patterns(self, config, ignore_patterns):
         updated_ignore_patterns = []
         update_ignore_pattern_ids = []
         for ignore_pattern_regex in ignore_patterns:
@@ -456,22 +477,7 @@ def post(self, request, *args, **kwargs):
             pk__in=update_ignore_pattern_ids
         )
         unneeded_ignore_patterns.delete()
-
-        if enable:
-            enable_case_search(self.domain)
-        else:
-            disable_case_search(self.domain)
-
-        config, _ = CaseSearchConfig.objects.update_or_create(domain=self.domain, defaults={
-            'enabled': request_json.get('enable'),
-            'synchronous_web_apps': request_json.get('synchronous_web_apps'),
-            'sync_cases_on_form_entry': request_json.get('sync_cases_on_form_entry'),
-        })
-        case_search_synchronous_web_apps_for_domain.clear(self.domain)
-        case_search_sync_cases_on_form_entry_enabled_for_domain.clear(self.domain)
         config.ignore_patterns.set(updated_ignore_patterns)
-        config.fuzzy_properties.set(updated_fuzzies)
-        return json_response(self.page_context)
 
     @property
     def page_context(self):