@sumaris-net/ngx-components 2.6.4-rc11 → 2.6.4-rc13

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -23007,6 +23007,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
 
 let NamedFilter = class NamedFilter extends Entity {
     fromObject(source, opts) {
+        super.fromObject(source, opts);
         this.name = source.name;
         this.entityName = source.entityName;
         this.recorderPersonId = source.recorderPersonId;
@@ -23015,17 +23016,10 @@ let NamedFilter = class NamedFilter extends Entity {
             this.content = typeof source?.content === 'string' ? JSON.parse(source?.content) : source?.content || undefined;
         }
         catch (e) {
-            console.error('[named-filter] can\'t parse content json', source);
+            console.error(`[named-filter] can't parse content json`, source);
             throw e;
         }
     }
-    asObject(opts) {
-        const target = super.asObject(opts);
-        if (opts?.minify) {
-            target.content = JSON.stringify(this.content);
-        }
-        return target;
-    }
 };
 NamedFilter = __decorate([
     EntityClass({ typename: 'NamedFilterVO' })
@@ -23066,40 +23060,15 @@ class AbstractNamedFilterService extends BaseEntityService {
         this.options = options;
         this._logPrefix = '[named-filter-service] ';
     }
-    watchAll(offset, size, sortBy, sortDirection, filter, options) {
-        // Always ask total
-        options = {
-            ...options,
-            withTotal: true
-        };
-        // Set query if content is wanted
-        if (options?.withContent) {
-            options.query = this.queries.loadAllWithContent;
-        }
-        return super.watchAll(offset, size, sortBy, sortDirection, filter, options);
-    }
-    async loadAll(offset, size, sortBy, sortDirection, filter, options) {
-        // Always ask total
-        options = {
-            ...options,
-            withTotal: true
-        };
-        // Set query if content is wanted
-        if (options?.withContent) {
-            options.query = this.queries.loadAllWithContent;
-        }
-        return super.loadAll(offset, size, sortBy, sortDirection, filter, options);
-    }
     async suggest(value, filter) {
         if (EntityUtils.isNotEmpty(value, 'id'))
             return { data: [value] };
         value = (typeof value === 'string' && value !== '*' && value) || undefined;
-        return await this.loadAll(0, 1000, 'name', 'asc', this.suggestFilter(value, filter), {
+        return await this.loadAll(0, 1000, 'name', 'asc', this.asSuggestFilter(value, filter), {
             withTotal: true,
-            withContent: false
         });
     }
-    suggestFilter(searchText, filter) {
+    asSuggestFilter(searchText, filter) {
         return {
             ...filter,
             searchText
@@ -23107,10 +23076,21 @@ class AbstractNamedFilterService extends BaseEntityService {
     }
     asFilter(source) {
         const filter = super.asFilter(source);
-        if (isNil(filter.recorderPersonId))
+        // Default filter on current user
+        if (isNil(filter.recorderPersonId) && isNil(filter.recorderDepartmentId))
             filter.recorderPersonId = this.account.person.id;
         return filter;
     }
+    fillDefaultProperties(source) {
+        super.fillDefaultProperties(source);
+        // Default recorder
+        if (isNil(source.recorderPersonId) && isNil(source.recorderDepartmentId))
+            source.recorderPersonId = this.account.person.id;
+        // Stringify content
+        if (typeof source.content === 'object') {
+            source.content = JSON.stringify(source.content);
+        }
+    }
 }
 AbstractNamedFilterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: AbstractNamedFilterService, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
 AbstractNamedFilterService.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.3.0", type: AbstractNamedFilterService, usesInheritance: true, ngImport: i0 });