[73127] Primerize Admin > Emails and notifications

app/forms/admin/settings/aggregation_settings_form.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Admin
+  module Settings
+    class AggregationSettingsForm < ApplicationForm
+      include Redmine::I18n
+
+      settings_form do |f|
+        f.text_field name: :journal_aggregation_time_minutes,
+                     type: :number,
+                     min: 0,
+                     input_width: :medium,
+                     trailing_visual: { text: { text: I18n.t("datetime.units.minute_abbreviated", count: 2) } }
+
+        f.submit
+      end
+    end
+  end
+end

app/forms/admin/settings/aggregation_settings_form/journal_aggregation_time_minutes_caption.html.erb

@@ -0,0 +1,8 @@
+<%= render(Primer::Beta::Text.new(tag: :p)) do %>
+  <%= link_translate("admin.journal_aggregation.caption", links: { webhook_link: url_helpers.admin_outgoing_webhooks_path }) %>
+<% end %>
+<%= render(Primer::OpenProject::InlineMessage.new(scheme: :warning, size: :small)) do %>
+  <%= render(Primer::Beta::Text.new(tag: :p)) do %>
+    <%= I18n.t(:text_hint_disable_with_0) %>
+  <% end %>
+<% end %>

app/forms/admin/settings/mail_notifications_setting_form.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Admin
+  module Settings
+    class MailNotificationsSettingForm < ApplicationForm
+      include ::Settings::FormHelper
+
+      settings_form do |f|
+        if @deliveries
+          f.text_field name: :mail_from, input_width: :medium
+          f.check_box name: :bcc_recipients
+          f.check_box name: :plain_text_mail
+          f.select_list name: :emails_salutation,
+                        values: [
+                          [User.human_attribute_name(:firstname), :firstname],
+                          [I18n.t("mail.salutation_full_name"), :name]
+                        ],
+                        input_width: :medium
+
+          f.fieldset_group(title: "#{I18n.t(:setting_emails_header)} & #{I18n.t(:setting_emails_footer)}", mt: 4) do |fg|
+            fg.multi_language_text_select(name: :emails_header)
+            fg.multi_language_text_select(name: :emails_footer)
+          end
+        end
+
+        unless OpenProject::Configuration["email_delivery_configuration"] == "legacy"
+          email_methods = %i[smtp sendmail]
+          email_methods += [:letter_opener] if Rails.env.development?
+
+          f.fieldset_group(title: I18n.t(:text_setup_mail_configuration), mt: 4) do |fg|
+            fg.select_list(
+              name: :email_delivery_method,
+              values: email_methods.map { |m| [m.to_s, m] },
+              input_width: :small,
+              data: {
+                show_when_value_selected_target: "cause",
+                target_name: "email_delivery_method_settings"
+              }
+            )
+          end
+
+          f.group(
+            hidden: { true => Setting.email_delivery_method != :smtp },
+            data: {
+              show_when_value_selected_target: "effect",
+              target_name: "email_delivery_method_settings",
+              value: "smtp"
+            }
+          ) do |smtp|
+            smtp.text_field(name: :smtp_address, input_width: :medium)
+            smtp.text_field(name: :smtp_port, type: :number, input_width: :xsmall)
+            smtp.text_field(name: :smtp_domain, input_width: :medium)
+            smtp.select_list(name: :smtp_authentication,
+                             values: %i[none plain login cram_md5].map { |m| [m.to_s, m] },
+                             input_width: :small)
+            smtp.text_field(name: :smtp_user_name, input_width: :medium)
+            smtp.text_field(name: :smtp_password, input_width: :medium)
+            smtp.check_box(name: :smtp_enable_starttls_auto)
+            smtp.check_box(name: :smtp_ssl)
+          end
+
+          f.group(
+            hidden: { true => Setting.email_delivery_method != :sendmail },
+            data: {
+              show_when_value_selected_target: "effect",
+              target_name: "email_delivery_method_settings",
+              value: "sendmail"
+            }
+          ) do |sendmail|
+            sendmail.text_field(name: :sendmail_location)
+            sendmail.text_field(name: :sendmail_arguments)
+          end
+        end
+
+        f.submit
+      end
+
+      def initialize(deliveries:)
+        super()
+
+        @deliveries = deliveries
+      end
+    end
+  end
+end

app/views/admin/settings/aggregation_settings/show.html.erb

@@ -40,25 +40,13 @@ See COPYRIGHT and LICENSE files for more details.
   end
 %>
 
