From 70baf7956bb2a2e1e823309cae3adbda90e0e8ff Mon Sep 17 00:00:00 2001
From: Kevin Porras <kporras07@gmail.com>
Date: Wed, 14 Oct 2020 14:05:15 -0600
Subject: [PATCH 1/4] refs #22670: Initial setup of the helper and required
 elements.

---
 app/helpers/issues_controller_helper.rb                     | 6 ++++++
 .../redmine_mentions_suggestions/_edit_mentionable.html.erb | 1 +
 init.rb                                                     | 3 ++-
 lib/redmine_mentions_suggestions.rb                         | 5 +++++
 lib/redmine_mentions_suggestions/hooks.rb                   | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 app/helpers/issues_controller_helper.rb
 create mode 100644 lib/redmine_mentions_suggestions.rb

diff --git a/app/helpers/issues_controller_helper.rb b/app/helpers/issues_controller_helper.rb
new file mode 100644
index 0000000..f00c555
--- /dev/null
+++ b/app/helpers/issues_controller_helper.rb
@@ -0,0 +1,6 @@
+module IssuesControllerHelper
+  def map_users_to_states(users, issue)
+    'hello world'
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
index d012a6c..c132b41 100644
--- a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
+++ b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
@@ -7,6 +7,7 @@
 <% users_regex = users.collect{|u| "#{Setting.plugin_redmine_mentions['trigger']}#{u.login}"}.join('|')%>
 <% regex_highlight = '/\B('+users_regex+')\b/g' %>
 <script>
+  console.log("HELPER 2: <%= self.map_users_to_states(users, @issue) %>");
   var mentions = <%=  users.collect{|u| "#{u.id}-#{u.login}"}.to_json.html_safe %>;
   var id = 0;
   var user = '';
diff --git a/init.rb b/init.rb
index f0668b1..be12afe 100644
--- a/init.rb
+++ b/init.rb
@@ -1,4 +1,4 @@
-require_dependency 'redmine_mentions_suggestions/hooks'
+require_dependency 'redmine_mentions_suggestions'
 
 Redmine::Plugin.register :redmine_mentions_suggestions do
   name 'Redmine Mentions Suggestions plugin'
@@ -8,3 +8,4 @@
   url 'http://example.com/path/to/plugin'
   author_url 'http://example.com/about'
 end
+ 
\ No newline at end of file
diff --git a/lib/redmine_mentions_suggestions.rb b/lib/redmine_mentions_suggestions.rb
new file mode 100644
index 0000000..b2dff5c
--- /dev/null
+++ b/lib/redmine_mentions_suggestions.rb
@@ -0,0 +1,5 @@
+Rails.configuration.to_prepare do
+
+  IssuesController.send :helper, IssuesControllerHelper
+  require_dependency 'redmine_mentions_suggestions/hooks'
+end
diff --git a/lib/redmine_mentions_suggestions/hooks.rb b/lib/redmine_mentions_suggestions/hooks.rb
index 65e0f5b..6992446 100644
--- a/lib/redmine_mentions_suggestions/hooks.rb
+++ b/lib/redmine_mentions_suggestions/hooks.rb
@@ -12,4 +12,4 @@ class Hooks < Redmine::Hook::ViewListener
     render_on :view_issues_form_details_bottom,
               :partial => 'hooks/redmine_mentions_suggestions/edit_mentionable'
   end
-end
\ No newline at end of file
+end

From 9c13224225d84d844f5dfcc44a2089eda1338482 Mon Sep 17 00:00:00 2001
From: Kevin Porras <kporras07@gmail.com>
Date: Wed, 14 Oct 2020 15:41:24 -0600
Subject: [PATCH 2/4] refs #22670: Use the right query for statuses mapping and
 statuses listing.

---
 app/helpers/issues_controller_helper.rb       | 32 ++++++++++++++++++-
 .../_edit_mentionable.html.erb                |  3 +-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/helpers/issues_controller_helper.rb b/app/helpers/issues_controller_helper.rb
index f00c555..5393081 100644
--- a/app/helpers/issues_controller_helper.rb
+++ b/app/helpers/issues_controller_helper.rb
@@ -1,6 +1,36 @@
 module IssuesControllerHelper
   def map_users_to_states(users, issue)
