Merge pull request #13052 from surajshetty3416/fix-mentions

frappe/boot.py

@@ -42,8 +42,6 @@ def get_bootinfo():
 		bootinfo.user_info = get_user_info()
 		bootinfo.sid = frappe.session['sid']
 
-	bootinfo.user_groups = frappe.get_all('User Group', pluck="name")
-
 	bootinfo.modules = {}
 	bootinfo.module_list = []
 	load_desktop_data(bootinfo)

frappe/core/doctype/user/user.py

@@ -56,6 +56,7 @@ class User(Document):
 
 	def after_insert(self):
 		create_notification_settings(self.name)
+		frappe.cache().delete_key('users_for_mentions')
 
 	def validate(self):
 		self.check_demo()
@@ -129,6 +130,9 @@ class User(Document):
 		if self.time_zone:
 			frappe.defaults.set_default("time_zone", self.time_zone, self.name)
 
+		if self.has_value_changed('allow_in_mentions') or self.has_value_changed('user_type'):
+			frappe.cache().delete_key('users_for_mentions')
+
 	def has_website_permission(self, ptype, user, verbose=False):
 		"""Returns true if current user is the session user"""
 		return self.name == frappe.session.user
@@ -389,6 +393,9 @@ class User(Document):
 		# delete notification settings
 		frappe.delete_doc("Notification Settings", self.name, ignore_permissions=True)
 
+		if self.get('allow_in_mentions'):
+			frappe.cache().delete_key('users_for_mentions')
+
 
 	def before_rename(self, old_name, new_name, merge=False):
 		self.check_demo()

frappe/core/doctype/user_group/user_group.py

@@ -9,7 +9,7 @@ import frappe
 
 class UserGroup(Document):
 	def after_insert(self):
-		frappe.publish_realtime('user_group_added', self.name)
+		frappe.cache().delete_key('user_groups')
 
 	def on_trash(self):
-		frappe.publish_realtime('user_group_deleted', self.name)
+		frappe.cache().delete_key('user_groups')

frappe/desk/search.py

@@ -221,3 +221,37 @@ def validate_and_sanitize_search_inputs(fn, instance, args, kwargs):
 		return []
 
 	return fn(**kwargs)
+
+
+@frappe.whitelist()
+def get_names_for_mentions(search_term):
+	users_for_mentions = frappe.cache().get_value('users_for_mentions', get_users_for_mentions)
+	user_groups = frappe.cache().get_value('user_groups', get_user_groups)
+
+	filtered_mentions = []
+	for mention_data in users_for_mentions + user_groups:
+		if search_term.lower() not in mention_data.value.lower():
+			continue
+
+		mention_data['link'] = frappe.utils.get_url_to_form(
+			'User Group' if mention_data.get('is_group') else 'User Profile',
+			mention_data['id']
+		)
+
+		filtered_mentions.append(mention_data)
+
+	return sorted(filtered_mentions, key=lambda d: d['value'])
+
+def get_users_for_mentions():
+	return frappe.get_all('User',
+		fields=['name as id', 'full_name as value'],
+		filters={
+			'name': ['not in', ('Administrator', 'Guest')],
+			'allowed_in_mentions': True,
+			'user_type': 'System User',
+		})
+
+def get_user_groups():
+	return frappe.get_all('User Group', fields=['name as id', 'name as value'], update={
+		'is_group': True
+	})

frappe/public/js/frappe/desk.js

@@ -114,8 +114,6 @@ frappe.Application = Class.extend({
 			dialog.get_close_btn().toggle(false);
 		});
 
-		this.setup_user_group_listeners();
-
 		// listen to build errors
 		this.setup_build_error_listener();
 
@@ -593,15 +591,6 @@ frappe.Application = Class.extend({
 		}
 	},
 
