Enhance UX for ToS not checked

Displayed them as red if not accepted and not checked on submit

Author: skelz0r

app/form_builders/authorization_request_form_builder.rb

@@ -62,9 +62,27 @@ def cgu_check_box(opts = {})
       I18n.t('authorization_request_forms.default.terms_of_service_accepted.label', link: @object.definition.cgu_link).html_safe
     end
 
+    opts[:class] ||= []
+    opts[:class] << 'fr-input-group--error' if all_terms_not_accepted_error?(:terms_of_service_accepted)
+
     dsfr_check_box(:terms_of_service_accepted, opts)
   end
 
+  def data_protection_officer_informed_check_box(opts = {})
+    opts[:class] ||= []
+    opts[:class] << 'fr-input-group--error' if all_terms_not_accepted_error?(:data_protection_officer_informed)
+
+    dsfr_check_box(:data_protection_officer_informed, opts)
+  end
+
+  def all_terms_not_accepted_error?(attribute)
+    return false if @object.public_send(attribute).present?
+
+    @object.errors.any? do |error|
+      error.attribute == :base && error.type == :all_terms_not_accepted
+    end
+  end
+
   def dsfr_file_field(attribute, opts = {})
     opts[:class] ||= 'fr-upload-group'
 

app/views/authorization_request_forms/shared/_tos_checkboxes.html.erb

@@ -1,2 +1,2 @@
 <%= f.cgu_check_box %>
-<%= f.dsfr_check_box :data_protection_officer_informed %>
+<%= f.data_protection_officer_informed_check_box %>