@solidev/data 0.0.1-dev.0 → 0.0.1-dev.1

package/fesm2020/solidev-data.mjs

@@ -3,7 +3,7 @@ import { InjectionToken, PLATFORM_ID, Injectable, Inject, Optional, Component, I
 import 'reflect-metadata';
 import * as i3$1 from '@angular/forms';
 import { FormControl, Validators, FormGroup, UntypedFormControl, ReactiveFormsModule, NG_VALUE_ACCESSOR, UntypedFormGroup } from '@angular/forms';
-import { throwError, ReplaySubject, combineLatest, of, takeUntil, debounceTime, Subject, distinctUntilChanged, timer, firstValueFrom, Observable, BehaviorSubject } from 'rxjs';
+import { throwError, ReplaySubject, combineLatest, share, of, takeUntil, NEVER, debounceTime, Subject, distinctUntilChanged, timer, firstValueFrom, Observable, BehaviorSubject } from 'rxjs';
 import { tap, switchMap, map, mergeMap, finalize, catchError, filter, take } from 'rxjs/operators';
 import * as i2 from '@angular/platform-browser';
 import { makeStateKey } from '@angular/platform-browser';
@@ -520,7 +520,10 @@ class Queryset {
     }
     /** Full results observable (results, loading, meta) */
     get full() {
-        return combineLatest([this.results, this.loading, this.meta]);
+        if (!this._full) {
+            this._full = combineLatest([this.results, this.loading, this.meta]);
+        }
+        return this._full.pipe(share());
     }
     /**
      * Update current filter data. Null or undefined values are removed from filter data.
@@ -597,6 +600,7 @@ class Queryset {
         return f;
     }
     get(refresh = true) {
+        console.log('queryset:get', this, refresh);
         if (!refresh && !this._pristine) {
             return this.results;
         }
@@ -1296,16 +1300,36 @@ class ModelList {
         this.name = name;
     }
     get results() {
-        return this.queryset.results;
+        if (!this._results) {
+            this._results = this.queryset.results.pipe(
+            // tap(() => console.log('RESULTS')),
+            share(), takeUntil(this.unsubscribe || NEVER));
+        }
+        return this._results;
     }
     get meta() {
-        return this.queryset.meta;
+        if (!this._meta) {
+            this._meta = this.queryset.meta.pipe(
+            // tap(() => console.log('META')),
+            share(), takeUntil(this.unsubscribe || NEVER));
+        }
+        return this._meta;
     }
     get loading() {
-        return this.queryset.loading;
+        if (!this._loading) {
+            this._loading = this.queryset.loading.pipe(
+            // tap(() => console.log('LOADING')),
+            share(), takeUntil(this.unsubscribe || NEVER));
+        }
+        return this._loading;
     }
     get full() {
-        return this.queryset.full;
+        if (!this._full) {
+            this._full = this.queryset.full.pipe(
+            // tap(() => console.log('FULL')),
+            share(), takeUntil(this.unsubscribe || NEVER));
+        }
+        return this._full;
     }
     start(params) {
         let filter$;
@@ -1326,7 +1350,7 @@ class ModelList {
             this.sorter.output,
             this.fields.output,
         ])
-            .pipe(takeUntil(this.unsubscribe), debounceTime(200), switchMap(([reload, filter, manualFilter, paginator, sorter, fields]) => {
+            .pipe(debounceTime(200), switchMap(([reload, filter, manualFilter, paginator, sorter, fields]) => {
             this.queryset
                 .filter(filter)
                 .filter(manualFilter || {}, true)
@@ -1335,14 +1359,14 @@ class ModelList {
                 .sort(...sorter)
                 .setFields(fields);
             return this.queryset.get(true);
-        }))
+        }), takeUntil(this.unsubscribe || NEVER))
             .subscribe({
             next: (results) => { },
             error: (error) => {
                 console.error('Error while getting model list results : ', error);
             },
             complete: () => {
-                console.log('modellist:completed', this.name);
+                // console.log('modellist:completed', this.name);
                 this.started = false;
             },
         });
@@ -1352,11 +1376,11 @@ class ModelList {
 }
 class ModelListService {
     constructor() {
-        this._instances = {};
+        this._instances = new Map();
     }
     get(name, collection, defaults) {
         let ml;
-        if (!name || !this._instances[name] || !defaults.keep) {
+        if (!name || !this._instances.has(name) || !defaults.keep) {
             ml = new ModelList(name);
             ml.queryset = collection.queryset();
             ml.fields = new ModelListFields(collection, defaults.fields);
@@ -1364,11 +1388,11 @@ class ModelListService {
             ml.paginator = new ModelListPaginator(defaults.paginator);
             ml.filters = new ModelListFilters(defaults.filters);
             if (defaults.keep) {
-                this._instances[name] = ml;
+                this._instances.set(name, ml);
             }
         }
         else {
-            ml = this._instances[name];
+            ml = this._instances.get(name);
         }
         if (!ml.started) {
             if (defaults.reload) {
@@ -3317,6 +3341,7 @@ class SafeDeleteComponent {
         this._ofc = _ofc;
         this.checks = {};
         this.deleted = new EventEmitter();
+        this.display = 'button';
     }
     async checkDelete(model) {
         this.result = await firstValueFrom(this.service.delete(this.model, { params: { doit: 'no' } }));
@@ -3331,10 +3356,10 @@ class SafeDeleteComponent {
     }
 }
 SafeDeleteComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: SafeDeleteComponent, deps: [{ token: i2$1.NgbOffcanvas }], target: i0.ɵɵFactoryTarget.Component });
-SafeDeleteComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.1.0", type: SafeDeleteComponent, isStandalone: true, selector: "data-safe-delete", inputs: { model: "model", service: "service", checks: "checks" }, outputs: { deleted: "deleted" }, viewQueries: [{ propertyName: "_dialogRef", first: true, predicate: ["dialog"], descendants: true, static: true }], ngImport: i0, template: "\n<ng-template #dialog let-offcanvas>\n  <div class=\"offcanvas-header\">\n    <h2 class=\"offcanvas-title text-danger text-center\"><i class=\"bi bi-trash me-2\"></i>Supprimer r\u00E9ellement ??</h2>\n  </div>\n  <div class=\"offcanvas-body text-danger\" *ngIf=\"result\">\n    <div class=\"text-center my-4 fs-1\"><i class=\"bi bi-exclamation-diamond my-5\"></i></div>\n    <div class=\"fs-4\">\n      <p>La suppression de cet \u00E9l\u00E9ment supprimera {{result.count}} \u00E9l\u00E9ments dans la base de donn\u00E9es..</p>\n    </div>\n    <table class=\"table table-sm table-striped table-danger\">\n      <thead>\n        <tr>\n          <th>Type d'\u00E9l\u00E9ment</th>\n          <th>Nombre</th>\n        </tr>\n      </thead>\n      <tbody>\n        <ng-container *ngFor=\"let rl of result.details\">\n          <tr>\n            <td>{{checks[rl[0]] ? checks[rl[0]] : rl[0]}}</td>\n            <td>{{rl[1]}}</td>\n          </tr>\n        </ng-container>\n      </tbody>\n    </table>\n    <button class=\"w-100 btn btn-lg btn-danger\" (click)=\"reallyDelete()\"><i class=\"bi bi-trash me-2\"></i>Je confirme la suppression</button>\n    <button class=\"w-100 btn btn-outline-secondary my-3\" (click)=\"offcanvas.close()\"><i class=\"bi bi-door-open me-2\"></i>Je renonce \u00E0 la suppression</button>\n  </div>\n</ng-template>\n<button class=\"btn btn-sm btn-outline-danger float-end\" (click)=\"checkDelete(model)\"><i class=\"bi bi-trash mx-2\"></i></button>", styles: [""], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: NgbOffcanvasModule }] });
+SafeDeleteComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.1.0", type: SafeDeleteComponent, isStandalone: true, selector: "data-safe-delete", inputs: { model: "model", service: "service", checks: "checks", display: "display" }, outputs: { deleted: "deleted" }, viewQueries: [{ propertyName: "_dialogRef", first: true, predicate: ["dialog"], descendants: true, static: true }], ngImport: i0, template: "\n<ng-template #dialog let-offcanvas>\n  <div class=\"offcanvas-header\">\n    <h2 class=\"offcanvas-title text-danger text-center\"><i class=\"bi bi-trash me-2\"></i>Supprimer r\u00E9ellement ??</h2>\n  </div>\n  <div class=\"offcanvas-body text-danger\" *ngIf=\"result\">\n    <div class=\"text-center my-4 fs-1\"><i class=\"bi bi-exclamation-diamond my-5\"></i></div>\n    <div class=\"fs-4\">\n      <p>La suppression de cet \u00E9l\u00E9ment supprimera {{result.count}} \u00E9l\u00E9ments dans la base de donn\u00E9es..</p>\n    </div>\n    <table class=\"table table-sm table-striped table-danger\">\n      <thead>\n        <tr>\n          <th>Type d'\u00E9l\u00E9ment</th>\n          <th>Nombre</th>\n        </tr>\n      </thead>\n      <tbody>\n        <ng-container *ngFor=\"let rl of result.details\">\n          <tr>\n            <td>{{checks[rl[0]] ? checks[rl[0]] : rl[0]}}</td>\n            <td>{{rl[1]}}</td>\n          </tr>\n        </ng-container>\n      </tbody>\n    </table>\n    <button class=\"w-100 btn btn-lg btn-danger\" (click)=\"reallyDelete()\"><i class=\"bi bi-trash me-2\"></i>Je confirme la suppression</button>\n    <button class=\"w-100 btn btn-outline-secondary my-3\" (click)=\"offcanvas.close()\"><i class=\"bi bi-door-open me-2\"></i>Je renonce \u00E0 la suppression</button>\n  </div>\n</ng-template>\n<button class=\"btn btn-sm btn-outline-danger float-end\" (click)=\"checkDelete(model)\" *ngIf=\"display==='button'\"><i class=\"bi bi-trash mx-2\"></i></button><i class=\"bi bi-trash mx-2\" (click)=\"checkDelete(model)\" *ngIf=\"display==='icon'\" role=\"button\"></i>\n<div (click)=\"checkDelete(model)\" *ngIf=\"display==='custom'\" role=\"button\">\n  <ng-content></ng-content>\n</div>", styles: [""], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: NgbOffcanvasModule }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: SafeDeleteComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'data-safe-delete', standalone: true, imports: [CommonModule, NgbOffcanvasModule], template: "\n<ng-template #dialog let-offcanvas>\n  <div class=\"offcanvas-header\">\n    <h2 class=\"offcanvas-title text-danger text-center\"><i class=\"bi bi-trash me-2\"></i>Supprimer r\u00E9ellement ??</h2>\n  </div>\n  <div class=\"offcanvas-body text-danger\" *ngIf=\"result\">\n    <div class=\"text-center my-4 fs-1\"><i class=\"bi bi-exclamation-diamond my-5\"></i></div>\n    <div class=\"fs-4\">\n      <p>La suppression de cet \u00E9l\u00E9ment supprimera {{result.count}} \u00E9l\u00E9ments dans la base de donn\u00E9es..</p>\n    </div>\n    <table class=\"table table-sm table-striped table-danger\">\n      <thead>\n        <tr>\n          <th>Type d'\u00E9l\u00E9ment</th>\n          <th>Nombre</th>\n        </tr>\n      </thead>\n      <tbody>\n        <ng-container *ngFor=\"let rl of result.details\">\n          <tr>\n            <td>{{checks[rl[0]] ? checks[rl[0]] : rl[0]}}</td>\n            <td>{{rl[1]}}</td>\n          </tr>\n        </ng-container>\n      </tbody>\n    </table>\n    <button class=\"w-100 btn btn-lg btn-danger\" (click)=\"reallyDelete()\"><i class=\"bi bi-trash me-2\"></i>Je confirme la suppression</button>\n    <button class=\"w-100 btn btn-outline-secondary my-3\" (click)=\"offcanvas.close()\"><i class=\"bi bi-door-open me-2\"></i>Je renonce \u00E0 la suppression</button>\n  </div>\n</ng-template>\n<button class=\"btn btn-sm btn-outline-danger float-end\" (click)=\"checkDelete(model)\"><i class=\"bi bi-trash mx-2\"></i></button>" }]
+            args: [{ selector: 'data-safe-delete', standalone: true, imports: [CommonModule, NgbOffcanvasModule], template: "\n<ng-template #dialog let-offcanvas>\n  <div class=\"offcanvas-header\">\n    <h2 class=\"offcanvas-title text-danger text-center\"><i class=\"bi bi-trash me-2\"></i>Supprimer r\u00E9ellement ??</h2>\n  </div>\n  <div class=\"offcanvas-body text-danger\" *ngIf=\"result\">\n    <div class=\"text-center my-4 fs-1\"><i class=\"bi bi-exclamation-diamond my-5\"></i></div>\n    <div class=\"fs-4\">\n      <p>La suppression de cet \u00E9l\u00E9ment supprimera {{result.count}} \u00E9l\u00E9ments dans la base de donn\u00E9es..</p>\n    </div>\n    <table class=\"table table-sm table-striped table-danger\">\n      <thead>\n        <tr>\n          <th>Type d'\u00E9l\u00E9ment</th>\n          <th>Nombre</th>\n        </tr>\n      </thead>\n      <tbody>\n        <ng-container *ngFor=\"let rl of result.details\">\n          <tr>\n            <td>{{checks[rl[0]] ? checks[rl[0]] : rl[0]}}</td>\n            <td>{{rl[1]}}</td>\n          </tr>\n        </ng-container>\n      </tbody>\n    </table>\n    <button class=\"w-100 btn btn-lg btn-danger\" (click)=\"reallyDelete()\"><i class=\"bi bi-trash me-2\"></i>Je confirme la suppression</button>\n    <button class=\"w-100 btn btn-outline-secondary my-3\" (click)=\"offcanvas.close()\"><i class=\"bi bi-door-open me-2\"></i>Je renonce \u00E0 la suppression</button>\n  </div>\n</ng-template>\n<button class=\"btn btn-sm btn-outline-danger float-end\" (click)=\"checkDelete(model)\" *ngIf=\"display==='button'\"><i class=\"bi bi-trash mx-2\"></i></button><i class=\"bi bi-trash mx-2\" (click)=\"checkDelete(model)\" *ngIf=\"display==='icon'\" role=\"button\"></i>\n<div (click)=\"checkDelete(model)\" *ngIf=\"display==='custom'\" role=\"button\">\n  <ng-content></ng-content>\n</div>" }]
         }], ctorParameters: function () { return [{ type: i2$1.NgbOffcanvas }]; }, propDecorators: { model: [{
                 type: Input
             }], service: [{
@@ -3343,6 +3368,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImpor
                 type: Input
             }], deleted: [{
                 type: Output
+            }], display: [{
+                type: Input
             }], _dialogRef: [{
                 type: ViewChild,
                 args: ['dialog', { static: true }]
@@ -3522,18 +3549,26 @@ class DateFieldManager extends BaseFieldManager {
         return v;
     }
     fromJson(data) {
-        if (data === null) {
+        if (data === null || data === undefined) {
             return null;
         }
-        return new Date(data);
+        const date = new Date(data);
+        if (date instanceof Date && !isNaN(date)) {
+            return date;
+        }
+        return null;
     }
     toJson(data) {
         if (data === null || data === undefined) {
             return null;
         }
-        // if (typeof data === "string") {
-        //   return data;
-        // }
+        if (typeof data === 'string') {
+            const d = this.fromJson(data);
+            if (d === null) {
+                return null;
+            }
+            data = d;
+        }
         return `${data.getUTCFullYear()}-${data.getUTCMonth() + 1}-${data.getUTCDate()}`;
     }
     /**
@@ -3565,6 +3600,13 @@ class DatetimeFieldManager extends DateFieldManager {
         if (data === null || data === undefined) {
             return null;
         }
+        if (typeof data === 'string') {
+            const d = this.fromJson(data);
+            if (d === null) {
+                return null;
+            }
+            data = d;
+        }
         try {
             return data.toISOString();
         }