-    'hello world'
+    mapping = {}
+    journals = Journal.where("journalized_type = 'issue' AND journalized_id = :id", {id: issue.id})
+    journals.each do |journal|
+      details = JournalDetail.where("journal_id = :id", {id: journal.id})
+      assignee = nil
+      status = nil
+      details.each do |detail|
+        if detail.prop_key == 'status_id'
+          status = detail.value
+        end
+        if detail.prop_key == 'assigned_to_id'
+          assignee = detail.value
+        end
+      end
+      if assignee && status
+        if !mapping.key?(assignee)
+          mapping[assignee] = []
+        end
+        mapping[assignee].push(status)
+      end
+    end
+    mapping
+  end
+
+  def status_listing
+    issues = IssueStatus.order("position")
+    listing = {}
+    issues.each do |issue|
+      listing[issue.id] = issue.name
+    end
+    listing
   end
 
 end
\ No newline at end of file
diff --git a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
index c132b41..a61f4d2 100644
--- a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
+++ b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
@@ -7,7 +7,8 @@
 <% users_regex = users.collect{|u| "#{Setting.plugin_redmine_mentions['trigger']}#{u.login}"}.join('|')%>
 <% regex_highlight = '/\B('+users_regex+')\b/g' %>
 <script>
-  console.log("HELPER 2: <%= self.map_users_to_states(users, @issue) %>");
+  console.log("MAPPING: <%= self.map_users_to_states(users, @issue) %>");
+  console.log("STATUSES: <%= self.status_listing %>");
   var mentions = <%=  users.collect{|u| "#{u.id}-#{u.login}"}.to_json.html_safe %>;
   var id = 0;
   var user = '';

From e28dd9b090bd92209638296d7389f89e6deb8f72 Mon Sep 17 00:00:00 2001
From: Kevin Porras <kporras07@gmail.com>
Date: Fri, 16 Oct 2020 09:43:08 -0600
Subject: [PATCH 3/4] refs #22670: SSuggest statuses based on possible
 assignee.

---
 app/helpers/issues_controller_helper.rb       | 10 +++---
 .../_edit_mentionable.html.erb                | 31 +++++++++++++------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/helpers/issues_controller_helper.rb b/app/helpers/issues_controller_helper.rb
index 5393081..9918720 100644
--- a/app/helpers/issues_controller_helper.rb
+++ b/app/helpers/issues_controller_helper.rb
@@ -21,16 +21,16 @@ def map_users_to_states(users, issue)
         mapping[assignee].push(status)
       end
     end
-    mapping
+    mapping.to_json.html_safe
   end
 
   def status_listing
-    issues = IssueStatus.order("position")
+    statuses = IssueStatus.order("position")
     listing = {}
-    issues.each do |issue|
-      listing[issue.id] = issue.name
+    statuses.each do |status|
+      listing[status.id] = "#{status.name}"
     end
-    listing
+    listing.to_json.html_safe
   end
 
 end
\ No newline at end of file
diff --git a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
index a61f4d2..8de3cb3 100644
--- a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
+++ b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
@@ -7,12 +7,13 @@
 <% users_regex = users.collect{|u| "#{Setting.plugin_redmine_mentions['trigger']}#{u.login}"}.join('|')%>
 <% regex_highlight = '/\B('+users_regex+')\b/g' %>
 <script>
-  console.log("MAPPING: <%= self.map_users_to_states(users, @issue) %>");
-  console.log("STATUSES: <%= self.status_listing %>");
   var mentions = <%=  users.collect{|u| "#{u.id}-#{u.login}"}.to_json.html_safe %>;
   var id = 0;
   var user = '';
 
