From aa908d8d6098446c36a31fc3240a9c26d9ae42f2 Mon Sep 17 00:00:00 2001
From: taitus <sebastia.roig@gmail.com>
Date: Thu, 27 Dec 2018 17:35:09 +0100
Subject: [PATCH] Add progress tab as initial page on Dashboard.

---
 app/controllers/dashboard_controller.rb |  8 ++++----
 app/views/proposals/created.html.erb    |  2 +-
 app/views/proposals/share.html.erb      |  2 +-
 app/views/proposals/show.html.erb       |  4 ++--
 app/views/users/_proposal.html.erb      |  2 +-
 spec/features/proposals_spec.rb         | 13 +++++++++----
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 75f2e0bc0..2e144178c 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -9,10 +9,10 @@ class DashboardController < Dashboard::BaseController
     authorize! :publish, proposal
 
     proposal.publish
-    redirect_to proposal_dashboard_path(proposal), notice: t('proposals.notice.published')
+    redirect_to progress_proposal_dashboard_path(proposal), notice: t("proposals.notice.published")
   end
-  
-  def progress 
+
+  def progress
     authorize! :dashboard, proposal
   end
 
@@ -21,7 +21,7 @@ class DashboardController < Dashboard::BaseController
   end
 
   private
-  
+
   def active_resources
     @active_resources ||= Dashboard::Action.active.resources.order(required_supports: :asc, day_offset: :asc)
   end
diff --git a/app/views/proposals/created.html.erb b/app/views/proposals/created.html.erb
index 215a5e151..0f52cb96c 100644
--- a/app/views/proposals/created.html.erb
+++ b/app/views/proposals/created.html.erb
@@ -8,7 +8,7 @@
 
       <% if can?(:dashboard, @proposal) %>
         <%= link_to t("proposals.created.dashboard"),
-                    proposal_dashboard_path(@proposal),
+                    progress_proposal_dashboard_path(@proposal),
                     class: "button" %>
       <% end %>
 
diff --git a/app/views/proposals/share.html.erb b/app/views/proposals/share.html.erb
index f1a6e289b..28ef39428 100644
--- a/app/views/proposals/share.html.erb
+++ b/app/views/proposals/share.html.erb
@@ -34,7 +34,7 @@
             </p>
             <div class="small-12 medium-6 large-4 column small-centered">
               <%= link_to t("proposals.share.dashboard"),
-                          proposal_dashboard_path(@proposal), class: "button expanded" %>
+                          progress_proposal_dashboard_path(@proposal), class: "button expanded" %>
             </div>
           </div>
         <% end %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 762f1e31b..a632d9372 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -138,7 +138,7 @@
             <div class="sidebar-divider"></div>
             <h2><%= t("proposals.show.author") %></h2>
             <div class="show-actions-menu">
-              <%= link_to proposal_dashboard_path(@proposal),
+              <%= link_to progress_proposal_dashboard_path(@proposal),
                           class: 'button hollow expanded',
                           id: "proposal-dashboard-#{@proposal.id}" do %>
                 <span class="icon-edit"></span>
@@ -218,4 +218,4 @@
 
     <%= render "proposals/notifications" %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/users/_proposal.html.erb b/app/views/users/_proposal.html.erb
index da9dbee9a..2f5166b7e 100644
--- a/app/views/users/_proposal.html.erb
+++ b/app/views/users/_proposal.html.erb
@@ -21,7 +21,7 @@
   <% elsif can?(:dashboard, proposal) %>
     <td>
         <%= link_to t("proposals.show.dashboard_proposal_link"),
-                    proposal_dashboard_path(proposal), class: "button hollow expanded" %>
+                    progress_proposal_dashboard_path(proposal), class: "button hollow expanded" %>
     </td>
   <% else %>
     <td class="text-center">
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 3d55aacec..6f34c2860 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -442,7 +442,10 @@ feature 'Proposals' do
     expect(page.html).not_to include "<script>alert('hey')</script>"
 
     click_link 'Dashboard'
-    click_link 'Edit proposal'
+    within "#side_menu" do
+      click_link "My proposal"
+    end
+    click_link "Edit proposal"
 
     expect(page).to have_current_path(edit_proposal_path(Proposal.last))
     expect(page).not_to have_link('click me')
@@ -515,10 +518,12 @@ feature 'Proposals' do
 
       visit user_path(proposal.author)
       within("#proposal_#{proposal.id}") do
-        click_link 'Dashboard'
+        click_link "Dashboard"
       end
-
-      click_link 'Retire proposal'
+      within "#side_menu" do
+        click_link "My proposal"
+      end
+      click_link "Retire proposal"
 
       expect(page).to have_current_path(retire_form_proposal_path(proposal))