From 0e84507b179b454797184ecf9bc7f501975ceb99 Mon Sep 17 00:00:00 2001 From: josemigallas Date: Fri, 11 Oct 2024 12:47:21 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A6=8B=20updates=20notification=20pre?= =?UTF-8?q?ferences=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notification_preferences_controller.rb | 15 ++++--- app/inputs/check_boxes_with_hints_input.rb | 14 ------- app/inputs/patternfly_check_boxes_input.rb | 21 +++++++--- app/lib/fields/patternfly_form_builder.rb | 9 +++++ .../notification_preferences/_form.html.slim | 15 ------- .../notification_preferences/show.html.slim | 40 ++++++++++++++----- config/locales/en.yml | 18 ++++++--- 7 files changed, 73 insertions(+), 59 deletions(-) delete mode 100644 app/inputs/check_boxes_with_hints_input.rb delete mode 100644 app/views/provider/admin/user/notification_preferences/_form.html.slim diff --git a/app/controllers/provider/admin/user/notification_preferences_controller.rb b/app/controllers/provider/admin/user/notification_preferences_controller.rb index 5aa9a0ff38..8f89db7bb5 100644 --- a/app/controllers/provider/admin/user/notification_preferences_controller.rb +++ b/app/controllers/provider/admin/user/notification_preferences_controller.rb @@ -1,19 +1,19 @@ +# frozen_string_literal: true + class Provider::Admin::User::NotificationPreferencesController < Provider::Admin::User::BaseController activate_menu :account, :personal, :notification_preferences respond_to :html - before_action :initialize_preferences_form, only: [:show, :update] + before_action :initialize_preferences_form, only: %i[show update] def show - respond_with(@preferences_form) + respond_with(@preferences) end def update - if @preferences_form.update(notification_preferences_params) - flash[:success] = 'Preferences updated' - end + flash[:success] = t('.success') if @preferences.update(notification_preferences_params) - respond_with(@preferences_form, location: url_for(action: :show)) + respond_with(@preferences, location: url_for(action: :show)) end protected @@ -25,7 +25,6 @@ def notification_preferences_params private def initialize_preferences_form - @preferences_form = NotificationPreferencesForm.new( - current_user, current_user.notification_preferences) + @preferences = NotificationPreferencesForm.new(current_user, current_user.notification_preferences) end end diff --git a/app/inputs/check_boxes_with_hints_input.rb b/app/inputs/check_boxes_with_hints_input.rb deleted file mode 100644 index 2f61348317..0000000000 --- a/app/inputs/check_boxes_with_hints_input.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -class CheckBoxesWithHintsInput < Formtastic::Inputs::CheckBoxesInput - def choice_html(choice) - super(choice) << - template.content_tag(:p, hint(choice), class: 'inline-hints') - end - - private - - def hint(choice) - options[:member_hint].call(choice.is_a?(Array) ? choice.last : choice) - end -end diff --git a/app/inputs/patternfly_check_boxes_input.rb b/app/inputs/patternfly_check_boxes_input.rb index 448c081729..58d4beda97 100644 --- a/app/inputs/patternfly_check_boxes_input.rb +++ b/app/inputs/patternfly_check_boxes_input.rb @@ -5,11 +5,13 @@ class PatternflyCheckBoxesInput < Formtastic::Inputs::CheckBoxesInput def to_html tag.div(class: 'pf-c-form__group') do - label + control + label_html + control end end - def label + def label_html + return ''.html_safe if options[:label] == false + tag.div(class: 'pf-c-form__group-label') do tag.label(class: 'pf-c-form__label', for: input_html_options[:id]) do tag.span(label_text, class: 'pf-c-form__label-text') @@ -26,7 +28,7 @@ def control def choice_html(choice) tag.div(class: 'pf-c-check') do - checkbox_input(choice) + choice_label(choice) + checkbox_input(choice) + choice_label(choice) + choice_description(choice) end end @@ -43,9 +45,9 @@ def checkbox_input(choice) end def choice_label(choice) - label_text = choice[0] - tag.label(label_text, class: 'pf-c-check__label', - for: choice_input_dom_id(choice)) + choice_label_text = choice[0] + tag.label(choice_label_text, class: 'pf-c-check__label', + for: choice_input_dom_id(choice)) end def helper_text_invalid @@ -53,4 +55,11 @@ def helper_text_invalid template.render partial: 'shared/pf_error_helper_text', locals: { error: errors.first } end + + def choice_description(choice) + return unless (member_hint = options[:member_hint]) + + description_text = member_hint.call(choice.is_a?(Array) ? choice.last : choice) + tag.span(description_text, class: 'pf-c-check__description') + end end diff --git a/app/lib/fields/patternfly_form_builder.rb b/app/lib/fields/patternfly_form_builder.rb index 38f27f0647..35deccc17e 100644 --- a/app/lib/fields/patternfly_form_builder.rb +++ b/app/lib/fields/patternfly_form_builder.rb @@ -25,4 +25,13 @@ def delete_button(title, href, opts = {}) def collection_select(*opts) super(*opts.first(4), {}, { class: 'pf-c-form-control' }) end + + def inputs(*args, &block) + tag.section(class: 'pf-c-form__section', role: 'group') do + tag.div(args.first, class: 'pf-c-form__section-title') + + tag.div do # TODO: remove this div, ideally concat title + block + yield block + end + end + end end diff --git a/app/views/provider/admin/user/notification_preferences/_form.html.slim b/app/views/provider/admin/user/notification_preferences/_form.html.slim deleted file mode 100644 index 476cb505d2..0000000000 --- a/app/views/provider/admin/user/notification_preferences/_form.html.slim +++ /dev/null @@ -1,15 +0,0 @@ -= semantic_form_for preferences_form.model, - url: provider_admin_user_notification_preferences_path, method: :patch do |f| - - - preferences_form.categories.each do |category| - fieldset.inputs - legend = t(category.title_key, scope: :notification_category_titles) - - ol - = f.input :enabled_notifications, as: :check_boxes_with_hints, - collection: category.notifications.map { |value| [t(value, scope: :notification_preference_titles), value] }, - member_hint: ->(value) { t(value, scope: :notification_preference_hints) } - - = f.actions do - = f.commit_button I18n.t('provider.admin.user.notification_preferences.form.submit_button_label') - diff --git a/app/views/provider/admin/user/notification_preferences/show.html.slim b/app/views/provider/admin/user/notification_preferences/show.html.slim index 1ab809a2b4..70a1d28e08 100644 --- a/app/views/provider/admin/user/notification_preferences/show.html.slim +++ b/app/views/provider/admin/user/notification_preferences/show.html.slim @@ -1,12 +1,30 @@ -- content_for :page_header_title, 'Notification Preferences' -- content_for :page_header_body do - ' Events originate from interactions with the 3scale interface & the 3scale API. They can be - ' triggered by developers, you, your team & 3scale. You will only receive API-related - ' notifications for those APIs that you have access to. - -- if @preferences_form.categories.blank? - p= t('.no_notification_preferences_html', account_name: current_user.account.name, - username: current_user.account.first_admin.username, - email: current_user.account.first_admin.email) +- content_for :page_header_title, t('.header_title') +- content_for :page_header_body, t('.header_body') + +- categories = @preferences.categories + +- if categories.blank? + - admin = current_user.account.first_admin + = render partial: 'shared/empty_state', locals: { title: t('.empty_state.title'), + body: t('.empty_state.body_html', account: current_user.account.name, username: admin.username, email: admin.email), + icon: :lock } - else - = render 'form', preferences_form: @preferences_form + - content_for :javascripts do + = stylesheet_packs_chunks_tag 'pf_form' + + div class="pf-c-card" + div class="pf-c-card__body" + = semantic_form_for @preferences.model, url: provider_admin_user_notification_preferences_path, + builder: Fields::PatternflyFormBuilder, + method: :patch, + html: { class: 'pf-c-form pf-m-limit-width' } do |f| + + - categories.each do |category| + = f.inputs t(category.title_key, scope: :notification_category_titles) do + = f.input :enabled_notifications, as: :patternfly_check_boxes, + label: false, + collection: category.notifications.map { |value| [t(value, scope: :notification_preference_titles), value] }, + member_hint: ->(value) { t(value, scope: :notification_preference_hints) } + + = f.actions do + = f.commit_button t('.submit_button_label') diff --git a/config/locales/en.yml b/config/locales/en.yml index 276d284e2f..ba2efa982a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -513,11 +513,19 @@ en: submit_button_label: Create Access Token notification_preferences: show: - no_notification_preferences_html: | - You don't have access to any notifications on the %{account_name} account. - Please contact %{username} to request access. - form: - submit_button_label: 'Update Notification Preferences' + header_title: Notification Preferences + header_body: + Events originate from interactions with the 3scale interface & the 3scale API. They + can be triggered by developers, you, your team & 3scale. You will only receive + API-related notifications for those APIs that you have access to. + empty_state: + title: Access denied + body_html: + You don't have access to any notifications on the %{account} account. + Please contact %{username} to request access. + submit_button_label: Update Notification Preferences + update: + success: Notification preferences successfully updated. personal_details: edit: form: From c518be8bd1cd3dcd61da9fb4c749d620ca3b5825 Mon Sep 17 00:00:00 2001 From: josemigallas Date: Mon, 14 Oct 2024 12:09:06 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=92=84=20adds=20some=20spacing=20betw?= =?UTF-8?q?een=20each=20checkbox=20in=20a=20check=5Fboxes=5Finput?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/inputs/patternfly_check_boxes_input.rb | 2 +- app/javascript/packs/pf_form.scss | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/inputs/patternfly_check_boxes_input.rb b/app/inputs/patternfly_check_boxes_input.rb index 58d4beda97..dde2cf3573 100644 --- a/app/inputs/patternfly_check_boxes_input.rb +++ b/app/inputs/patternfly_check_boxes_input.rb @@ -27,7 +27,7 @@ def control end def choice_html(choice) - tag.div(class: 'pf-c-check') do + tag.div(class: 'pf-c-check pf-c-check__check_boxes-custom_spacing') do checkbox_input(choice) + choice_label(choice) + choice_description(choice) end end diff --git a/app/javascript/packs/pf_form.scss b/app/javascript/packs/pf_form.scss index 1998b8125e..ef0e7b5b30 100644 --- a/app/javascript/packs/pf_form.scss +++ b/app/javascript/packs/pf_form.scss @@ -2,3 +2,9 @@ @import '~@patternfly/patternfly/components/Check/check.css'; @import '~@patternfly/patternfly/components/Form/form.css'; @import '~@patternfly/patternfly/components/FormControl/form-control.css'; + +.pf-c-form__group-control { + .pf-c-check + .pf-c-check__check_boxes-custom_spacing { + margin-top: var(--pf-c-check__body--MarginTop); + } +}