Add type prefix to duplicate user check for azure ad matrix (#473)

Author: timja

src/main/resources/com/microsoft/jenkins/azuread/AzureAdMatrixAuthorizationStrategy/config.jelly

@@ -191,13 +191,13 @@ THE SOFTWARE.
                      data-table-id="${id}"
                      data-type="USER"
                      data-type-label="${%user}"
-                     data-message-error="${%userError}"
+                     data-message-user-error="${%userError}"
               >${%Add user}</button>
               <button type="button" class="jenkins-button azure-ad-add-button" id="${id}GroupButton"
                      data-table-id="${id}"
                      data-type="GROUP"
                      data-type-label="${%group}"
-                     data-message-error="${%groupError}"
+                     data-message-group-error="${%groupError}"
               >${%Add group}</button>
             </div>
           </j:when>
@@ -209,7 +209,8 @@ THE SOFTWARE.
               <button type="button" class="jenkins-button azure-ad-add-button" id="${id}button"
                      data-table-id="${id}"
                      data-message-empty="${%empty}"
-                     data-message-error="${%error}"
+                     data-message-user-error="${%userError}"
+                     data-message-group-error="${%groupError}"
                      data-type-user-label="${%user}"
                      data-type-group-label="${%user}"
               >${%Add}</button>

src/main/resources/com/microsoft/jenkins/azuread/Messages.properties

@@ -14,7 +14,7 @@ AzureAdLogoutAction_DisplayName=Logged out
 
 GlobalMatrixAuthorizationStrategy.PermissionImpliedBy=This permission is implied by {0}/{1}.
 GlobalMatrixAuthorizationStrategy.PermissionNotImpliedBy=This permission is <strong>not</strong> implied by Overall/Administer. It needs to be explicitly granted even to administrators.
-GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-based security
+GlobalMatrixAuthorizationStrategy.DisplayName=Old AzureAD Matrix-based security (do not use)
 
 AuthorizationMatrixNodeProperty_DisplayName=Enable node-based security
 

src/main/resources/com/microsoft/jenkins/azuread/table.js

@@ -44,8 +44,10 @@ Behaviour.specify(".azure-ad-add-button", 'AzureAdMatrixAuthorizationStrategy',
                 type = dataReference.getAttribute('data-type')
             }
 
-            if(findElementsBySelector(table,"TR").find(function(n){return n.getAttribute("name")=='['+name+']';})!=null) {
-                alert(dataReference.getAttribute('data-message-error') + ": " + name);
+            if (findElementsBySelector(table, "TR").find(function (n) {
+                return n.getAttribute("name") === '[' + type + ':' + name + ']';
+            }) != null) {
+                alert(dataReference.getAttribute(`data-message-${type.toLowerCase()}-error`) + ": " + name);
                 return;
             }