@sumaris-net/ngx-components 1.23.27 → 1.23.28

package/bundles/sumaris-net.ngx-components.umd.js

@@ -424,16 +424,21 @@
             return rv;
         }, {});
     }
-    function arrayDistinct(values, keyOrProperty) {
+    /**
+     * Remove duplicated value, in array. Will compute a unique key (from given properties, or given function)
+     * @param values
+     * @param propertiesOrKeyFn
+     */
+    function arrayDistinct(values, propertiesOrKeyFn) {
         if (isEmptyArray(values))
             return values;
-        var properties = Array.isArray(keyOrProperty) ? keyOrProperty : (!keyOrProperty && Object.keys(values[0]));
-        var computeKeyFn = typeof keyOrProperty === 'function' ? keyOrProperty :
-            (typeof keyOrProperty === 'string' ? (function (obj) { return getPropertyByPathAsString(obj, keyOrProperty); })
-                : (function (obj) { return joinPropertiesPath(obj, properties, '|'); }));
+        var properties = (!propertiesOrKeyFn && Object.keys(values[0])) || (Array.isArray(propertiesOrKeyFn) && propertiesOrKeyFn);
+        var getKey = (typeof propertiesOrKeyFn === 'function' && propertiesOrKeyFn)
+            || (typeof propertiesOrKeyFn === 'string' && (function (obj) { return getPropertyByPathAsString(obj, propertiesOrKeyFn); }))
+            || (function (obj) { return joinPropertiesPath(obj, properties, '|'); });
         var existingIds = new Set();
         return values.reduce(function (res, item) {
-            var uniqueKey = computeKeyFn(item);
+            var uniqueKey = getKey(item);
             if (existingIds.has(uniqueKey))
                 return res; // Skip if duplicate
             existingIds.add(uniqueKey);