From aaaffdf3713736af65458ed156d384e52900f704 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 4 Jul 2017 23:35:45 +0100 Subject: [PATCH] =?UTF-8?q?Add=20=E2=80=98send=20test=20message=E2=80=99?= =?UTF-8?q?=20functionality=20to=20the=20admin=20interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin-plugins-chat-provider.js.es6 | 5 ++ .../modals/admin-plugins-chat-test.js.es6 | 43 +++++++++++++++ .../modal/admin-plugins-chat-test.hbs | 54 +++++++++++++++++++ .../templates/admin/plugins-chat-provider.hbs | 2 + .../stylesheets/chat-integration-admin.scss | 4 +- config/locales/client.en.yml | 10 ++++ .../provider/slack/slack_provider.rb | 7 ++- plugin.rb | 34 ++++++++++++ 8 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 create mode 100644 assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 b/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 index e1dd35a..5fd9341 100644 --- a/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 +++ b/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 @@ -37,6 +37,11 @@ export default Ember.Controller.extend({ }, showError(error_key){ bootbox.alert(I18n.t(error_key)); + }, + test(){ + this.set('modalShowing', true); + var model = {provider:this.get('model.provider'), channel:''} + showModal('admin-plugins-chat-test', { model: model, admin: true }); } } diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 new file mode 100644 index 0000000..0c97dfa --- /dev/null +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 @@ -0,0 +1,43 @@ +import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import { ajax } from 'discourse/lib/ajax'; + +export default Ember.Controller.extend(ModalFunctionality, { + sendDisabled: function(){ + if(this.get('model').topic_id && this.get('model').channel){ + return false + } + return true + }.property('model.topic_id', 'model.channel'), + + actions: { + + send: function(){ + self = this; + this.set('loading', true); + ajax("/admin/plugins/chat/test", { + data: { provider: this.get('model.provider.name'), + channel: this.get('model.channel'), + topic_id: this.get('model.topic_id') + }, + type: 'POST' + }).then(function (result) { + self.set('loading', false) + self.flash(I18n.t('chat_integration.test_modal.success'), 'success'); + }, function(e) { + self.set('loading', false); + + var response = e.jqXHR.responseJSON + var error_key = 'chat_integration.test_modal.error' + debugger; + if(response['error_key']){ + error_key = response['error_key'] + } + self.flash(I18n.t(error_key), 'error'); + + }); + } + + } + + +}); \ No newline at end of file diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs new file mode 100644 index 0000000..7f2e404 --- /dev/null +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs @@ -0,0 +1,54 @@ +{{#d-modal-body id="chat_integration_test_modal" title="chat_integration.test_modal.title"}} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{i18n (concat 'chat_integration.provider.' model.provider.id '.title')}} +
+ {{text-field + name="channel" + value=model.channel + autofocus="autofocus" + id="channel-field"}} + + {{!--  {{input-tip validation=channelValidation}} --}} +
+ {{choose-topic selectedTopicId=model.topic_id}} +
+
+
+{{/d-modal-body}} + +
+ {{#conditional-loading-spinner condition=loading}} + {{d-button class='btn-primary btn-large' action="send" title="chat_integration.test_modal.send" label="chat_integration.test_modal.send" disabled=sendDisabled}} + + {{d-button class="btn-large" action="closeModal" title="chat_integration.test_modal.close" label="chat_integration.test_modal.close"}} + {{/conditional-loading-spinner}} + +
\ No newline at end of file diff --git a/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs b/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs index 2fcd602..236c68e 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs @@ -67,6 +67,8 @@
+ {{d-button action="test" actionParam=model.provider icon="rocket" title="chat_integration.test_provider" label="chat_integration.test_provider"}} +
{{d-button action="create" actionParam=model.provider icon="plus" title="chat_integration.create_rule" label="chat_integration.create_rule"}}
diff --git a/assets/stylesheets/chat-integration-admin.scss b/assets/stylesheets/chat-integration-admin.scss index d5aaad3..a048ce9 100644 --- a/assets/stylesheets/chat-integration-admin.scss +++ b/assets/stylesheets/chat-integration-admin.scss @@ -28,7 +28,7 @@ } -#chat_integration_edit_rule_modal{ +#chat_integration_edit_rule_modal, #chat_integration_test_modal{ table{ width:100%; @@ -51,7 +51,7 @@ } - input{ + #channel-field{ width: 200px; margin-bottom: 0px; box-shadow: none; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 10e374c..a8224a7 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -9,6 +9,16 @@ en: all_categories: "(all categories)" all_tags: "(all tags)" create_rule: "Create Rule" + test_provider: "Test Provider" + test_modal: + title: "Send a test message" + provider: "Provider" + channel: "Channel" + topic: "Topic" + send: "Send Test Message" + close: "Close" + error: "An unknown error occured while sending the message. Check the site logs for more information." + success: "Message sent successfully" filter: mute: 'Mute' follow: 'First post only' diff --git a/lib/discourse_chat/provider/slack/slack_provider.rb b/lib/discourse_chat/provider/slack/slack_provider.rb index a8674df..8236bf6 100644 --- a/lib/discourse_chat/provider/slack/slack_provider.rb +++ b/lib/discourse_chat/provider/slack/slack_provider.rb @@ -26,7 +26,10 @@ module DiscourseChat::Provider::SlackProvider topic = post.topic - category = (topic.category.parent_category) ? "[#{topic.category.parent_category.name}/#{topic.category.name}]": "[#{topic.category.name}]" + category = '' + if topic.category + category = (topic.category.parent_category) ? "[#{topic.category.parent_category.name}/#{topic.category.name}]": "[#{topic.category.name}]" + end icon_url = if !SiteSetting.chat_integration_slack_icon_url.blank? @@ -46,7 +49,7 @@ module DiscourseChat::Provider::SlackProvider fallback: "#{topic.title} - #{display_name}", author_name: display_name, author_icon: post.user.small_avatar_url, - color: "##{topic.category.color}", + color: topic.category ? "##{topic.category.color}" : nil, text: ::DiscourseSlack::Slack.excerpt(post), mrkdwn_in: ["text"] } diff --git a/plugin.rb b/plugin.rb index 14999c3..1e2c54a 100644 --- a/plugin.rb +++ b/plugin.rb @@ -79,6 +79,39 @@ after_initialize do render json:providers, root: 'providers' end + def test_provider + begin + requested_provider = params[:provider] + channel = params[:channel] + topic_id = params[:topic_id] + + provider = ::DiscourseChat::Provider.get_by_name(requested_provider) + + if provider.nil? or not ::DiscourseChat::Provider.is_enabled(provider) + raise Discourse::NotFound + end + + if defined? provider::PROVIDER_CHANNEL_REGEX + channel_regex = Regexp.new provider::PROVIDER_CHANNEL_REGEX + raise Discourse::InvalidParameters, 'Channel is not valid' if not channel_regex.match?(channel) + end + + post = Topic.find(topic_id.to_i).posts.first + + provider.trigger_notification(post, channel) + + render json:success_json + rescue Discourse::InvalidParameters, ActiveRecord::RecordNotFound => e + render json: {errors: [e.message]}, status: 422 + rescue DiscourseChat::ProviderError => e + if e.info.key?(:error_key) and !e.info[:error_key].nil? + render json: {error_key: e.info[:error_key]}, status: 422 + else + render json: {errors: [e.message]}, status: 422 + end + end + end + def list_rules providers = ::DiscourseChat::Provider.enabled_providers.map {|x| x::PROVIDER_NAME} @@ -148,6 +181,7 @@ after_initialize do DiscourseChat::Engine.routes.draw do get "" => "chat#respond" get '/providers' => "chat#list_providers" + post '/test' => "chat#test_provider" get '/rules' => "chat#list_rules" put '/rules' => "chat#create_rule"