Display duplicate Admin elements in error message

Author: Pieter Cappelle

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -128,7 +128,7 @@ private function isUniqueAdminValues(array $optionsValues, array $deletedOptions
             }
         }
         $uniqueValues = array_unique($adminValues);
-        return ($uniqueValues === $adminValues);
+        return array_diff_assoc($adminValues, $uniqueValues);
     }
 
     /**
@@ -157,10 +157,16 @@ private function checkUniqueOption(DataObject $response, array $options = null)
         if (is_array($options)
             && !empty($options['value'])
             && !empty($options['delete'])
-            && !$this->isUniqueAdminValues($options['value'], $options['delete'])
         ) {
-            $this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);
-            $response->setError(true);
+            $duplicates = $this->isUniqueAdminValues($options['value'], $options['delete']);
+            if ($duplicates) {
+                $this->setMessageToResponse(
+                    $response,
+                    [__('The value of Admin must be unique. (%1)', implode(', ', $duplicates))]
+                );
+
+                $response->setError(true);
+            }
         }
         return $this;
     }

app/code/Magento/Catalog/i18n/en_US.csv

@@ -716,4 +716,4 @@ Disable,Disable
 none,none
 Overview,Overview
 Details,Details
-"The value of Admin must be unique.", "The value of Admin must be unique."
+"The value of Admin must be unique. (%1)", "The value of Admin must be unique. (%1)"

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -101,7 +101,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 },
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-dropdown-attribute-unique",
-                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
+                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique. (%1)")) ?>"
                 }
             }
         }

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/attribute/unique-validate.js

@@ -17,6 +17,12 @@ define([
         }, config);
 
         if (typeof _config.element === 'string') {
+            var msg = '';
+
+            var messager = function() {
+                return msg;
+            };
+
             jQuery.validator.addMethod(
                 _config.element,
 
@@ -25,21 +31,27 @@ define([
                             .closest('table')
                             .find('.' + _config.uniqueClass + ':visible'),
                         valuesHash = {},
-                        isValid = true;
+                        isValid = true,
+                        duplicates = [];
 
                     inputs.each(function (el) {
                         var inputValue = inputs[el].value;
 
                         if (typeof valuesHash[inputValue] !== 'undefined') {
                             isValid = false;
+                            duplicates.push(inputValue);
                         }
                         valuesHash[inputValue] = el;
                     });
 
+                    if (!isValid) {
+                        msg = _config.message.replace('%1', duplicates.join(', '));
+                    }
+
                     return isValid;
                 },
 
-                _config.message
+                messager
             );
         }
     };

app/code/Magento/Swatches/i18n/en_US.csv

@@ -33,5 +33,5 @@ Image,Image
 "Image Size","Image Size"
 "Example format: 200x300.","Example format: 200x300."
 "Image Position","Image Position"
-"The value of Admin must be unique.","The value of Admin must be unique."
+"The value of Admin must be unique. (%1)","The value of Admin must be unique. (%1)"
 Description,Description

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml

@@ -108,7 +108,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 "Magento_Swatches/js/text": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?> ,
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-text-swatch-unique",
-                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
+                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique. (%1)")) ?>"
                 }
             }
         }

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml

@@ -113,7 +113,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 "Magento_Swatches/js/visual": <?= /* @noEscape */ $block->getJsonConfig() ?> ,
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-visual-swatch-unique",
-                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
+                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique. (%1)")) ?>"
                 }
             }
         }