-<%= styled_form_tag(admin_settings_aggregation_path, method: :patch) do %>
-  <div class="form--field">
-    <%= setting_number_field :journal_aggregation_time_minutes,
-                             unit: t(:label_minute_plural),
-                             min: 0,
-                             container_class: "-xslim" %>
-    <span class="form--field-instructions">
-      <%= t(
-            :"admin.journal_aggregation.explanation.text",
-            webhook_link: link_to(
-              t(:"admin.journal_aggregation.explanation.link"),
-              admin_outgoing_webhooks_path,
-              target: "_blank"
-            )
-          ).html_safe %>
-      <br>
-      <%= t(:text_hint_disable_with_0) %>
-    </span>
-  </div>
-
-  <%= styled_button_tag t(:button_save), class: "-primary -with-icon icon-checkmark" %>
-<% end %>
+<%=
+  settings_primer_form_with(
+    url: admin_settings_aggregation_path,
+    scope: :settings,
+    method: :patch,
+    data: { turbo: false }
+  ) do |form|
+    render Admin::Settings::AggregationSettingsForm.new(form)
+  end
+%>

app/views/admin/settings/incoming_mails_settings/show.html.erb

@@ -40,21 +40,26 @@ See COPYRIGHT and LICENSE files for more details.
   end
 %>
 
-<%= styled_form_tag(admin_settings_incoming_mails_path, method: :patch) do %>
-  <section class="form--section">
-    <div class="form--field">
-      <%= setting_text_area :mail_handler_body_delimiters, rows: 5, container_class: "-wide" %>
-      <div class="form--field-instructions"><%= t(:text_line_separated) %></div>
-    </div>
-    <div class="form--field">
-      <%= setting_text_field :mail_handler_body_delimiter_regex, container_class: "-wide" %>
-      <div class="form--field-instructions"><%= t(:text_regexp_multiline) %></div>
-    </div>
-    <div class="form--field">
-      <%= setting_text_area :mail_handler_ignore_filenames, rows: 5, container_class: "-wide" %>
-      <div class="form--field-instructions"><%= t("incoming_mails.ignore_filenames") %></div>
-    </div>
-  </section>
-
-  <%= styled_button_tag t(:button_save), class: "-primary -with-icon icon-checkmark" %>
-<% end %>
+<%=
+  settings_primer_form_with(
+    url: admin_settings_incoming_mails_path,
+    scope: :settings,
+    method: :patch,
+    data: { turbo: false }
+  ) do |form|
+    render_inline_settings_form(form) do |f|
+      f.text_area name: :mail_handler_body_delimiters,
+                  rows: 5,
+                  caption: t(:text_line_separated)
+
+      f.text_field name: :mail_handler_body_delimiter_regex,
+                   caption: t(:text_regexp_multiline)
+
+      f.text_area name: :mail_handler_ignore_filenames,
+                  rows: 5,
+                  caption: t("incoming_mails.ignore_filenames")
+
+      f.submit
+    end
+  end
+%>

app/views/admin/settings/mail_notifications_settings/show.html.erb

@@ -40,98 +40,34 @@ See COPYRIGHT and LICENSE files for more details.
   end
 %>
 
+<% unless @deliveries %>
+  <%=
+    render Primer::Alpha::Banner.new(scheme: :default) do
+      t(:text_email_delivery_not_configured)
+    end
+  %>
+<% end %>
+
 <%=
-  styled_form_tag(
-    admin_settings_mail_notifications_path,
+  settings_primer_form_with(
+    url: admin_settings_mail_notifications_path,
+    scope: :settings,
     method: :patch,
-    data: { controller: "show-when-value-selected" }
-  ) do
+    data: { turbo: false,
+            controller: "show-when-value-selected" }
+  ) do |form|
+    render Admin::Settings::MailNotificationsSettingForm.new(form, deliveries: @deliveries)
+  end
 %>
