Merge pull request #10263 from danidoni/move-actions-to-sidebar-on-th…

…e-user-page

Move the actions present in the user's profile page to the left menu

src/api/app/views/webui/user/_change_password.html.haml

@@ -0,0 +1,6 @@
+- if feature_enabled?(:responsive_ux)
+  = render partial: 'webui/user/index_actions'
+- else
+  = link_to('#', data: { toggle: 'modal', target: '#password-modal' }, class: 'd-block') do
+    %i.fas.fa-key
+    Change your password

src/api/app/views/webui/user/_edit_account.html.haml

@@ -0,0 +1,20 @@
+- if feature_enabled?(:responsive_ux)
+  - content_for :actions do
+    - if account_edit_link.present?
+      %li.nav-item
+        = link_to(account_edit_link, class: 'nav-link') do
+          %i.fas.fa-lg.mr-2.fa-user-edit
+          Edit your account
+    - else
+      %li.nav-item
+        = link_to('#', data: { toggle: 'modal', target: '#edit-modal' }, class: 'nav-link') do
+          %i.fas.fa-lg.mr-2.fa-user-edit
+          Edit your account
+- elsif account_edit_link.present?
+  = link_to(account_edit_link, class: 'd-block') do
+    %i.fas.fa-user-edit
+    Edit your account
+- else
+  = link_to('#', data: { toggle: 'modal', target: '#edit-modal' }, class: 'd-block') do
+    %i.fas.fa-user-edit
+    Edit your account

src/api/app/views/webui/user/_index_actions.html.haml

@@ -0,0 +1,5 @@
+- content_for :actions do
+  %li.nav-item
+    = link_to('#', data: { toggle: 'modal', target: '#password-modal' }, class: 'nav-link') do
+      %i.fas.fa-lg.mr-2.fa-plus-square
+      Change your password

src/api/app/views/webui/user/_info.html.haml

@@ -38,21 +38,19 @@
                                                                  'features we develop and give us feedback on them before they go live.' } } |
       .mt-4
         - if configuration.accounts_editable?(user)
-          - if account_edit_link.present?
-            = link_to(account_edit_link, class: 'd-block') do
-              %i.fas.fa-user-edit
-              Edit your account
-          - else
-            = link_to('#', data: { toggle: 'modal', target: '#edit-modal' }, class: 'd-block') do
-              %i.fas.fa-user-edit
-              Edit your account
+          = render partial: 'webui/user/edit_account', locals: { account_edit_link: account_edit_link }
         - if configuration.passwords_changable?(user)
-          = link_to('#', data: { toggle: 'modal', target: '#password-modal' }, class: 'd-block') do
-            %i.fas.fa-key
-            Change your password
-        = link_to(my_subscriptions_path, class: 'd-block') do
-          %i.fas.fa-bell
-          Change your notifications
+          = render partial: 'webui/user/change_password'
+        - if feature_enabled?(:responsive_ux)
+          - content_for :actions do
+            %li.nav-item
+              = link_to(my_subscriptions_path, class: 'nav-link') do
+                %i.fas.fa-lg.mr-2.fa-bell
+                Change your notifications
+        - else
+          = link_to(my_subscriptions_path, class: 'd-block') do
+            %i.fas.fa-bell
+            Change your notifications
         - if user.rss_token
           = link_to(user_rss_notifications_path(token: user.rss_token.string, format: 'rss'),
                                                 title: 'RSS Feed for Notifications', class: 'd-block') do

src/api/spec/features/beta/webui/users/user_home_page_spec.rb

@@ -36,6 +36,7 @@
       expect(page).to have_css('#home-realname', text: 'Jim Knopf')
       expect(page).to have_css("a[href='mailto:jim.knopf@puppenkiste.com']", text: 'jim.knopf@puppenkiste.com')
 
+      within('#bottom-navigation-area') { click_link('Actions') } if mobile?
       expect(page).to have_text('Edit your account')
       expect(page).to have_text('Change your password')
 
@@ -49,7 +50,7 @@
 
       expect(page).to have_link('Incoming Requests')
       # TODO: Remove this line if the dropdown is changed to a scrollable tab, and responsive_ux is out of beta.
-      find('.nav-link.dropdown-toggle').click if mobile?
+      within('#requests') { find('.nav-link.dropdown-toggle').click } if mobile?
       expect(page).to have_link('Outgoing Requests')
       expect(page).to have_link('Declined Requests')
       expect(page).to have_link('All Requests')
@@ -58,7 +59,12 @@
     end
 
     it 'edit account information' do
-      click_link('Edit your account')
+      if mobile?
+        within('#bottom-navigation-area') { click_link('Actions') }
+        within('#bottom-navigation-area') { click_link('Edit your account') }
+      else
+        click_link('Edit your account')
+      end
 
       fill_in('user_realname', with: 'John Doe')
       fill_in('user_email', with: 'john.doe@opensuse.org')