Merge pull request #919 from amatsuda/notificatons_page

Extract notifications setting to its dedicated page

Author: amatsuda

app/assets/stylesheets/modules/forms.css

@@ -90,3 +90,7 @@ input[type="checkbox"].boolean {
   gap: 10px;
   align-items: center;
 }
+
+.form-group span.radio {
+  margin-right: 1rem;
+}

app/controllers/profiles_controller.rb

@@ -26,12 +26,27 @@ def update
     end
   end
 
+  def notifications
+  end
+
+  def update_notifications
+    if current_user.update(notifications_params)
+      flash[:info] = 'Notification preferences updated.'
+      redirect_to notifications_profile_path
+    else
+      render :notifications, status: :unprocessable_entity
+    end
+  end
+
   private
 
   def user_params
     params.require(:user).permit(:bio, :gender, :ethnicity, :country, :name,
-                                 :email, :password, :password_confirmation,
-                                 teammates_attributes: [:id, :notification_preference])
+                                 :email, :password, :password_confirmation)
+  end
+
+  def notifications_params
+    params.require(:user).permit(teammates_attributes: [:id, :notification_preference])
   end
 
   def incomplete_profile_msg

app/views/layouts/nav/_user_dropdown.html.haml

@@ -7,6 +7,11 @@
       = link_to edit_profile_path, class: 'dropdown-item' do
         %i.bi.bi-person-fill
         %span My Profile
+    - if current_user.teammates.loaded? ? current_user.teammates.any? : current_user.teammates.exists?
+      %li
+        = link_to notifications_profile_path, class: 'dropdown-item' do
+          %i.bi.bi-bell-fill
+          %span Notifications
     %li
       = link_to destroy_user_session_path, data: {turbo: true, turbo_method: :delete}, class: 'dropdown-item' do
         %i.bi.bi-box-arrow-right

app/views/profiles/edit.html.haml

@@ -22,10 +22,16 @@
           .form-group
             = f.label :name
             = f.text_field :name, class: 'form-control', placeholder: 'Your name', autofocus: true
+          = f.input :bio, as: :text, input_html: {rows: 7, maxlength: 500, placeholder: 'Enter your bio'}, hint: 'Bio is limited to 500 characters.'
+
+      .widget
+        .widget-header
+          %i.bi.bi-image
+          %h3 Profile Icon Image
+        .widget-content
           %p
-            = f.label :bio
-            = f.text_area :bio, class: 'form-control', placeholder: 'Enter your bio', rows: 7, maxlength: 500
-            %p.help-block Bio is limited to 500 characters.
+            Add or change your profile icon image by visiting
+            = link_to('Gravatar', 'https://en.gravatar.com/connect/', target: "_blank")
 
     %fieldset.col-md-6
       .widget
@@ -61,31 +67,14 @@
                     %i{class: "bi bi-#{provider}"}
                     = "Connect #{name}"
 
-    %fieldset.col-md-6
-      .widget
-        .widget-header
-          %i.bi.bi-lock
-          %h3 Profile Icon Image
-        .widget-content
-          %p
-            Add or change your profile icon image by visiting
-            = link_to('Gravatar', 'https://en.gravatar.com/connect/', target: "_blank")
-
-      - if current_user.teammates.present?
+      - if current_user.teammates.loaded? ? current_user.teammates.any? : current_user.teammates.exists?
         .widget
           .widget-header
             %i.bi.bi-envelope-fill
-            %h3
-              Notifications
-              %span.ms-2{role: 'button', data: {bs_toggle: 'popover', bs_placement: 'left', bs_content: notification_preferences_tooltip, bs_html: 'true'}}
-                %i.bi.bi-question-circle
+            %h3 Notifications
           .widget-content
-            = f.simple_fields_for :teammates do |fields|
-              - teammate = fields.object
-              %b= teammate.event.name
-              = fields.input :notification_preference,
-                collection: Teammate::NOTIFICATION_PREFERENCES.invert,
-                as: :radio_buttons, wrapper: 'horizontal_radio_and_checkboxes', label: false
+            %p
+              = link_to 'Manage notification preferences', notifications_profile_path
 
   .row
     .col-md-12.form-submit

app/views/profiles/notifications.html.haml

@@ -0,0 +1,30 @@
+.row
+  .col-md-12
+    %header.page-header
+      %h1 Notification Preferences
+
+= simple_form_for current_user, url: notifications_profile_path, method: :patch, html: {role: 'form'} do |f|
+  .row
+    %fieldset.col-md-8
+      .widget
+        .widget-header
+          %i.bi.bi-envelope-fill
+          %h3
+            Notifications
+            %span.ms-2{role: 'button', data: {bs_toggle: 'popover', bs_placement: 'left', bs_content: notification_preferences_tooltip, bs_html: 'true'}}
+              %i.bi.bi-question-circle
+        .widget-content
+          - if current_user.teammates.loaded? ? current_user.teammates.any? : current_user.teammates.exists?
+            = f.simple_fields_for :teammates do |fields|
+              - teammate = fields.object
+              %b= teammate.event.name
+              = fields.input :notification_preference,
+                collection: Teammate::NOTIFICATION_PREFERENCES.invert,
+                as: :radio_buttons, wrapper: 'horizontal_radio_and_checkboxes', label: false
+          - else
+            %p You are not a member of any event teams.
+
+  .row
+    .col-md-12.form-submit
+      = link_to 'Back to Profile', edit_profile_path, class: 'btn btn-secondary'
+      %button.float-end.btn.btn-success.btn-lg{type: "submit"} Save

config/routes.rb

@@ -3,7 +3,10 @@
   devise_for :users, controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
   mount ActionCable.server => '/cable'
 
-  resource :profile, only: [:show, :edit, :update]
+  resource :profile, only: [:show, :edit, :update] do
+    get :notifications
+    patch :notifications, action: :update_notifications
+  end
   get '/my-proposals' => 'proposals#index', as: :proposals
 
   resources :notifications, only: [:index, :show] do

spec/system/profile_spec.rb

@@ -37,7 +37,7 @@
   scenario 'A user updates their event email preference' do
     teammate = create(:teammate, role: 'organizer', user: user, state: Teammate::ACCEPTED)
     visit(event_path(teammate.event))
-    visit(edit_profile_path)
+    visit(notifications_profile_path)
     choose(Teammate::NOTIFICATION_PREFERENCES[Teammate::MENTIONS])
     click_button 'Save'
     click_link 'Dashboard'