From b337d94755bbff662a4ba8b1c2621959ae346fba Mon Sep 17 00:00:00 2001
From: Katherine Thiessen <katherine.thiessen@phac-aspc.gc.ca>
Date: Fri, 10 Jan 2025 08:04:03 -0600
Subject: [PATCH] applying i18n

---
 app/components/advanced_search/group.html.erb |  2 +-
 .../advanced_search_component.html.erb        |  3 +++
 .../advanced_search_group_validator.rb        | 24 ++++++++++++-------
 .../projects/samples/search/_errors.html.erb  |  2 +-
 config/locales/en.yml                         | 11 ++++++++-
 config/locales/fr.yml                         | 11 ++++++++-
 .../advanced_search_component_preview.rb      |  2 +-
 7 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/app/components/advanced_search/group.html.erb b/app/components/advanced_search/group.html.erb
index b8dfec0e7e..5997297a5c 100644
--- a/app/components/advanced_search/group.html.erb
+++ b/app/components/advanced_search/group.html.erb
@@ -1,8 +1,8 @@
-<div id="group-error-messages-<%= @group_index %>"></div>
 <div
   data-advanced-search-target="groupsContainer"
   class="bg-slate-100 border border-gray-300 rounded-lg"
 >
+  <div id="group-error-messages-<%= @group_index %>"></div>
   <%= @form.fields_for :groups, @group do |groups_form| %>
     <% @group.conditions.each do |condition| %>
       <%= render AdvancedSearch::Condition.new(
diff --git a/app/components/advanced_search_component.html.erb b/app/components/advanced_search_component.html.erb
index 2b37796328..750d273051 100644
--- a/app/components/advanced_search_component.html.erb
+++ b/app/components/advanced_search_component.html.erb
@@ -28,6 +28,9 @@
         <p class="text-base leading-relaxed text-slate-500 dark:text-slate-400">
           <%= t(".description") %>
         </p>
+        <p class="text-base leading-relaxed text-slate-500 dark:text-slate-400">
+          <%= t(".rules") %>
+        </p>
         <% @search.groups.each_with_index do |group, group_index| %>
           <%= render AdvancedSearch::Group.new(
             form: @form,
diff --git a/app/validators/advanced_search_group_validator.rb b/app/validators/advanced_search_group_validator.rb
index b466452a42..dea3581b2c 100644
--- a/app/validators/advanced_search_group_validator.rb
+++ b/app/validators/advanced_search_group_validator.rb
@@ -11,7 +11,7 @@ def validate(record)
     end
     return if groups_valid
 
-    record.errors.add :base, 'There are group errors.'
+    record.errors.add :base, I18n.t('validators.advanced_search_group_validator.base_error')
   end
 
   private
@@ -22,7 +22,7 @@ def validate_blank_fields(record, group, group_index)
     elsif group.conditions.any? do |condition|
       condition.field.blank? || condition.operator.blank? || condition.value.blank?
     end
-      record.groups[group_index].errors.add :base, 'Fields, operators, and values cannot be blank.'
+      record.groups[group_index].errors.add :base, I18n.t('validators.advanced_search_group_validator.blank_error')
     end
   end
 
@@ -30,7 +30,7 @@ def validate_blank_fields_for_condition(record, group, group_index)
     condition = group.conditions.first
     unless (condition.field.blank? && condition.operator.blank? && condition.value.blank?) ||
            (condition.field.present? && condition.operator.present? && condition.value.present?)
-      record.groups[group_index].errors.add :base, 'Fields, operators, and values cannot be blank.'
+      record.groups[group_index].errors.add :base, I18n.t('validators.advanced_search_group_validator.blank_error')
     end
   end
 
@@ -62,32 +62,40 @@ def validate_unique_field(record, group, group_index, unique_field)
   def validate_contains(record, group_index, unique_field, unique_field_conditions)
     return if unique_field_conditions.count == 1
 
-    record.groups[group_index].errors.add :base, "'#{unique_field}' can use 'contains' only once."
+    record.groups[group_index].errors.add :base,
+                                          I18n.t('validators.advanced_search_group_validator.contains_error',
+                                                 unique_field:)
   end
 
   def validate_equals(record, group_index, unique_field, unique_field_conditions)
     return if unique_field_conditions.all? { |condition| condition.operator == '=' }
 
-    record.groups[group_index].errors.add :base, "'#{unique_field}' cannot use '=' with other operators."
+    record.groups[group_index].errors.add :base, I18n.t('validators.advanced_search_group_validator.equals_error',
+                                                        unique_field:)
   end
 
   def validate_not_equals(record, group_index, unique_field, unique_field_conditions)
     return if unique_field_conditions.all? { |condition| condition.operator == '!=' }
 
-    record.groups[group_index].errors.add :base, "'#{unique_field}' cannot use '!=' with other operators."
+    record.groups[group_index].errors.add :base, I18n.t('validators.advanced_search_group_validator.not_equals_error',
+                                                        unique_field:)
   end
 
   def validate_less_than_equals(record, group_index, unique_field, unique_field_conditions)
     unless unique_field_conditions.count == 1 ||
            (unique_field_conditions.count == 2 && unique_field_conditions[1].operator == '>=')
-      record.groups[group_index].errors.add :base, "'#{unique_field}' can use '<=' and '>=' only once."
+      record.groups[group_index].errors.add :base,
+                                            I18n.t('validators.advanced_search_group_validator.between_error',
+                                                   unique_field:)
     end
   end
 
   def validate_greater_than_equals(record, group_index, unique_field, unique_field_conditions)
     unless unique_field_conditions.count == 1 ||
            (unique_field_conditions.count == 2 && unique_field_conditions[1].operator == '<=')
-      record.groups[group_index].errors.add :base, "'#{unique_field}' can use '<=' and '>=' only once."
+      record.groups[group_index].errors.add :base,
+                                            I18n.t('validators.advanced_search_group_validator.between_error',
+                                                   unique_field:)
     end
   end
 end
diff --git a/app/views/projects/samples/search/_errors.html.erb b/app/views/projects/samples/search/_errors.html.erb
index 11325949f9..94ca3b4eab 100644
--- a/app/views/projects/samples/search/_errors.html.erb
+++ b/app/views/projects/samples/search/_errors.html.erb
@@ -1,5 +1,5 @@
 <% if errors.any? %>
-  <%= viral_alert(type: "alert", classes: "mb-4 h-30 overflow-y-auto") do %>
+  <%= viral_alert(type: "alert", classes: "h-30 rounded-t-lg overflow-y-auto ") do %>
     <ul class="mt-1.5 ml-4 list-disc list-inside">
       <% errors.each do |error| %>
         <li><%= error.full_message %></li>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8393ec1dd4..12c29c17b6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -276,11 +276,12 @@ en:
     add_group_button: Add Group
     apply_filter_button: Apply filter
     clear_filter_button: Clear filter
-    description: This advanced search uses fields and operators to filter samples. Add and/or conditions to define the search criteria. To filter by date range, the metadata field should end with '_date'.
+    description: This advanced search uses fields, operators and values to filter samples. Add groups with conditions to define the search criteria.
     field: Field
     operator: Operator
     remove_condition_aria_label: Remove condition
     remove_group_button: Remove group
+    rules: Operators cannot be used on the same field within a group more than once, except for '=' and '!='. To filter by date range, the metadata field should end with '_date'.
     title: Advanced search
     value: Value
   application:
@@ -1697,6 +1698,14 @@ en:
       abbreviated: "%a %b%e %Y %H:%M"
       default: "%Y-%m-%d %H:%M:%S"
       full_date: "%B %d, %Y"
+  validators:
+    advanced_search_group_validator:
+      base_error: There are group errors.
+      between_error: "'%{unique_field}' can use '>=' and '<=' only once."
+      blank_error: Fields, operators, and values cannot be blank.
+      contains_error: "'%{unique_field}' can use 'contains' only once."
+      equals_error: "'%{unique_field}' cannot use '=' with other operators."
+      not_equals_error: "'%{unique_field}' cannot use '!=' with other operators."
   viral:
     pagy:
       limit_component:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 71e40549d8..b6dd3e3daa 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -276,11 +276,12 @@ fr:
     add_group_button: Add Group
     apply_filter_button: Apply filter
     clear_filter_button: Clear filter
-    description: This advanced search uses fields and operators to filter samples. Add and/or conditions to define the search criteria. To filter by date range, the metadata field should end with '_date'.
+    description: This advanced search uses fields, operators and values to filter samples. Add groups with conditions to define the search criteria.
     field: Field
     operator: Operator
     remove_condition_aria_label: Remove condition
     remove_group_button: Remove group
+    rules: Operators cannot be used on the same field within a group more than once, except for '=' and '!='. To filter by date range, the metadata field should end with '_date'.
     title: Advanced search
     value: Value
   application:
@@ -1697,6 +1698,14 @@ fr:
       abbreviated: "%a %b%e %Y %H:%M"
       default: "%Y-%m-%d %H:%M:%S"
       full_date: "%B %d, %Y"
+  validators:
+    advanced_search_group_validator:
+      base_error: There are group errors.
+      between_error: "'%{unique_field}' can use '<=' and '>=' only once."
+      blank_error: Fields, operators, and values cannot be blank.
+      contains_error: "'%{unique_field}' can use 'contains' only once."
+      equals_error: "'%{unique_field}' cannot use '=' with other operators."
+      not_equals_error: "'%{unique_field}' cannot use '!=' with other operators."
   viral:
     pagy:
       limit_component:
diff --git a/test/components/previews/advanced_search_component_preview.rb b/test/components/previews/advanced_search_component_preview.rb
index f59724ea00..bc1494a962 100644
--- a/test/components/previews/advanced_search_component_preview.rb
+++ b/test/components/previews/advanced_search_component_preview.rb
@@ -6,7 +6,7 @@ def default # rubocop:disable Metrics/MethodLength
       groups: [
         Sample::Group.new(
           conditions: [
-            Sample::Condition.new(field: ' metadata.country', operator: '=', value: 'Canada'),
+            Sample::Condition.new(field: 'metadata.country', operator: '=', value: 'Canada'),
             Sample::Condition.new(field: 'metadata.collection_date', operator: '>=', value: '2024-01-01'),
             Sample::Condition.new(field: 'metadata.collection_date', operator: '<=', value: '2024-12-01')
           ]