@sumaris-net/ngx-components 1.19.6-rc1 → 1.19.6

package/fesm2015/sumaris-net.ngx-components.js

@@ -251,7 +251,7 @@ function suggestFromArray(items, value, opts) {
     if (isNotNilOrBlank(value)) {
         // If wildcard, search using regexp
         if (value.indexOf('*') !== -1) {
-            value = value.replace('*', '.*');
+            value = value.replace(/[*]+/g, '.*');
             filteredItems = filteredItems.filter(v => keys.findIndex(key => matchUpperCase(getPropertyByPathAsString(v, key), value)) !== -1);
         }
         // Else (no wildcard), search using startsWith
@@ -1368,14 +1368,14 @@ class MatAutocompleteField {
         // Wait a debounce time
         debounceTime(this.debounceTime)
         // DEBUG
-        , tap((value) => this.debug && console.debug(this.logPrefix + ' Search text changes:', value))), 
+        //,tap((value) => this.debug && console.debug(this.logPrefix + ' Search text changes:', value))
+        ), 
         // Object set: use it (no distinctUntilChanged() pipe need)
         this.formControl.valueChanges
             .pipe(startWith(this.formControl.value), filter(value => (isNotNil(value) && typeof value === 'object')), tap(value => {
-            var _a;
             // DEBUG
-            if (this.debug)
-                console.debug(this.logPrefix + ' control object changes:', value);
+            //if (this.debug) console.debug(this.logPrefix + ' control object changes:', value);
+            var _a;
             // Update the display value (if need)
             const displayValue = this.displayWith(value) || '';
             if (this.displayValue !== displayValue) {
@@ -1391,20 +1391,23 @@ class MatAutocompleteField {
         // when formControl value changes
         filter(() => !this.multiple || this.loading), map(value => this.showAllOnFocus && this.suggestLengthThreshold <= 0 ? '*' : value)
         // DEBUG
-        , tap(value => this.debug && console.debug(this.logPrefix + ' Received an control object value: ', value))), 
+        //,tap(value => this.debug && console.debug(this.logPrefix + ' Received an control object value: ', value))
+        ), 
         // Merge some observables, with a common distinctUntilChanged() pipe
         merge(
         // On dropdown button click (no debounceTime)
         this.dropButtonClick
             .pipe(filter(event => (!event || !event.defaultPrevented))), 
         // Focus or click => Load all (no debounceTime)
-        merge(this.focused, this.clicked)
-            // DEBUG
-            .pipe(tap(_ => this.debug && console.debug(this.logPrefix + ' Received focused or clicked event'))), 
+        merge(this.focused, this.clicked), 
+        // DEBUG
+        //.pipe(tap(_ => this.debug && console.debug(this.logPrefix + ' Received focused or clicked event'))),
         // Input items or filter changes
         merge(this.$inputItems, this._$filter)
             // DEBUG
-            .pipe(filter(_ => !this.loading), tap(_ => this.debug && console.debug(this.logPrefix + ' Received $inputItems or filter event'))))
+            .pipe(filter(_ => !this.loading)
+        //,tap(_ => this.debug && console.debug(this.logPrefix + ' Received $inputItems or filter event'))
+        ))
             .pipe(filter(_ => this.enabled), map(_ => this.showAllOnFocus ? '*' : this.formControl.value), 
         // Distinguish changes
         distinctUntilChanged((v1, v2) => 
@@ -1413,12 +1416,13 @@ class MatAutocompleteField {
         // Make sure there is enough characters
         filter(thresholdFilterFn)
         // DEBUG
-        , tap(value => this.debug && console.debug(this.logPrefix + ' Received update event from observables: ', value))))
+        //,tap(value => this.debug && console.debug(this.logPrefix + ' Received update event from observables: ', value))
+        ))
             .pipe(
         // Suggest values
         mergeMap(value => this.suggest(value, this.filter)), 
         // DEBUG
-        tap(items => this.debug && console.debug(this.logPrefix + ' Received from suggest: ', items)), 
+        //tap(items => this.debug && console.debug(this.logPrefix + ' Received from suggest: ', items)),
         // Store implicit value (will use it onBlur if not other value selected)
         tap(items => !this.multiple && !this.mobile && this.updateImplicitValue(items)));
         // Fetch more events
@@ -1426,7 +1430,7 @@ class MatAutocompleteField {
             .pipe(tap(event => event === null || event === void 0 ? void 0 : event.preventDefault()), // Avoid to close the mat-select
         filter(() => this.canFetchMore), mergeMap(() => this.fetchMore()), 
         // DEBUG
-        tap(moreItems => console.debug(this.logPrefix + ' Received from fetch More: ', moreItems)), 
+        //tap(moreItems => console.debug(this.logPrefix + ' Received from fetch More: ', moreItems)),
         // Concat to existing items
         map(moreItems => (this.$filteredItems.value || []).concat(moreItems)));
         // Update filtered items
@@ -1456,9 +1460,10 @@ class MatAutocompleteField {
         this._subscription.add(this.blurred
             .pipe(
         // Skip if multiple (no implicit value) or disable
-        filter(_ => !this.multiple && !this.mobile && this.enabled)
+        filter(_ => !this.multiple && !this.mobile && this.enabled), 
         // DEBUG
-        , tap(_ => this.debug && console.debug(this.logPrefix + ' Received blurred event')), map(_ => this.formControl.value))
+        //,tap(_ => this.debug && console.debug(this.logPrefix + ' Received blurred event')),
+        map(_ => this.formControl.value))
             .subscribe(value => {
             // When leave component without object, use implicit value if :
             // - an explicit value
@@ -1492,7 +1497,7 @@ class MatAutocompleteField {
                 event === null || event === void 0 ? void 0 : event.stopPropagation();
                 event === null || event === void 0 ? void 0 : event.preventDefault();
                 // DEBUG
-                console.debug(this.logPrefix + " Closing the panel (keydown.escape)");
+                //console.debug(this.logPrefix + " Closing the panel (keydown.escape)");
                 this.closePanel();
             }
         }));
@@ -1539,8 +1544,7 @@ class MatAutocompleteField {
      */
     reloadItems(value) {
         // DEBUG
-        if (this.debug)
-            console.debug(this.logPrefix + " Asking to reloadItems()");
+        //if (this.debug) console.debug(this.logPrefix + " Asking to reloadItems()");
         // Force a refresh
         this._reload$.next(value || (this.showAllOnFocus && this.suggestLengthThreshold <= 0 ? '*' : this.formControl.value));
         // Clear the search bar (if hidden)
@@ -1743,7 +1747,7 @@ class MatAutocompleteField {
             // Call suggestion function
             let res = yield this.suggestFn(value, filter);
             // DEBUG
-            console.debug(this.logPrefix + ' Filtered items by suggestFn:', value, res);
+            //if (this.debug) console.debug(this.logPrefix + ' Filtered items by suggestFn:', value, res);
             if (!res) {
                 this._itemCount = 0;
                 this._onFetchMoreCallback = undefined;
@@ -11870,11 +11874,10 @@ class EntityStore {
     /**
      *
      * @param opts
-     *  opts.force : force all entities to be persist, and not only if dirty
+     *  opts.skipIfPristine = false persist all entities, even if not dirty
      */
-    persist(opts) {
+    persist(opts = { skipIfPristine: true }) {
         return __awaiter(this, void 0, void 0, function* () {
-            opts = Object.assign({ skipIfPristine: this.policy.skipNonLocalEntities }, opts);
             // Skip is not dirty
             if (opts.skipIfPristine && !this._dirty) {
                 console.debug(`[entity-storage] Persisting ${this.name} not need. Skip`);
@@ -12422,11 +12425,11 @@ class EntitiesStorage extends StartableService {
             this._$save.emit();
         });
     }
-    persist() {
-        if (this._dirty) {
-            return this.storeLocally();
-        }
-        return Promise.resolve();
+    persist(opts = { skipIfPristine: true }) {
+        // Skip if pristine
+        if (opts.skipIfPristine && !this._dirty)
+            return Promise.resolve();
+        return this.storeLocally(opts);
     }
     ngOnStart() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -12488,9 +12491,9 @@ class EntitiesStorage extends StartableService {
                 console.debug(`[entities-storage] Restoring entities [OK] ${entitiesCount} entities found in ${Date.now() - now}ms`);
         });
     }
-    storeLocally() {
+    storeLocally(opts = { skipIfPristine: true }) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.dirty)
+            if (opts.skipIfPristine && !this.dirty)
                 return; // skip
             // Saving progress: report this save later
             if (this._saving) {
@@ -12514,11 +12517,11 @@ class EntitiesStorage extends StartableService {
                     console.warn(`[entities-storage] Persisting ${entityName}: store not found!`);
                     return;
                 }
-                // SKip store if not dirty
-                if (!entityStore.dirty)
-                    return Promise.resolve(); // Skip
+                // SKip store if pristine
+                if (opts.skipIfPristine && !entityStore.dirty)
+                    return Promise.resolve();
                 // Persist store
-                return (entityStore.dirty ? entityStore.persist() : Promise.resolve(entityStore.length))
+                return entityStore.persist(opts)
                     .then(count => {
                     // If no entity found, remove from the entity names array
                     if (!count) {