From 12c8b1c2bc1d4ad0cfac5e20c4746f1204efd5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 8 Oct 2020 18:32:36 -0400
Subject: [PATCH] fix: dont allow adding duplicates to privileges page

hightlight uid/group if it is added again from autocomplete
---
 public/less/admin/manage/privileges.less |  2 +-
 public/src/admin/manage/privileges.js    | 82 +++++++++++++++---------
 2 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/public/less/admin/manage/privileges.less b/public/less/admin/manage/privileges.less
index e7ed543eea..c8cdd821b7 100644
--- a/public/less/admin/manage/privileges.less
+++ b/public/less/admin/manage/privileges.less
@@ -4,7 +4,7 @@
 		100% {background-color: white;}
 	}
 
-	[data-group-name].selected {
+	[data-group-name].selected, [data-uid].selected {
 		animation-name: fadeOut;
 		animation-duration: 5s;
 		animation-fill-mode: both;
diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js
index 69ad97cfe5..8da84e9eab 100644
--- a/public/src/admin/manage/privileges.js
+++ b/public/src/admin/manage/privileges.js
@@ -147,7 +147,7 @@ define('admin/manage/privileges', [
 					$('.privilege-table-container').html(html);
 					Privileges.exposeAssumedPrivileges();
 
-					hightlightRowByGroupName(groupToHighlight);
+					hightlightRowByDataAttr('data-group-name', groupToHighlight);
 				});
 			});
 		});
@@ -215,29 +215,7 @@ define('admin/manage/privileges', [
 			inputEl.focus();
 
 			autocomplete.user(inputEl, function (ev, ui) {
-				// Generate data for new row
-				var privilegeSet = ajaxify.data.privileges.keys.users.reduce(function (memo, cur) {
-					memo[cur] = false;
-					return memo;
-				}, {});
-
-				app.parseAndTranslate('admin/partials/privileges/' + (isNaN(cid) ? 'global' : 'category'), 'privileges.users', {
-					privileges: {
-						users: [
-							{
-								picture: ui.item.user.picture,
-								username: ui.item.user.username,
-								uid: ui.item.user.uid,
-								'icon:text': ui.item.user['icon:text'],
-								'icon:bgColor': ui.item.user['icon:bgColor'],
-								privileges: privilegeSet,
-							},
-						],
-					},
-				}, function (html) {
-					var tableEl = document.querySelectorAll('.privilege-table');
-					var rows = tableEl[1].querySelectorAll('tbody tr');
-					html.insertBefore(rows[rows.length - 1]);
+				addUserToCategory(ui.item.user, function () {
 					modal.modal('hide');
 				});
 			});
@@ -298,11 +276,12 @@ define('admin/manage/privileges', [
 		});
 	};
 
-	function hightlightRowByGroupName(groupName) {
-		if (groupName) {
-			var el = $('[data-group-name]').filter(function () {
-				return $(this).attr('data-group-name') === groupName;
+	function hightlightRowByDataAttr(attrName, attrValue) {
+		if (attrValue) {
+			var el = $('[' + attrName + ']').filter(function () {
+				return $(this).attr(attrName) === String(attrValue);
 			});
+
 			if (el.length) {
 				el.addClass('selected');
 				return true;
@@ -313,7 +292,7 @@ define('admin/manage/privileges', [
 
 	function highlightRow() {
 		if (ajaxify.data.group) {
-			if (hightlightRowByGroupName(ajaxify.data.group)) {
+			if (hightlightRowByDataAttr('data-group-name', ajaxify.data.group)) {
 				return;
 			}
 			addGroupToCategory(ajaxify.data.group);
@@ -321,6 +300,12 @@ define('admin/manage/privileges', [
 	}
 
 	function addGroupToCategory(group, cb) {
+		cb = cb || function () {};
+		var groupRow = document.querySelector('.privilege-table [data-group-name="' + group + '"]');
+		if (groupRow) {
+			hightlightRowByDataAttr('data-group-name', group);
+			return cb();
+		}
 		// Generate data for new row
 		var privilegeSet = ajaxify.data.privileges.keys.groups.reduce(function (memo, cur) {
 			memo[cur] = false;
@@ -342,10 +327,43 @@ define('admin/manage/privileges', [
 			var rows = tableEl.querySelectorAll('tbody tr');
 			html.insertBefore(rows[rows.length - 1]);
 			Privileges.exposeAssumedPrivileges();
+			hightlightRowByDataAttr('data-group-name', group);
+			cb();
+		});
+	}
 
-			if (typeof cb === 'function') {
-				cb();
-			}
+	function addUserToCategory(user, cb) {
+		cb = cb || function () {};
+		var userRow = document.querySelector('.privilege-table [data-uid="' + user.uid + '"]');
+		if (userRow) {
+			hightlightRowByDataAttr('data-uid', user.uid);
+			return cb();
+		}
+		// Generate data for new row
+		var privilegeSet = ajaxify.data.privileges.keys.users.reduce(function (memo, cur) {
+			memo[cur] = false;
+			return memo;
+		}, {});
+
+		app.parseAndTranslate('admin/partials/privileges/' + (isNaN(cid) ? 'global' : 'category'), 'privileges.users', {
+			privileges: {
+				users: [
+					{
+						picture: user.picture,
+						username: user.username,
+						uid: user.uid,
+						'icon:text': user['icon:text'],
+						'icon:bgColor': user['icon:bgColor'],
+						privileges: privilegeSet,
+					},
+				],
+			},
+		}, function (html) {
+			var tableEl = document.querySelectorAll('.privilege-table');
+			var rows = tableEl[1].querySelectorAll('tbody tr');
+			html.insertBefore(rows[rows.length - 1]);
+			hightlightRowByDataAttr('data-uid', user.uid);
+			cb();
 		});
 	}