Feature/#24 deactivate closing comments (#170)

vickyokrm · web-flow · commit ab98c8505f8e · 2017-12-14T16:04:10.000+01:00
* Deactivate Request Closing Comments

* Deactivate closing comment for Live-Chat

* Create the swal config more nicely

* text translation and mergin object properties

* incl. setting to config role and roll back to using _ for object mergin

* minor naming adjustments
diff --git a/packages/assistify-defaults/server/roles.js b/packages/assistify-defaults/server/roles.js
@@ -179,7 +179,8 @@ const createConfigurationRole = function() {
 		'change-setting-Accounts_AllowedDomainsList',
 		'change-setting-Accounts_ManuallyApproveNewUsers',
 		'change-setting-Accounts_EmailVerification',
-		'change-setting-Accounts'
+		'change-setting-Accounts',
+		'change-setting-Assistify_Deactivate_request_closing_comments'
 	];
 
 	assignPermissions(CONFIGURATION_ROLE_NAME,
diff --git a/packages/assistify-help-request/client/views/tabbar/HelpRequestActions.js b/packages/assistify-help-request/client/views/tabbar/HelpRequestActions.js
@@ -1,4 +1,8 @@
-import { RocketChat, UiTextContext } from 'meteor/rocketchat:lib';
+import {RocketChat, UiTextContext} from 'meteor/rocketchat:lib';
+
+const showClosingComment = function() {
+	return !RocketChat.settings.get('Assistify_Deactivate_request_closing_comments');
+};
 
 Template.HelpRequestActions.helpers({
 	helprequestOpen() {
@@ -36,20 +40,28 @@ Template.HelpRequestActions.helpers({
 	}
 });
 
+
 Template.HelpRequestActions.events({
 	'click .close-helprequest'(event, instance) {
 		event.preventDefault();
 		const warnText = RocketChat.roomTypes.roomTypes['r'].getUiText(UiTextContext.CLOSE_WARNING);
 
-		swal(_.extend({
+		let swalConfig = {
 			title: t('Closing_chat'),
 			text: warnText ? t(warnText) : '',
-			type: 'input',
-			inputPlaceholder: t('Close_request_comment'),
 			showCancelButton: true,
 			closeOnConfirm: false,
 			roomId: instance.data.roomId
-		}), (inputValue) => {
+		};
+
+		if (showClosingComment()) {
+			swalConfig = _.extend(swalConfig, {
+				type: 'input',
+				inputPlaceholder: t('Close_request_comment')
+			});
+		}
+
+		swal(swalConfig, (inputValue) => {
 			//inputValue is false on "cancel" and has a string value of the input if confirmed.
 			if (!(typeof inputValue === 'boolean' && inputValue === false)) {
 				Meteor.call('assistify:closeHelpRequest', this.roomId, {comment: inputValue}, function(error) {
@@ -74,14 +86,21 @@ Template.HelpRequestActions.events({
 	},
 	'click .close-livechat'(event) {
 		event.preventDefault();
-
-		swal({
+		let swalConfig = {
 			title: t('Closing_chat'),
-			type: 'input',
-			inputPlaceholder: t('Please_add_a_comment'),
+			type: showClosingComment(),
 			showCancelButton: true,
 			closeOnConfirm: false
-		}, (inputValue) => {
+		};
+
+		if (showClosingComment()) {
+			swalConfig = _.extend(swalConfig, {
+				type: 'input',
+				inputPlaceholder: t('Please_add_a_comment')
+			});
+		}
+
+		swal(swalConfig, (inputValue) => {
 			//inputValue is false on "cancel" and has a string value of the input if confirmed.
 			if (!(typeof inputValue === 'boolean' && inputValue === false)) {
 
diff --git a/packages/assistify-help-request/config.js b/packages/assistify-help-request/config.js
@@ -26,6 +26,14 @@ Meteor.startup(() => {
 		section: 'General'
 	});
 
+	RocketChat.settings.add('Assistify_Deactivate_request_closing_comments', false, {
+		group: 'Assistify',
+		i18nLabel: 'Deactivate_close_comment',
+		type: 'boolean',
+		section:'General',
+		public: true
+	});
+
 	_createExpertsChannel();
 
 	RocketChat.theme.addPackageAsset(() => {
diff --git a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.de.i18n.yml b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.de.i18n.yml
@@ -8,6 +8,7 @@ create-e: Thema anlegen
 create-r: Anfrage anlegen
 delete-e: Thema löschen
 delete-r: Anfrage löschen
+Deactivate_close_comment: Kommentieren beim Schließen von Anfragen verhindern
 Expertise_description: Ein Thema beschreibt ein Wissensgebiet. Experten beantworten hierzu Anfragen
 Expertise_does_not_exist: Das Thema gibt es nicht
 Expertise_explanation: Ein Thema beschreibt ein Wissensgebiet. Zu einem Thema können Anfragen erstellt werden, die von den Experten, die dem Thema als Mitglieder zugeordnet sind, beantwortet werden können.
diff --git a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml
@@ -1,9 +1,10 @@
 application: Application
-Asssitify_room_count: Roomcount
+Assistify_room_count: Roomcount
 Choose_experts: Choose experts
 Close_HelpRequest: Close chat
 Close_request_comment: You can add (famous) last words
 Close_request_warning: Please do close the request once you are finished answering the questions asked. This way, we can learn from what you have written.
+Deactivate_close_comment: Don't allow closing comments
 Expertise_description: A topic is an area of knowledge with known experts.
 Expertise_does_not_exist: Expertise does not exist
 Expertise_explanation: A topic is an area of knowledge. Experts join a topic in order to help others solve their question in that area.
