From a24524298a8b6a957b2a7c0676d45baada3c84b9 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Tue, 4 Feb 2020 11:50:42 +0700
Subject: [PATCH 1/3] extract budget investment's author actions to a partial

---
 .../budgets/investments/_author_actions.html.erb    | 12 ++++++++++++
 .../budgets/investments/_investment_show.html.erb   | 13 +------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 app/views/budgets/investments/_author_actions.html.erb

diff --git a/app/views/budgets/investments/_author_actions.html.erb b/app/views/budgets/investments/_author_actions.html.erb
new file mode 100644
index 000000000..20faa2af5
--- /dev/null
+++ b/app/views/budgets/investments/_author_actions.html.erb
@@ -0,0 +1,12 @@
+<% if can_destroy_image?(investment) %>
+  <div class="sidebar-divider"></div>
+  <h2><%= t("budgets.investments.show.author") %></h2>
+  <div class="show-actions-menu">
+    <%= link_to image_path(investment.image),
+                method: :delete,
+                class: "button hollow alert expanded" do %>
+        <span class="icon-image"></span>
+        <%= t("images.remove_image") %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb
index e112342b7..e79e22869 100644
--- a/app/views/budgets/investments/_investment_show.html.erb
+++ b/app/views/budgets/investments/_investment_show.html.erb
@@ -22,18 +22,7 @@
       </div>
 
       <aside class="small-12 medium-3 column">
-        <% if can_destroy_image?(investment) %>
-          <div class="sidebar-divider"></div>
-          <h2><%= t("budgets.investments.show.author") %></h2>
-          <div class="show-actions-menu">
-            <%= link_to image_path(investment.image),
-                        method: :delete,
-                        class: "button hollow alert expanded" do %>
-                <span class="icon-image"></span>
-                <%= t("images.remove_image") %>
-            <% end %>
-          </div>
-        <% end %>
+        <%= render "/budgets/investments/author_actions", investment: investment %>
 
         <% if investment.should_show_aside? %>
           <% if investment.should_show_votes? %>

From 65e841e44e298ee12a1f3f5d656883ea5b52232d Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Tue, 4 Feb 2020 12:59:15 +0700
Subject: [PATCH 2/3] Show edit button instead of remove image on accepting
 phase

Since now it's possible to edit the budget investment during the
accepting phase, it does not really make sense to show the button to
just remove the image when the investment project can be fully edited,
and the image can be removed from the editing form.
---
 app/helpers/budget_investments_helper.rb      |  4 ++
 .../investments/_author_actions.html.erb      | 18 +++++---
 spec/features/budgets/investments_spec.rb     | 43 +++++++++++++++++++
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/app/helpers/budget_investments_helper.rb b/app/helpers/budget_investments_helper.rb
index 1e6d8405e..68e4435a3 100644
--- a/app/helpers/budget_investments_helper.rb
+++ b/app/helpers/budget_investments_helper.rb
@@ -49,4 +49,8 @@ module BudgetInvestmentsHelper
   def investments_secondary_view
     investments_current_view == "default" ? "minimal" : "default"
   end
+
+  def show_author_actions?(investment)
+    can?(:edit, investment) || can_destroy_image?(investment)
+  end
 end
diff --git a/app/views/budgets/investments/_author_actions.html.erb b/app/views/budgets/investments/_author_actions.html.erb
index 20faa2af5..92a4aa863 100644
--- a/app/views/budgets/investments/_author_actions.html.erb
+++ b/app/views/budgets/investments/_author_actions.html.erb
@@ -1,12 +1,18 @@
-<% if can_destroy_image?(investment) %>
+<% if show_author_actions?(investment) %>
   <div class="sidebar-divider"></div>
   <h2><%= t("budgets.investments.show.author") %></h2>
   <div class="show-actions-menu">
-    <%= link_to image_path(investment.image),
-                method: :delete,
-                class: "button hollow alert expanded" do %>
-        <span class="icon-image"></span>
-        <%= t("images.remove_image") %>
+    <% if can?(:edit, investment) %>
+      <%= link_to t("shared.edit"),
+                  edit_budget_investment_path(investment.budget, investment),
+                  method: :get, class: "button hollow expanded" %>
+    <% else %>
+        <%= link_to image_path(investment.image),
+                    method: :delete,
+                    class: "button hollow alert expanded" do %>
+          <span class="icon-image"></span>
+          <%= t("images.remove_image") %>
+        <% end %>
     <% end %>
   </div>
 <% end %>
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index 3e432ad5d..8e87b2aad 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -1957,5 +1957,48 @@ describe "Budget Investments" do
         expect(page).to have_css(".map-icon", count: 3, visible: false)
       end
     end
+
+    context "Author actions section" do
+      scenario "Is not shown if investment is not editable or does not have an image" do
+        budget.update!(phase: "reviewing")
+        investment = create(:budget_investment, heading: heading, author: author)
+
+        login_as(author)
+        visit budget_investment_path(budget, investment)
+
+        within("aside") do
+          expect(page).not_to have_content "Author"
+          expect(page).not_to have_link "Edit"
+          expect(page).not_to have_link "Remove image"
+        end
+      end
+
+      scenario "Contains edit button in the accepting phase" do
+        investment = create(:budget_investment, heading: heading, author: author)
+
+        login_as(author)
+        visit budget_investment_path(budget, investment)
+
+        within("aside") do
+          expect(page).to have_content "Author"
+          expect(page).to have_link "Edit"
+          expect(page).not_to have_link "Remove image"
+        end
+      end
+
+      scenario "Contains remove image button in phases different from accepting" do
+        budget.update!(phase: "reviewing")
+        investment = create(:budget_investment, :with_image, heading: heading, author: author)
+
+        login_as(author)
+        visit budget_investment_path(budget, investment)
+
+        within("aside") do
+          expect(page).to have_content "Author"
+          expect(page).not_to have_link "Edit"
+          expect(page).to have_link "Remove image"
+        end
+      end
+    end
   end
 end

From 4c5dc297b4bb445d86a94d474632d8300bafd866 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Tue, 4 Feb 2020 13:03:38 +0700
Subject: [PATCH 3/3] Show edit and delete investments buttons differently

In most of the rest of the application the buttons are shown in this
way, we do this little adjustment to improve the consistency with the
rest of the application
---
 app/views/users/_budget_investment.html.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_budget_investment.html.erb b/app/views/users/_budget_investment.html.erb
index 4f29c94c1..240a4e5c1 100644
--- a/app/views/users/_budget_investment.html.erb
+++ b/app/views/users/_budget_investment.html.erb
@@ -3,14 +3,14 @@
     <%= link_to budget_investment.title, budget_investment_path(budget_investment.budget, budget_investment) %>
   </td>
   <td>
-    <% if can? :destroy, budget_investment %>
-      <%= link_to t("shared.delete"), budget_investment_path(budget_investment.budget, budget_investment),
-                  method: :delete, class: "button hollow alert expanded",
-                  data: { confirm: "#{t("users.show.delete_alert")}" } %>
-    <% end %>
     <% if can? :update, budget_investment %>
       <%= link_to t("shared.edit"), edit_budget_investment_path(budget_investment.budget, budget_investment),
-                  class: "button hollow expanded" %>
+                  class: "button hollow" %>
+    <% end %>
+    <% if can? :destroy, budget_investment %>
+      <%= link_to t("shared.delete"), budget_investment_path(budget_investment.budget, budget_investment),
+                  method: :delete, class: "button hollow alert",
+                  data: { confirm: "#{t("users.show.delete_alert")}" } %>
     <% end %>
   </td>
 </tr>