[Story]: Add checkboxes to the items in the search filters

ckanext/ontario_theme/fanstatic/scripts/odc-access-level.js

@@ -0,0 +1,70 @@
+// Enable JavaScript's strict mode. Strict mode catches some common
+// programming errors and throws exceptions, prevents some unsafe actions from
+// being taken, and disables some confusing and bad JavaScript features.
+
+/*
+ * CKAN module function for submitting form on checkbox selection and
+ * updating callout
+ *
+ * accessLevelBoxes
+ *  All the access level checkboxes in the search bar
+ * openCheckbox
+ *  The checkbox with value open
+ */
+"use strict";
+
+ckan.module('access_level_checkboxes', function ($) {
+    return {
+        options: {
+            accessLevelBoxes: null,
+            openCheckbox: null,
+		},
+        initialize: function () {
+            this.accessLevelBoxes = $('input[name="access_level"][type="checkbox"]');
+            var params = new URLSearchParams(document.location.search);
+            this.openCheckbox = $("#checkbox-option-open");
+            // "Open" checkbox checked by default
+            // else get access_level params and check the appropriate boxes
+            if (!params.has("access_level") && this.openCheckbox) {
+                this.openCheckbox.prop('checked', true);
+            } else if (params.has("access_level")) {
+                var selected_levels = params.getAll("access_level");
+                selected_levels.forEach(function(e) {
+                    $(`#checkbox-option-${e}`).prop('checked', true);
+                });
+            }
+            // Update checkboxes and callout
+            $(this.accessLevelBoxes).on('change', jQuery.proxy(this._onChange, this));
+            $(document).ready(jQuery.proxy(this._updateAccessLevelSentence, this));
+        },
+        _onChange: function () {
+            let form = $('form.search-form');
+            form.submit();
+        },
+        _updateAccessLevelSentence: function () {
+            const selectedBoxes = $('input[name="access_level"]:checked');
+            const calloutElement = $('#access-level-sentence-value');
+            const and = this._(' and ');
+            const all_levels = this._('All levels');
+
+            var displayName = "";
+
+            // Update callout based on number of checkboxes checked and the value
+            if (selectedBoxes.length === this.accessLevelBoxes.length) {
+                displayName = all_levels;
+            } else if (selectedBoxes.length === 1) {
+                displayName = selectedBoxes.first().data('display-name');
+            } else {
+                selectedBoxes.each(function(index) {
+                    displayName += $(this).data('display-name');
+                    if (index < selectedBoxes.length - 1) {
+                        displayName += and
+                    }
+                });
+            }
+            if (calloutElement) {
+                calloutElement.text(displayName);
+            }
+        }
+    }
+});

ckanext/ontario_theme/fanstatic/scripts/odc-clear-filters.js

