@sumaris-net/ngx-components 0.24.1 → 0.24.2

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

@@ -607,16 +607,15 @@
             // Stop if not equals, otherwise continue with the next key
             .find(function (res) { return res !== 0; }) || 0; };
     }
-    function sort(array, attribute) {
+    function sort(array, attribute, opts) {
         if (isEmptyArray(array))
             return array;
+        var compareFn = opts
+            ? new Intl.Collator(undefined, opts).compare
+            : function (v1, v2) { return v1 === v2 ? 0 : v1 > v2 ? 1 : -1; };
         return array
             .slice() // copy
-            .sort(function (a, b) {
-            var valueA = a[attribute];
-            var valueB = b[attribute];
-            return valueA === valueB ? 0 : (valueA > valueB ? 1 : -1);
-        });
+            .sort(function (a, b) { return compareFn(a[attribute], b[attribute]); });
     }
     var INTEGER_REGEXP = /^[-]?\d+$/;
     function isInt(value) {
@@ -21399,7 +21398,6 @@
                 var url = config.getProperty(CORE_CONFIG_OPTIONS.ANDROID_INSTALL_URL);
                 if (isNilOrBlank(url))
                     url = this.environment.defaultAndroidInstallUrl || null;
-                var minVersion = config.getProperty(CORE_CONFIG_OPTIONS.APP_MIN_VERSION);
                 // Compute App name
                 var name = isNotNilOrBlank(url) && config.label || this.environment.defaultAppName || 'SUMARiS';
                 if (url) {
@@ -21408,7 +21406,7 @@
                     var mimeType = void 0;
                     // Get file name
                     var filename = this.getFilename(url);
-                    version = minVersion || 'latest';
+                    version = config.getProperty(CORE_CONFIG_OPTIONS.APP_MIN_VERSION);
                     // OK, this is a downloadable APK file (e.g. NOT a link to a playstore)
                     if (filename === null || filename === void 0 ? void 0 : filename.endsWith('.apk')) {
                         // Define mime type
@@ -21418,12 +21416,13 @@
                         version = versionMatches && versionMatches[1] || version;
                         // Compute a new file name, with the version
                         if (isNotNilOrBlank(name)) {
-                            downloadFilename = (name + "-v" + version + ".apk").toLowerCase();
+                            downloadFilename = name + "-" + version + ".apk";
                         }
                         else {
                             downloadFilename = filename;
-                            // Replace 'latest' with the app version, if present
+                            // Replace 'latest' with the app min version
                             if (downloadFilename.indexOf('latest')) {
+                                version = config.getProperty(CORE_CONFIG_OPTIONS.APP_MIN_VERSION);
                                 downloadFilename = downloadFilename.replace('latest', version);
                             }
                         }
@@ -26905,6 +26904,7 @@
             this.userProfiles = source.userProfiles;
             this.excludedIds = source.excludedIds;
             this.searchAttribute = source.searchAttribute;
+            this.searchAttributes = source.searchAttributes;
         };
         PersonFilter.prototype.asObject = function (opts) {
             var target = _super.prototype.asObject.call(this, opts);
@@ -26915,6 +26915,7 @@
             target.userProfiles = this.userProfiles;
             target.excludedIds = this.excludedIds;
             target.searchAttribute = this.searchAttribute;
+            target.searchAttributes = this.searchAttributes;
             return target;
         };
         PersonFilter.prototype.buildFilter = function () {
@@ -26929,7 +26930,7 @@
                 filterFns.push(function (e) { return isNil(e.id) || !_this.excludedIds.includes(e.id); });
             }
             // Search text
-            var searchTextFilter = EntityUtils.searchTextFilter(this.searchAttribute || ['lastName', 'firstName', 'department.name'], this.searchText);
+            var searchTextFilter = EntityUtils.searchTextFilter(this.searchAttribute || this.searchAttributes || ['lastName', 'firstName', 'department.name'], this.searchText);
             if (searchTextFilter)
                 filterFns.push(searchTextFilter);
             return filterFns;
@@ -27018,7 +27019,8 @@
                     if (ReferentialUtils.isNotEmpty(value))
                         return [2 /*return*/, { data: [value] }];
                     value = (typeof value === 'string' && value !== '*') && value || undefined;
-                    return [2 /*return*/, this.loadAll(0, !value ? 30 : 10, sortBy || (filter === null || filter === void 0 ? void 0 : filter.searchAttribute), sortDirection, Object.assign(Object.assign({}, filter), { searchText: value, statusIds: filter && filter.statusIds || [StatusIds.ENABLE], userProfiles: filter && filter.userProfiles }), { withTotal: true /* need by autocomplete */ })];
+                    sortBy = sortBy || filter.searchAttribute || (filter.searchAttributes && filter.searchAttributes[0]);
+                    return [2 /*return*/, this.loadAll(0, !value ? 30 : 10, sortBy, sortDirection, Object.assign(Object.assign({}, filter), { searchText: value, statusIds: filter && filter.statusIds || [StatusIds.ENABLE], userProfiles: filter && filter.userProfiles }), { withTotal: true /* need by autocomplete */ })];
                 });
             });
         };