+  var usersMapping = <%= self.map_users_to_states(users, @issue) %>;
+  var statuses = <%= self.status_listing %>;
+
   window.setInterval(function(){
     var text = $('#issue_notes').val();
     var matches = new RegExp(<%=regex_highlight%>).exec(text);
@@ -32,24 +33,34 @@
       }
     }
     if (updated) {
-      var $suggest_assignee = false;
-      if ($('.issue-suggest-assignee').length) {
-        $suggest_assignee = $('.issue-suggest-assignee');
+      var $suggestions = false;
+      if ($('.issue-suggestions').length) {
+        $suggestions = $('.issue-suggestions');
       }
       else {
-        $suggest_assignee = $('<div class="issue-suggest-assignee"/>');
+        $suggestions = $('<div class="issue-suggestions"/>');
       }
-      $suggest_assignee.html('');
-      $suggest_assignee.append('<input id="issue_suggest_assignee_'+ id + '" data-user-id="' + id + '" type="checkbox" name="issue_suggest_assignee" value="1">');
-      $suggest_assignee.append('<label>Assign issue to ' + user + '</label>');
-      $('#issue_private_notes').before($suggest_assignee);
+      $suggestions.html('');
+      $suggestions.append('<div class="assignee-suggestion"><input id="issue_suggest_assignee_'+ id + '" data-user-id="' + id + '" type="checkbox" name="issue_suggest_assignee" value="1"><label>Assign issue to ' + user + '</label></div>');
+      $('#issue_private_notes').before($suggestions);
       $('input[name="issue_suggest_assignee"]').prop('checked', true);
 
+      if (usersMapping[id]) {
+        for (var index = 0; index < usersMapping[id].length; index++) {
+          statusId = usersMapping[id][index];
+          statusName = statuses[statusId];
+
+          $suggestions.append('<div class="status-suggestion"><input id="issue_suggest_status_'+ statusId + '" data-status-id="' + statusId + '" type="radio" name="issue_suggest_status" value="' + statusId + '"><label>Change status to ' + statusName + '</label></div>');
+        }
+        $suggestions.append('<div class="status-suggestion"><input id="issue_suggest_status_0" data-status-id="0" type="radio" name="issue_suggest_status" value="0"><label>Do not change status</label></div>');
+      }
+
       $('#issue-form').submit(function() {
         if ($('input[name="issue_suggest_assignee"]').is(':checked')) {
           var id = $('input[name="issue_suggest_assignee"]').attr('data-user-id');
           $('#issue_assigned_to_id').val(id);
         }
+        // @TODO: IMPLEMENT.
       });
     }
   }, 2000);

From 78d5be1cb42dbd1e8095f49f584e644146cd571e Mon Sep 17 00:00:00 2001
From: Kevin Porras <kporras07@gmail.com>
Date: Fri, 16 Oct 2020 11:06:10 -0600
Subject: [PATCH 4/4] refs #22670: Handle change status radio.

---
 app/helpers/issues_controller_helper.rb                    | 4 +++-
 .../_edit_mentionable.html.erb                             | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/helpers/issues_controller_helper.rb b/app/helpers/issues_controller_helper.rb
index 9918720..fbeedb1 100644
--- a/app/helpers/issues_controller_helper.rb
+++ b/app/helpers/issues_controller_helper.rb
@@ -18,7 +18,9 @@ def map_users_to_states(users, issue)
         if !mapping.key?(assignee)
           mapping[assignee] = []
         end
-        mapping[assignee].push(status)
+        unless mapping[assignee].include? status
+          mapping[assignee].push(status)
+        end
       end
     end
     mapping.to_json.html_safe
diff --git a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
index 8de3cb3..537c264 100644
--- a/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
+++ b/app/views/hooks/redmine_mentions_suggestions/_edit_mentionable.html.erb
@@ -53,6 +53,8 @@
           $suggestions.append('<div class="status-suggestion"><input id="issue_suggest_status_'+ statusId + '" data-status-id="' + statusId + '" type="radio" name="issue_suggest_status" value="' + statusId + '"><label>Change status to ' + statusName + '</label></div>');
         }
         $suggestions.append('<div class="status-suggestion"><input id="issue_suggest_status_0" data-status-id="0" type="radio" name="issue_suggest_status" value="0"><label>Do not change status</label></div>');
+        $('#issue_suggest_status_0').prop('checked', true);
+
       }
 
       $('#issue-form').submit(function() {
@@ -60,7 +62,10 @@
           var id = $('input[name="issue_suggest_assignee"]').attr('data-user-id');
           $('#issue_assigned_to_id').val(id);
         }
-        // @TODO: IMPLEMENT.
+        if ($('input[name="issue_suggest_status"]:checked').val()) {
+          var statusId = $('input[name="issue_suggest_status"]:checked').val();
+          $('#issue_status_id').val(statusId);
+        }
       });
     }
   }, 2000);