From 98ecf6ce08cf930f287a09a0ef65cf1c3b786f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20J=C3=A4gle?= <github@beimir.net>
Date: Tue, 21 Nov 2017 20:07:13 +0100
Subject: [PATCH 1/4] Corrections to creation dialog

- Propagate first message properly (fixes #153)
- Change "Name" to "Title"
- get rid of flashing error message on auto-complete-confirmation with tab
---
 .../client/views/creationDialog/AssistifyCreateRequest.html    | 2 +-
 .../client/views/creationDialog/AssistifyCreateRequest.js      | 3 +++
 .../assistify-help-request/server/methods/createRequest.js     | 2 +-
 packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
index 39802f9c1d26..92f86b6bf583 100644
--- a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
+++ b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
@@ -37,7 +37,7 @@ <h1 class="create-channel__title">{{_ "Requests"}}</h1>
 			</div>
 			<div class="rc-input {{#if requestTitleError}}rc-input--error{{/if}}">
 				<label class="rc-input__label">
-					<div class="rc-input__title">{{_ "Name"}}</div>
+					<div class="rc-input__title">{{_ "Title"}}</div>
 					<div class="rc-input__wrapper">
 						<div class="rc-input__icon">
 							<svg class="rc-icon rc-input__icon-svg rc-input__icon-svg--flag" aria-hidden="true">
diff --git a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
index 9d83e3c4c5d4..090ed10ad39c 100755
--- a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
+++ b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
@@ -257,6 +257,9 @@ Template.AssistifyCreateRequest.onCreated(function() {
 	instance.delaySetExpertise = _.debounce((expertise) => {
 		instance.expertise.set(expertise);
 	}, 200);
+	instance.delaySetError = _.debounce((error) => {
+		instance.error.set(error);
+	}, 400);
 
 	// instance.clearForm = function() {
 	// 	instance.requestRoomName.set('');
diff --git a/packages/assistify-help-request/server/methods/createRequest.js b/packages/assistify-help-request/server/methods/createRequest.js
index 43315ce7f936..1e8f7faf363d 100644
--- a/packages/assistify-help-request/server/methods/createRequest.js
+++ b/packages/assistify-help-request/server/methods/createRequest.js
@@ -77,7 +77,7 @@ Meteor.methods({
 		if (openingQuestion) {
 			const msg = openingQuestion;
 			const msgObject = { _id: Random.id(), rid:roomCreateResult.rid, msg};
-			RocketChat.sendMessage([Meteor.user().username], msgObject, room);
+			RocketChat.sendMessage(Meteor.user(), msgObject, room);
 		}
 
 		const helpRequestId = RocketChat.models.HelpRequests.createForSupportArea(expertise, roomCreateResult.rid, '', environment);
diff --git a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml
index 51b98dfad727..2f9a969fbdb7 100755
--- a/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml
+++ b/packages/rocketchat-i18n/i18n/assistifyHelpRequest.en.i18n.yml
@@ -24,7 +24,7 @@ New_request_for_expertise: The topic of the new request
 New_request: New request
 New_request_created: Request created successfully
 New_request_first_question: What do you want to ask
-New_request_title: A name helps to find the request later on
+New_request_title: A title helps to find the request later on
 No_expertise_yet: No topics yet
 No_requests_yet: No requests yet
 release: Version

From 44d62d048db5770ff87034677b56cbd1e59042bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20J=C3=A4gle?= <github@beimir.net>
Date: Wed, 22 Nov 2017 08:20:53 +0100
Subject: [PATCH 2/4] Corrections to creation dialog

- more robust error handling
- prevent flashing of validation errors
---
 .../AssistifyCreateRequest.html               |  15 +-
 .../creationDialog/AssistifyCreateRequest.js  | 185 +++++++-----------
 2 files changed, 74 insertions(+), 126 deletions(-)

diff --git a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
index 92f86b6bf583..f46f13cfef6d 100644
--- a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
+++ b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
@@ -19,9 +19,9 @@ <h1 class="create-channel__title">{{_ "Requests"}}</h1>
 					</div>
 					{{#unless autocomplete 'isShowing'}}
 						{{#if expertise}}
-							{{#unless validExpertise}}
-								{{> AssistifyCreateInputError text="Expertise_does_not_exist"}}
-							{{/unless}}
+							{{#if expertiseError}}
+								{{> AssistifyCreateInputError text=expertiseError}}
+							{{/if}}
 						{{/if}}
 					{{/unless}}
 					{{#with config}}
@@ -35,7 +35,7 @@ <h1 class="create-channel__title">{{_ "Requests"}}</h1>
 					{{/with}}
 				</label>
 			</div>
-			<div class="rc-input {{#if requestTitleError}}rc-input--error{{/if}}">
+			<div class="rc-input {{#if titleError}}rc-input--error{{/if}}">
 				<label class="rc-input__label">
 					<div class="rc-input__title">{{_ "Title"}}</div>
 					<div class="rc-input__wrapper">
@@ -48,11 +48,8 @@ <h1 class="create-channel__title">{{_ "Requests"}}</h1>
 							   placeholder={{_ "New_request_title"}} autocomplete="off">
 					</div>
 				</label>
-				{{#if requestTitleInUse}}
-					{{> AssistifyCreateInputError text="Request_already_exists"}}
-				{{/if}}
-				{{#if invalidTitle}}
-					{{> AssistifyCreateInputError text="Request_no_special_char"}}
+				{{#if titleError}}
+					{{> AssistifyCreateInputError text=titleError}}
 				{{/if}}
 			</div>
 			<div class="rc-input">
diff --git a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
index 090ed10ad39c..22661a15ed36 100755
--- a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
+++ b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
@@ -2,20 +2,11 @@
 import {RocketChat} from 'meteor/rocketchat:lib';
 import {FlowRouter} from 'meteor/kadira:flow-router';
 import {ReactiveVar} from 'meteor/reactive-var';
-import toastr from 'toastr';
-
-const validateRequestName = (name) => {
-	if (RocketChat.settings.get('UI_Allow_room_names_with_special_chars')) {
-		return true;
-	} else {
-		const reg = new RegExp(`^${ RocketChat.settings.get('UTF8_Names_Validation') }$`);
-		return name.length === 0 || reg.test(name);
-	}
-};
 
 const acEvents = {
 	'click .rc-popup-list__item'(e, t) {
 		t.ac.onItemClick(this, e);
+		t.debounceValidateExpertise(this.item.name);
 	},
 	'keydown [name="expertise"]'(e, t) {
 		t.ac.onKeyDown(e);
@@ -28,6 +19,7 @@ const acEvents = {
 	},
 	'blur [name="expertise"]'(e, t) {
 		t.ac.onBlur(e);
+		t.debounceValidateExpertise(e.target.value);
 	}
 };
 
@@ -41,9 +33,6 @@ Template.AssistifyCreateRequest.helpers({
 	items() {
 		return Template.instance().ac.filteredList();
 	},
-	errorMessage() {
-		return Template.instance().errorMessage.get();
-	},
 	config() {
 		const filter = Template.instance().expertise;
 		return {
@@ -61,44 +50,24 @@ Template.AssistifyCreateRequest.helpers({
 	createIsDisabled() {
 		const instance = Template.instance();
 
-		if (!instance.requestTitle.get()) {
-			if (instance.validExpertise.get()) {
-				return '';
-			} else {
-				return 'disabled';
-			}
-		} else if (instance.requestTitle.get()) {
-			if (instance.validExpertise.get() && !instance.requestTitleInUse.get() && !instance.invalidTitle.get()) {
-				return '';
-			} else {
-				return 'disabled';
-			}
+		if (instance.validExpertise.get() && !instance.titleError.get()) {
+			return '';
+		} else {
+			return 'disabled';
 		}
 	},
-	invalidTitle() {
-		const instance = Template.instance();
-		return instance.invalidTitle.get();
-	},
-	requestTitleInUse() {
-		const instance = Template.instance();
-		return instance.requestTitleInUse.get();
-	},
-	validExpertise() {
+	expertiseError() {
 		const instance = Template.instance();
-		return instance.validExpertise.get();
+		return instance.expertiseError.get();
 	},
 	expertise() {
 		const instance = Template.instance();
 		return instance.expertise.get();
 	},
-	requestTitleError() {
+	titleError() {
 		const instance = Template.instance();
-		return instance.invalidTitle.get() || instance.requestTitleInUse.get();
+		return instance.titleError.get();
 	}
-	// noSplCharAllowed() {
-	// 	const instance = Template.instance();
-	// 	return instance.noSplCharAllowed.get();
-	// }
 });
 
 
@@ -109,53 +78,26 @@ Template.AssistifyCreateRequest.events({
 		const position = input.selectionEnd || input.selectionStart;
 		const length = input.value.length;
 		document.activeElement === input && e && /input/i.test(e.type) && (input.selectionEnd = position + input.value.length - length);
-		if (input.value) {
-			t.delaySetExpertise(input.value);
-			t.checkExpertise(input.value);
-		} else {
-			t.delaySetExpertise(false);
-			t.expertise.set('');
-		}
-		if (t.expertise.get() && t.requestTitle.get()) {
-			const requestName = `${ t.expertise.get() }-${ t.requestTitle.get() }`;
-			t.invalidTitle.set(!validateRequestName(requestName));
-			t.requestTitleInUse.set(undefined);
-			t.checkRequestName(requestName);
-		}
+		t.expertise.set(input.value);
+		t.validExpertise.set(false);
+		t.expertiseError.set('');
 	},
 	'input #request_title'(e, t) {
 		const input = e.target;
-		//const length = input.value.length;
-		if (input.value !== t.requestTitle.get()) {
-			t.requestTitle.set(input.value);
+		if (!input.value) {
+			t.titleError.set('');
 		} else {
-			t.requestTitle.set(false);
-		}
-
-		if (t.expertise.get() && input.value) {
-			const requestName = `${ input.value }`;
-			t.invalidTitle.set(!validateRequestName(requestName));
-			if (RocketChat.settings.get('UI_Allow_room_names_with_special_chars')) {
-				t.checkRequestDisplayName(requestName);
-			} else {
-				t.checkRequestName(requestName);
-			}
-			// t.invalidTitle.set(!validateRequestName(requestName));
-			// t.checkRequestName(requestName);
-			t.requestTitleInUse.set(undefined);
-		} else if (!input.value) {
-			t.invalidTitle.set(false);
-			t.requestTitleInUse.set(undefined);
+			t.requestTitle.set(input.value);
+			t.debounceValidateRequestName(input.value);
 		}
 
 	},
 	'input #first_question'(e, t) {
 		const input = e.target;
-		//const length = input.value.length;
 		if (input.value) {
 			t.openingQuestion.set(input.value);
 		} else {
-			t.openingQuestion.set(false);
+			t.openingQuestion.set('');
 		}
 	},
 	'submit create-channel__content, click .js-save-request'(event, instance) {
@@ -164,36 +106,34 @@ Template.AssistifyCreateRequest.events({
 		const requestTitle = instance.requestTitle.get();
 		const openingQuestion = instance.openingQuestion.get();
 		if (expertise) {
-			instance.errorMessage.set(null);
+			instance.titleError.set(null);
 			Meteor.call('createRequest', requestTitle, expertise, openingQuestion, (err, result) => {
 				if (err) {
 					console.log(err);
 					switch (err.error) {
 						case 'error-invalid-name':
-							toastr.error(TAPi18n.__('Invalid_room_name', `${ expertise }...`));
+							instance.titleError.set(TAPi18n.__('Invalid_room_name', `${ expertise }...`));
 							return;
 						case 'error-duplicate-channel-name':
-							toastr.error(TAPi18n.__('Request_already_exists'));
+							instance.titleError.set(TAPi18n.__('Request_already_exists'));
 							return;
 						case 'error-archived-duplicate-name':
-							toastr.error(TAPi18n.__('Duplicate_archived_channel_name', name));
+							instance.titleError.set(TAPi18n.__('Duplicate_archived_channel_name', name));
 							return;
 						case 'error-invalid-room-name':
 							console.log('room name slug error');
 							// 	toastr.error(TAPi18n.__('Duplicate_archived_channel_name', name));
-							toastr.error(TAPi18n.__('Invalid_room_name', err.details.channel_name));
+							instance.titleError.set(TAPi18n.__('Invalid_room_name', err.details.channel_name));
 							return;
 						default:
 							return handleError(err);
 					}
 				}
 				console.log('Room Created');
-				toastr.success(TAPi18n.__('New_request_created'));
+				// toastr.success(TAPi18n.__('New_request_created'));
 				const roomCreated = RocketChat.models.Rooms.findOne({_id: result.rid});
 				FlowRouter.go('request', {name: roomCreated.name}, FlowRouter.current().queryParams);
 			});
-		} else {
-			instance.validExpertise.set(true);
 		}
 	}
 });
@@ -206,7 +146,7 @@ Template.AssistifyCreateRequest.onRendered(function() {
 	this.ac.$element.on('autocompleteselect', function(e, {item}) {
 		instance.expertise.set(item.name);
 		$('input[name="expertise"]').val(item.name);
-		instance.checkExpertise(item.name);
+		instance.debounceValidateExpertise(item.name);
 
 		return instance.find('.js-save-request').focus();
 	});
@@ -217,49 +157,60 @@ Template.AssistifyCreateRequest.onCreated(function() {
 
 	instance.expertise = new ReactiveVar(''); //the value of the text field
 	instance.validExpertise = new ReactiveVar(false);
-	instance.errorMessage = new ReactiveVar(null);
+	instance.expertiseError = new ReactiveVar(null);
+	instance.titleError = new ReactiveVar(null);
 	instance.requestTitle = new ReactiveVar('');
 	instance.openingQuestion = new ReactiveVar('');
-	instance.requestTitleInUse = new ReactiveVar(undefined);
-	instance.invalidTitle = new ReactiveVar(false);
-	instance.error = new ReactiveVar(null);
-	instance.checkRequestName = _.debounce((name) => {
-		if (validateRequestName(name)) {
-			return Meteor.call('roomNameExists', name, (error, result) => {
-				if (error) {
-					return;
-				}
-				instance.requestTitleInUse.set(result);
-			});
-		}
-		instance.requestTitleInUse.set(undefined);
-	}, 500);
-	instance.checkRequestDisplayName = _.debounce((name) => {
-		if (validateRequestName(name)) {
-			return Meteor.call('roomDisplayNameExists', name, (error, result) => {
-				if (error) {
-					return;
-				}
-				instance.requestTitleInUse.set(result);
-			});
+
+	instance.debounceValidateExpertise = _.debounce((expertise) => {
+		if (!expertise) {
+			return false; //expertise is mandatory
 		}
-		instance.requestTitleInUse.set(undefined);
-	}, 500);
-	instance.checkExpertise = _.debounce((expertise) => {
 		return Meteor.call('assistify:isValidExpertise', expertise, (error, result) => {
 			if (error) {
 				instance.validExpertise.set(false);
 			} else {
 				instance.validExpertise.set(result);
+				if (!result) {
+					instance.expertiseError.set('Expertise_does_not_exist');
+				} else {
+					instance.expertiseError.set('');
+				}
 			}
 		});
 	}, 500);
-	instance.delaySetExpertise = _.debounce((expertise) => {
-		instance.expertise.set(expertise);
-	}, 200);
-	instance.delaySetError = _.debounce((error) => {
-		instance.error.set(error);
-	}, 400);
+
+	instance.debounceValidateRequestName = _.debounce((name) => {
+		instance.titleError.set('');
+		if (!name) {
+			return; //"none" is a valid name
+		}
+		if (RocketChat.settings.get('UI_Allow_room_names_with_special_chars')) {
+			Meteor.call('roomDisplayNameExists', name, (error, result) => {
+				if (error) {
+					return;
+				}
+				if (result) {
+					instance.titleError.set('Request_already_exists');
+				}
+			});
+		} else {
+			const reg = new RegExp(`^${ RocketChat.settings.get('UTF8_Names_Validation') }$`);
+			const passesRegex = name.length === 0 || reg.test(name);
+			if (!passesRegex) {
+				instance.titleError.set('Request_no_special_char');
+			} else {
+				Meteor.call('roomNameExists', name, (error, result) => {
+					if (error) {
+						return;
+					}
+					if (result) {
+						instance.titleError.set('Request_already_exists');
+					}
+				});
+			}
+		}
+	}, 500);
 
 	// instance.clearForm = function() {
 	// 	instance.requestRoomName.set('');

From 464f8bd22c224e7a10215e25e270409d5bcfd592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20J=C3=A4gle?= <github@beimir.net>
Date: Wed, 22 Nov 2017 08:58:35 +0100
Subject: [PATCH 3/4] Fix improper clearing of request title

---
 .../creationDialog/AssistifyCreateRequest.js  |  2 +-
 .../.npm/package/npm-shrinkwrap.json          | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
index 22661a15ed36..41deb8219cc2 100755
--- a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
+++ b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js
@@ -84,10 +84,10 @@ Template.AssistifyCreateRequest.events({
 	},
 	'input #request_title'(e, t) {
 		const input = e.target;
+		t.requestTitle.set(input.value);
 		if (!input.value) {
 			t.titleError.set('');
 		} else {
-			t.requestTitle.set(input.value);
 			t.debounceValidateRequestName(input.value);
 		}
 
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index cbb0f655d381..5ac2c96ace6d 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "ajv": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz",
       "from": "ajv@>=5.1.0 <6.0.0"
     },
     "ansi-regex": {
@@ -352,9 +352,9 @@
       "from": "graceful-fs@>=4.1.2 <5.0.0"
     },
     "grpc": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.1.tgz",
-      "from": "grpc@>=1.6.0 <2.0.0",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.2.tgz",
+      "from": "grpc@>=1.7.1 <2.0.0",
       "dependencies": {
         "abbrev": {
           "version": "1.0.9",
@@ -1123,9 +1123,9 @@
       "from": "modelo@>=4.2.0 <5.0.0"
     },
     "nan": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "from": "nan@>=2.0.0 <3.0.0"
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+      "from": "nan@>=2.8.0 <3.0.0"
     },
     "node-forge": {
       "version": "0.7.1",
@@ -1208,8 +1208,8 @@
       "from": "protobufjs@>=5.0.0 <6.0.0"
     },
     "pump": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
       "from": "pump@>=1.0.0 <2.0.0"
     },
     "pumpify": {

From 6f8348200613997470eeca7b7691e39768c2e212 Mon Sep 17 00:00:00 2001
From: Vignesh <vickyokrm@gmail.com>
Date: Wed, 22 Nov 2017 17:08:31 +0100
Subject: [PATCH 4/4] Invalid Expertise field highlight

---
 .../client/views/creationDialog/AssistifyCreateRequest.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
index f46f13cfef6d..f8bab79e6c51 100644
--- a/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
+++ b/packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.html
@@ -5,7 +5,7 @@ <h1 class="create-channel__title">{{_ "Requests"}}</h1>
 	</header>
 	<form class="create-channel__content">
 		<div class="create-channel__inputs">
-			<div class="rc-input">
+			<div class="rc-input {{#if expertiseError}} rc-input--error {{/if}}">
 				<label class="rc-input__label">
 					<div class="rc-input__title">{{_ "Expertise"}}</div>
 					<div class="rc-input__wrapper">