refactor(frontend): Show sieve filter match type dropdown conditionnaly

Author: camilevahviraki

modules/imap/setup.php

@@ -16,6 +16,8 @@
 /* add stuff to the info page */
 add_output('info', 'display_imap_status', true, 'imap', 'server_status_start', 'after');
 add_output('info', 'display_imap_capability', true, 'imap', 'server_capabilities_start', 'after');
+add_output('info', 'server_capabilities_end', true, 'developer', 'server_capabilities_start', 'after');
+add_output('info', 'config_map', true, 'developer', 'server_capabilities_end', 'after');
 add_output('info', 'imap_server_ids', true, 'imap', 'page_js', 'before');
 
 /* servers page data */

modules/sievefilters/functions.php

@@ -46,13 +46,6 @@ function get_classic_filter_modal_content()
                 <label for="sieve-filter-priority" class="form-label fw-bold">Priority:</label>
                 <input class="modal_sieve_filter_priority form-control" type="number" placeholder="0" id="sieve-filter-priority" />
             </div>
-            <div class="mb-2">
-                <label for="sieve-filter-test" class="form-label fw-bold">Test:</label>
-                <select class="modal_sieve_filter_test form-control" name="test_type" placeholder="0" id="sieve-filter-test">
-                    <option value="ANYOF">ANYOF (OR)</option>
-                    <option value="ALLOF" selected>ALLOF (AND)</option>
-                </select>
-            </div>
             <div class="d-block mb-2 mt-4">
                 <h3 class="mb-1">Conditions & Actions</h3>
                 <small>Filters must have at least one action and one condition</small>

modules/sievefilters/site.js

@@ -630,7 +630,7 @@ function sieveFiltersPageHandler() {
         });
         let extra_options = '<td class="col-sm-3"><input type="hidden" class="condition_extra_value form-control form-control-sm" name="sieve_selected_extra_option_value[]" /></td>';
         $('.sieve_list_conditions_modal').append(
-            '                            <tr>' +
+            '                            <tr class="sieve_condition_row">' +
             '                                <td class="col-sm-2">' +
             '                                    <select class="add_condition_sieve_filters form-control form-control-sm" name="sieve_selected_conditions_field[]">' +
             '                                        <optgroup label="Message">' +
@@ -674,11 +674,30 @@ function sieveFiltersPageHandler() {
         );
     }
 
+    function add_filter_match_mode() {
+        let conditionRows = $(".sieve_list_conditions_modal tr").length;
+        if (conditionRows >= 2) {
+            if ($(".sieve_match_mode").length === 0) {
+                $(".sieve_list_conditions_modal").before(
+                  '<div class="sieve_match_mode mb-2">' +
+                    '   <label class="me-2">Match</label>' +
+                    '   <select name="sieve_match_mode" class="modal_sieve_filter_test form-select-sm d-inline w-auto">' +
+                    '       <option value="ALLOF">ALL</option>' +
+                    '       <option value="ANYOF">ANY</option>' +
+                    "   </select>" +
+                    "   of the following rules:" +
+                    "</div>"
+                );
+            }
+        }
+    }
+
     /**
      * Add Condition Button
      */
     $(document).on('click', '.sieve_add_condition_modal_button', function () {
         add_filter_condition();
+        add_filter_match_mode();
     });
 
     function add_filter_action(default_value = '') {