Incorporate review

4 files changed, 21 insertions, 21 deletions

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index b4f5750b0a4..30c2a5d9982 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -3,7 +3,7 @@ class Projects::ServicesController < Projects::ApplicationController
 
   # Authorize
   before_action :authorize_admin_project!
-  before_action :service, only: [:edit, :update, :test, :configure]
+  before_action :service, only: [:edit, :update, :test]
 
   respond_to :html
 
diff --git a/app/models/project_services/mattermost_slash_commands_service.rb b/app/models/project_services/mattermost_slash_commands_service.rb
index 5af85d9a598..5dfc4cc2744 100644
--- a/app/models/project_services/mattermost_slash_commands_service.rb
+++ b/app/models/project_services/mattermost_slash_commands_service.rb
@@ -25,15 +25,12 @@ class MattermostSlashCommandsService < ChatService
     ]
   end
 
-  def configure(host, current_user, team_id:, trigger:, url:, icon_url:)
+  def configure(host, current_user, params)
     new_token = Mattermost::Session.new(host, current_user).with_session do
-      Mattermost::Command.create(team_id,
-                                 trigger: trigger || @service.project.path,
-                                 url: url,
-                                 icon_url: icon_url)
+      Mattermost::Command.create(params[:team_id], command)
     end
 
-    update!(token: new_token)
+    update!(token: new_token, active: true)
   end
 
   def trigger(params)
@@ -50,6 +47,23 @@ class MattermostSlashCommandsService < ChatService
 
   private
 
+  def command(trigger:, url:, icon_url:)
+    pretty_project_name = project.name_with_namespace
+
+    {
+      auto_complete: true,
+      auto_complete_desc: "Perform common operations on: #{pretty_project_name}",
+      auto_complete_hint: '[help]',
+      description: "Perform common operations on: #{pretty_project_name}",
+      display_name: "GitLab  / #{pretty_project_name}",
+      method: 'P',
+      user_name: 'GitLab',
+      trigger: trigger,
+      url: url,
+      icon_url: icon_url
+    }
+  end
+
   def find_chat_user(params)
     ChatNames::FindUserService.new(self, params).execute
   end
diff --git a/app/views/projects/mattermost/new.html.haml b/app/views/projects/mattermost/new.html.haml
index b4a1476be13..88270985e7b 100644
--- a/app/views/projects/mattermost/new.html.haml
+++ b/app/views/projects/mattermost/new.html.haml
@@ -1,5 +1,3 @@
-= "hello world"
-= @teams
 = form_for(:create, method: :post, url: configure_namespace_project_mattermost_path(@project.namespace, @project, )) do |f|
   = "Team ID"
   = f.text_field(:team_id)
diff --git a/lib/mattermost/command.rb b/lib/mattermost/command.rb
index 7d4710bb94d..9c37d0b0d79 100644
--- a/lib/mattermost/command.rb
+++ b/lib/mattermost/command.rb
@@ -1,18 +1,6 @@
 module Mattermost
   class Command < Session
     def self.create(team_id, trigger: 'gitlab', url:, icon_url:)
-      command = {
-        auto_complete: true,
-        auto_complete_desc: 'List all available commands',
-        auto_complete_hint: '[help]',
-        description: 'Perform common operations on GitLab',
-        display_name: 'GitLab Slash Commands',
-        method: 'P',
-        user_name: 'GitLab',
-        trigger: trigger,
-        url: url,
-        icon_url: icon_url
-      }
 
       post_command(command)['token']
     end