@@ -1,21 +1,27 @@
-(function () {
-    var clearFiltersButton = document.getElementById("clear-filters-button");
-    var facetsSelected = document.querySelectorAll(".filtered.pill");
+// Enable JavaScript's strict mode. Strict mode catches some common
+// programming errors and throws exceptions, prevents some unsafe actions from
+// being taken, and disables some confusing and bad JavaScript features.
 
-    if (facetsSelected.length >= 2) {
-        clearFiltersButton.style.display = "inline-block";
-        clearFiltersButton.addEventListener('click', clearFilters);
-    }
-    function clearFilters() {
-        const url = window.location.href.split('?')[0];
-        let params = new URLSearchParams(document.location.search);
-        let array = Array.from(params);
-        for (const field of array) {
-            const [key, value] = field;
-            if ((key != 'q')) {
-                params.delete(key);
-            }
-        }
-        window.location.href = `${url}?${params}`;
+/*
+ * CKAN module function for submitting form with empty facets once the clear
+ * filters button is clicked
+ */
+
+"use strict";
+
+ckan.module('clear_filters', function ($) {
+  return {
+      initialize: function () {
+          const facetsSelected = $(".filtered.pill");
+          if (facetsSelected.length >= 2) {
+              this.el.css({ display: "inline-block" });
+              this.el.on('click', jQuery.proxy(this._onClick, this));
+          }
+    },
+    _onClick: function (event) {
+        $('#fields').empty();
+        let form = $('form.search-form');
+        form.submit();
     }
-})();
+  }
+});

ckanext/ontario_theme/fanstatic/scripts/odc-facet-checkboxes.js

@@ -0,0 +1,32 @@
+// Enable JavaScript's strict mode. Strict mode catches some common
+// programming errors and throws exceptions, prevents some unsafe actions from
+// being taken, and disables some confusing and bad JavaScript features.
+
+/*
+ * CKAN module function for submitting form on facet checkbox selection with
+ * CKAN's hidden form inputs
+ */
+
+"use strict";
+
+ckan.module('facet_checkboxes', function ($) {
+  return {
+    initialize: function () {
+      $(".facet-fieldset :checkbox").on('click', jQuery.proxy(this._onChange, this));
+    },
+    _onChange: function (event) {
+      const hiddenFields = $('#fields');
+      if (event.target.checked) {
+        $('<input>').attr({
+          type: 'hidden',
+          name: event.target.name,
+          value: event.target.value
+        }).appendTo(hiddenFields);
+      } else {
+        $(`input[name='${event.target.name}'][value='${event.target.value}']`).remove();
+      }
+      let form = $('form.search-form');
+      form.submit();
+    }
+  }
+});

ckanext/ontario_theme/fanstatic/scripts/odc-search.js

@@ -35,22 +35,25 @@ const inputIds = [{
 inputIds.forEach(input => {
     const textId = document.getElementById(input.textId);
     const resetId = document.getElementById(input.resetId);
-    if(textId && textId.value != ""){
-        searchReset(resetId,textId);
-    }
-    if(textId){
+    var typedText = "";
+
+    if (textId && resetId) {
+        textId.addEventListener("input", function(e) {
+            typedText = e.target.value; // Update typedText with current input value
+        });
+
+        resetId.addEventListener("click", function (e) {
+            e.preventDefault();
+            textId.value = "";
+            typedText = "";
+            textId.focus();
+        });
+
         textId.addEventListener("keyup", function (e) {
             if (e.key === "Escape" || e.keyCode === KEYCODE.ESCAPE) {
                 resetId.click();
             }
         });
     }
 });
-
-function searchReset(resetId, textId) {
-    resetId.addEventListener("click", () => {
-        textId.defaultValue = "";
-        textId.focus();
-    });
-}
 })();

ckanext/ontario_theme/fanstatic/scripts/webassets.yml

@@ -8,13 +8,32 @@ ontario_theme_js:
     - odc-active-page.js
     - odc-active-tab.js
     - odc-search-modal.js
-    - odc-clear-filters.js
     - odc-toc-smooth-scroll.js
 
 ontario_theme_form_validators_js:
   filters: rjsmin
   contents: odc-dataset-form-validators.js
   output: ontario_theme_scripts/%(version)s_odc-dataset-form-validators.js
+  extra:
+    preload:
+      - vendor/jquery
+      - base/main
+
+ontario_theme_facet_checkboxes_js:
+  filters: rjsmin
+  contents:
+    - odc-facet-checkboxes.js
+    - odc-clear-filters.js
+  output: ontario_theme_scripts/%(version)s_odc-facet-checkboxes.js
+  extra:
+    preload:
+      - vendor/jquery
+      - base/main
+
+ontario_theme_access_level_js:
+  filters: rjsmin
+  contents: odc-access-level.js
+  output: ontario_theme_scripts/%(version)s_odc-access-level.js
   extra:
     preload:
       - vendor/jquery

ckanext/ontario_theme/i18n/ckanext-ontario_theme.pot

@@ -1318,33 +1318,33 @@ msgid "Please try another search or <a href=\"mailto:[email protected]\">reach
 msgstr ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:15
-msgid "<strong>{number} dataset</strong> found with the keyword(s) <strong>\"{query}\"</strong>"
-msgid_plural "<strong>{number} datasets</strong> found with the keyword(s) <strong>\"{query}\"</strong>"
+msgid "<strong>{number} total dataset</strong> found with the search term <strong>\"{query}\"</strong>"
+msgid_plural "<strong>{number} total datasets</strong> found with the search term <strong>\"{query}\"</strong>"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:17
-msgid "<strong>{number} dataset</strong> found"
-msgid_plural "<strong>{number} datasets</strong> found"
+msgid "<strong>{number} total dataset</strong> found"
+msgid_plural "<strong>{number} total datasets</strong> found"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:16
-msgid "No datasets found with the keyword(s) <strong>\"{query}\"</strong>"
+msgid "No datasets found with the search term <strong>\"{query}\"</strong>"
 msgstr ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:18
 msgid "No datasets found"
 msgstr ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:21
-msgid "<strong>{number} group</strong> found with the keyword(s) <strong>\"{query}\"</strong>"
-msgid_plural "<strong>{number} groups</strong> found with the keyword(s) <strong>\"{query}\"</strong>"
+msgid "<strong>{number} group</strong> found with the search term <strong>\"{query}\"</strong>"
+msgid_plural "<strong>{number} groups</strong> found with the search term <strong>\"{query}\"</strong>"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:22
-msgid "No groups found with the keyword(s) <strong>\"{query}\"</strong>"
+msgid "No groups found with the search term <strong>\"{query}\"</strong>"
 msgstr ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:23
@@ -1359,12 +1359,12 @@ msgstr ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:27
 msgid "<strong>{number} ministry</strong> found for <strong>\"{query}\"</strong>"
-msgid_plural "<strong>{number} ministries</strong> found with the keyword(s) <strong>\"{query}\"</strong>"
+msgid_plural "<strong>{number} ministries</strong> found with the search term <strong>\"{query}\"</strong>"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:28
-msgid "No ministries found with the keyword(s) <strong>\"{query}\"</strong>"
+msgid "No ministries found with the search term <strong>\"{query}\"</strong>"
 msgstr ""
 
 #: ckanext/ontario_theme/templates/internal/snippets/search_result_text.html:29
@@ -1377,6 +1377,16 @@ msgstr[1] ""
 msgid "No ministries found"
 msgstr ""
 
+#: ckanext/ontario_theme/templates/internal/snippets/access_level_checkboxes.html:26
+msgid "{level_count} dataset with access level"
+msgid_plural "{level_count} datasets with access level"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ckanext/ontario_theme/templates/internal/snippets/search_form.html:242
+msgid "We also found"
+msgstr "Nous avons également trouvé"
+
 #: ckanext/ontario_theme/templates/internal/user/dashboard.html:6
 msgid "Edit settings"
 msgstr ""
@@ -1471,6 +1481,31 @@ msgstr ""
 msgid "Sort by"
 msgstr ""
 
+#: ckanext/ontario_theme/fanstatic/scripts/odc-access.js:72
+msgid " and "
+msgstr ""
+
+#: ckanext/ontario_theme/fanstatic/scripts/odc-access.js:73
+msgid "All levels"
+msgstr ""
+
+#: ckanext/ontario_theme/templates/internal/snippets/search_form.html:83
+msgid "Showing datasets with access level"
+msgstr ""
+
+#: ckanext/ontario_theme/templates/internal/snippets/search_form.html:199
+msgid "No datasets with access level"
+msgstr ""
+
+#: ckanext/ontario_theme/templates/internal/snippets/search_form.html:195
+msgid "No datasets found with search term <strong>\"{query}\"</strong> and access level"
+msgstr ""
+
+#: ckanext/ontario_theme/templates/internal/snippets/search_form.html:193
+msgid "Showing datasets found with search term <strong>\"{query}\"</strong> and access level"
+msgstr ""
+
+
 #: ckanext/ontario_theme/templates/internal/snippets/search_form.html:111
 msgid "Clear filters"
 msgstr ""