-  <% if @deliveries %>
-    <section class="form--section">
-      <div class="form--field"><%= setting_text_field :mail_from, size: 60, container_class: "-middle" %></div>
-      <div class="form--field"><%= setting_check_box :bcc_recipients %></div>
-      <div class="form--field"><%= setting_check_box :plain_text_mail %></div>
-      <div class="form--field">
-        <%= setting_select :emails_salutation,
-                           [
-                             [User.human_attribute_name(:firstname), :firstname],
-                             [t("mail.salutation_full_name"), :name]
-                           ],
-                           container_class: "-middle" %>
-      </div>
-    </section>
-
-    <fieldset id="emails_decorators" class="form--fieldset">
-      <legend class="form--fieldset-legend"><%= t(:setting_emails_header) %>
-        & <%= I18n.t(:setting_emails_footer) %></legend>
-      <%= render Settings::TextSettingComponent.new(I18n.locale, name: "emails_header") %>
-      <%= render Settings::TextSettingComponent.new(I18n.locale, name: "emails_footer") %>
-    </fieldset>
-  <% else %>
-    <div class="nodata">
-      <%= simple_format(t(:text_email_delivery_not_configured)) %>
-    </div>
-  <% end %>
-
-  <%
-    email_methods = %i[smtp sendmail]
-    email_methods << :letter_opener if Rails.env.development?
-  %>
-  <%= content_tag :fieldset, class: "form--fieldset" do %>
-    <legend class="form--fieldset-legend"><%= t(:text_setup_mail_configuration) %></legend>
-    <div class="form--field">
-      <%=
-        setting_select(
-          :email_delivery_method,
-          email_methods,
-          container_class: "-slim",
-          data: {
-            show_when_value_selected_target: "cause",
-            target_name: "email_delivery_method_settings"
-          }
-        )
-      %>
-    </div>
-    <div
-      data-show-when-value-selected-target="effect"
-      data-target-name="email_delivery_method_settings"
-      data-value="smtp"
-      <%= "hidden" unless Setting.email_delivery_method == :smtp %>>
-      <div class="form--field"><%= setting_text_field :smtp_address, container_class: "-middle" %></div>
-      <div class="form--field"><%= setting_text_field :smtp_port, size: 6, container_class: "-xslim" %></div>
-      <div class="form--field"><%= setting_text_field :smtp_domain, container_class: "-middle" %></div>
-      <div class="form--field"><%= setting_select(:smtp_authentication, %i[none plain login cram_md5], container_class: "-slim") %></div>
-      <div class="form--field"><%= setting_text_field :smtp_user_name, container_class: "-middle" %></div>
-      <div class="form--field"><%= setting_password :smtp_password, container_class: "-middle" %></div>
-      <div class="form--field"><%= setting_check_box :smtp_enable_starttls_auto %></div>
-      <div class="form--field"><%= setting_check_box :smtp_ssl %></div>
-    </div>
-    <div
-      data-show-when-value-selected-target="effect"
-      data-target-name="email_delivery_method_settings"
-      data-value="sendmail"
-      <%= "hidden" unless Setting.email_delivery_method == :sendmail %>>
-      <div class="form--field"><%= setting_text_field :sendmail_location %></div>
-      <div class="form--field"><%= setting_text_field :sendmail_arguments %></div>
-    </div>
-    <div
-      data-show-when-value-selected-target="effect"
-      data-target-name="email_delivery_method_settings"
-      data-value="letter_opener"
-      <%= "hidden" unless Setting.email_delivery_method == :letter_opener %>>
-      <p>Letter opener is used to render emails as a file in your Rails tmp folder. Mails will automatically open in
-        your browser if supported.</p>
-    </div>
-  <% end unless OpenProject::Configuration['email_delivery_configuration'] == 'legacy' %>
-
-  <%= styled_button_tag t(:button_save), class: "-primary -with-icon icon-checkmark" %>
 
-  <% if @deliveries %>
-    <div style="float:none;display:inline-block;font-weight:bold;">
-      <%= link_to t(:label_send_test_email),
-                  { controller: "/admin", action: "test_email" },
-                  data: { turbo_method: :post } %>
-    </div>
-  <% end %>
+<% if @deliveries %>
+  <%= render Primer::Beta::Link.new(
+        href: test_email_admin_index_path,
+        data: { turbo_method: :post },
+        font_weight: :bold,
+        display: :block,
+        mt: 3
+      ) do
+        t(:label_send_test_email)
+      end %>
 <% end %>

config/locales/en.yml

@@ -116,9 +116,8 @@ en:
         trial: "Trial"
     jemalloc_allocator: Jemalloc memory allocator
     journal_aggregation:
-      explanation:
-        text: "Individual actions of a user (e.g. updating a work package twice) are aggregated into a single action if their age difference is less than the specified timespan. They will be displayed as a single action within the application. This will also delay notifications by the same amount of time reducing the number of emails being sent and will also affect %{webhook_link} delay."
-        link: "webhook"
+      caption: >
+        Individual actions of a user (e.g. updating a work package twice) are aggregated into a single action if their age difference is less than the specified timespan. They will be displayed as a single action within the application. This will also delay notifications by the same amount of time reducing the number of emails being sent and will also affect the [webhook](webhook_link) delay.
     import:
       title: "Import"
     jira: