From 90dae04fb73122368d2ff5a285f54907ee3bba56 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Mon, 29 Aug 2022 15:20:33 +1200
Subject: [PATCH] Disallow multiple entries for the same role

---
 app/views/console/comps/permissions-matrix.phtml | 2 +-
 public/scripts/permissions-matrix.js             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/console/comps/permissions-matrix.phtml b/app/views/console/comps/permissions-matrix.phtml
index 4776e17a71..9703e269c2 100644
--- a/app/views/console/comps/permissions-matrix.phtml
+++ b/app/views/console/comps/permissions-matrix.phtml
@@ -91,7 +91,7 @@ $escapedPermissions = \array_map(function ($perm) {
 
                 <input
                     required
-                    id="<?php echo $form; ?>"
+                    id="<?php echo $form; ?>Input"
                     name="<?php echo $form; ?>"
                     form="<?php echo $form ?>"
                     list="types"
diff --git a/public/scripts/permissions-matrix.js b/public/scripts/permissions-matrix.js
index c4cf58cd3d..1e47f8d4d1 100644
--- a/public/scripts/permissions-matrix.js
+++ b/public/scripts/permissions-matrix.js
@@ -34,6 +34,10 @@
                 });
             },
             addPermission(formId, role, permissions) {
+                if (this.permissions.some(p => p.role === role)) {
+                    document.getElementById(`${formId}Input`)
+                        .setCustomValidity('Role entry already exists');
+                }
                 if (!document.getElementById(formId).reportValidity()) {
                     return;
                 }