-	setup_user_group_listeners() {
-		frappe.realtime.on('user_group_added', (user_group) => {
-			frappe.boot.user_groups && frappe.boot.user_groups.push(user_group);
-		});
-		frappe.realtime.on('user_group_deleted', (user_group) => {
-			frappe.boot.user_groups = (frappe.boot.user_groups || []).filter(el => el !== user_group);
-		});
-	},
-
 	setup_energy_point_listeners() {
 		frappe.realtime.on('energy_point_alert', (message) => {
 			frappe.show_alert(message);

frappe/public/js/frappe/form/controls/comment.js

@@ -78,35 +78,25 @@ frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
 	},
 
 	get_mention_options() {
-		if (!(this.mentions && this.mentions.length)) {
+		if (!this.enable_mentions) {
 			return null;
 		}
-
-		const at_values = this.mentions.slice();
-
+		let me = this;
 		return {
 			allowedChars: /^[A-Za-z0-9_]*$/,
 			mentionDenotationChars: ["@"],
 			isolateCharacter: true,
-			source: function (searchTerm, renderList, mentionChar) {
-				let values;
-
-				if (mentionChar === "@") {
-					values = at_values;
-				}
-
-				if (searchTerm.length === 0) {
-					renderList(values, searchTerm);
-				} else {
-					const matches = [];
-					for (let i = 0; i < values.length; i++) {
-						if (~values[i].value.toLowerCase().indexOf(searchTerm.toLowerCase())) {
-							matches.push(values[i]);
-						}
-					}
-					renderList(matches, searchTerm);
-				}
-			},
+			source: frappe.utils.debounce(async function(search_term, renderList) {
+				let method = me.mention_search_method || 'frappe.desk.search.get_names_for_mentions';
+				let values = await frappe.xcall(method, {
+					search_term
+				});
+				renderList(values, search_term);
+			}, 300),
+			renderItem(item) {
+				let value = item.value;
+				return `${value} ${item.is_group ? frappe.utils.icon('users') : ''}`;
+			}
 		};
 	},
 

frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js

@@ -12,6 +12,7 @@ class MentionBlot extends Embed {
     denotationChar.innerHTML = data.denotationChar;
     node.appendChild(denotationChar);
     node.innerHTML += data.value;
+    node.innerHTML += `${data.isGroup === 'true' ? frappe.utils.icon('users') : ''}`;
     node.dataset.id = data.id;
     node.dataset.value = data.value;
     node.dataset.denotationChar = data.denotationChar;

frappe/public/js/frappe/form/footer/footer.js

@@ -24,7 +24,7 @@ frappe.ui.form.Footer = Class.extend({
 			parent: this.wrapper.find(".comment-box"),
 			render_input: true,
 			only_input: true,
-			mentions: frappe.utils.get_names_for_mentions(),
+			enable_mentions: true,
 			df: {
 				fieldtype: 'Comment',
 				fieldname: 'comment'

frappe/public/js/frappe/form/footer/form_timeline.js

@@ -492,7 +492,7 @@ class FormTimeline extends BaseTimeline {
 				fieldname: 'comment',
 				label: 'Comment'
 			},
-			mentions: frappe.utils.get_names_for_mentions(),
+			enable_mentions: true,
 			render_input: true,
 			only_input: true,
 			no_wrapper: true

frappe/public/js/frappe/utils/utils.js

@@ -1272,31 +1272,6 @@ Object.assign(frappe.utils, {
 		</div>`);
 	},
 
-	get_names_for_mentions() {
-		let names_for_mentions = Object.keys(frappe.boot.user_info || [])
-			.filter(user => {
-				return !["Administrator", "Guest"].includes(user)
-					&& frappe.boot.user_info[user].allowed_in_mentions
-					&& frappe.boot.user_info[user].user_type === 'System User';
-			})
-			.map(user => {
-				return {
-					id: frappe.boot.user_info[user].name,
-					value: frappe.boot.user_info[user].fullname,
-				};
-			});
-
-		frappe.boot.user_groups && frappe.boot.user_groups.map(group => {
-			names_for_mentions.push({
-				id: group,
-				value: group,
-				is_group: true,
-				link: frappe.utils.get_form_link('User Group', group)
-			});
-		});
-
-		return names_for_mentions;
-	},
 	print(doctype, docname, print_format, letterhead, lang_code) {
 		let w = window.open(
 			frappe.urllib.get_full_url(

frappe/public/scss/common/quill.scss

@@ -105,6 +105,7 @@
 	padding: 10px 12px;
 	height: initial;
 	line-height: initial;
+	cursor: pointer;
 
 	&.selected {
 		background-color: var(--control-bg);
@@ -196,5 +197,8 @@
 }
 
 .mention[data-is-group="true"] {
-	background-color: var(--group-mention-bg-color);
+	.icon {
+		margin-top: -2px;
+		margin-left: 4px;
+	}
 }