@solidev/data 0.0.1-alpha.0 → 0.0.1-alpha.2

package/fesm2020/solidev-data.mjs

@@ -3,8 +3,8 @@ import { InjectionToken, PLATFORM_ID, Injectable, Inject, Optional, Component, I
 import 'reflect-metadata';
 import * as i2$2 from '@angular/forms';
 import { FormControl, Validators, FormGroup, UntypedFormControl, ReactiveFormsModule, NG_VALUE_ACCESSOR, UntypedFormGroup } from '@angular/forms';
-import { throwError, ReplaySubject, combineLatest, share, of, takeUntil, NEVER, debounceTime, Subject, distinctUntilChanged, isObservable, firstValueFrom, timer, Observable, BehaviorSubject } from 'rxjs';
-import { tap, switchMap, map, filter, mergeMap, finalize, catchError, take } from 'rxjs/operators';
+import { throwError, ReplaySubject, share, combineLatest, of, takeUntil, NEVER, Subject, debounceTime, distinctUntilChanged, isObservable, firstValueFrom, timer, Observable, BehaviorSubject } from 'rxjs';
+import { tap, switchMap, map, throttleTime, filter, mergeMap, finalize, catchError, take } from 'rxjs/operators';
 import * as i2 from '@angular/platform-browser';
 import { makeStateKey } from '@angular/platform-browser';
 import * as i1$1 from '@angular/common';
@@ -495,11 +495,25 @@ class Queryset {
         this.pageSize = 500;
         /** Current page number */
         this.page = 1;
-        this._pristine = true;
         this._loading = new ReplaySubject(1);
+        /** Loading status (true if currently fetching data) */
+        this.loading = this._loading.asObservable().pipe(share());
         this._meta = new ReplaySubject(1);
+        /** Results meta part observable */
+        this.meta = this._meta.asObservable().pipe(share());
         this._results = new ReplaySubject(1);
+        /** Results data part observable */
+        this.results = this._results.asObservable().pipe(share());
+        this._full = combineLatest([
+            this.results,
+            this.loading,
+            this.meta,
+        ]);
+        /** Full results observable (results, loading, meta) */
+        this.full = this._full.pipe(share());
+        this._pristine = true;
         /** Default options */
+        // console.log('@solidev/data: Creating collection', _coll);
         this.options = { emitFields: true };
         Object.assign(this.options, options);
     }
@@ -507,25 +521,6 @@ class Queryset {
     get pristine() {
         return this._pristine;
     }
-    /** Loading status (true if currently fetching data) */
-    get loading() {
-        return this._loading.asObservable();
-    }
-    /** Results meta part observable */
-    get meta() {
-        return this._meta.asObservable();
-    }
-    /** Results data part observable */
-    get results() {
-        return this._results.asObservable();
-    }
-    /** Full results observable (results, loading, meta) */
-    get full() {
-        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.
      * @param params filter data
@@ -601,10 +596,11 @@ class Queryset {
         return f;
     }
     get(refresh = true) {
-        console.log('queryset:get', this, refresh);
         if (!refresh && !this._pristine) {
+            // console.log('@solidev/data: Get not refreshing, return current result observable');
             return this.results;
         }
+        // console.log('@solidev/data: start get (query)');
         this._loading.next(true);
         return this._coll
             .raw({
@@ -613,6 +609,7 @@ class Queryset {
         })
             .pipe(switchMap((result) => {
             // Process results
+            // console.log('@solidev/data: have meta');
             this._meta.next({ nav: result.nav, parameters: result.parameters });
             const out = [];
             for (const r of result.results) {
@@ -620,8 +617,11 @@ class Queryset {
                 out.push(m);
             }
             this._pristine = false;
+            // console.log('@solidev/data: have loading');
             this._loading.next(false);
+            // console.log('@solidev/data: have result');
             this._results.next(out);
+            // console.log('@solidev/data: done get');
             return this.results;
         }));
     }
@@ -1303,7 +1303,7 @@ class ModelList {
     get results() {
         if (!this._results) {
             this._results = this.queryset.results.pipe(
-            // tap(() => console.log('RESULTS')),
+            // tap(() => console.log('@solidev/data: modellist result')),
             share(), takeUntil(this.unsubscribe || NEVER));
         }
         return this._results;
@@ -1311,7 +1311,7 @@ class ModelList {
     get meta() {
         if (!this._meta) {
             this._meta = this.queryset.meta.pipe(
-            // tap(() => console.log('META')),
+            // tap(() => console.log('@solidev/data: modellist meta')),
             share(), takeUntil(this.unsubscribe || NEVER));
         }
         return this._meta;
@@ -1319,7 +1319,7 @@ class ModelList {
     get loading() {
         if (!this._loading) {
             this._loading = this.queryset.loading.pipe(
-            // tap(() => console.log('LOADING')),
+            // tap(() => console.log('@solidev/data: modellist loading')),
             share(), takeUntil(this.unsubscribe || NEVER));
         }
         return this._loading;
@@ -1327,7 +1327,7 @@ class ModelList {
     get full() {
         if (!this._full) {
             this._full = this.queryset.full.pipe(
-            // tap(() => console.log('FULL')),
+            // tap(() => console.log('@solidev/data: modellist full')),
             share(), takeUntil(this.unsubscribe || NEVER));
         }
         return this._full;
@@ -1351,7 +1351,7 @@ class ModelList {
             this.sorter.output,
             this.fields.output,
         ])
-            .pipe(debounceTime(200), switchMap(([reload, filter, manualFilter, paginator, sorter, fields]) => {
+            .pipe(throttleTime(200), switchMap(([reload, filter, manualFilter, paginator, sorter, fields]) => {
             this.queryset
                 .filter(filter)
                 .filter(manualFilter || {}, true)
@@ -1362,12 +1362,14 @@ class ModelList {
             return this.queryset.get(true);
         }), takeUntil(this.unsubscribe || NEVER))
             .subscribe({
-            next: (results) => { },
+            next: (results) => {
+                // console.log('@solidev/data: modellist:get results');
+            },
             error: (error) => {
-                console.error('Error while getting model list results : ', error);
+                console.error('@solidev/data: error while getting model list results : ', error);
             },
             complete: () => {
-                // console.log('modellist:completed', this.name);
+                // console.log('@solidev/data: modellist:completed', this.name);
                 this.started = false;
             },
         });
@@ -2542,6 +2544,45 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImpor
                     standalone: true,
                 }]
         }] });
+class PChoicePipe {
+    transform(value, model, field, mode = 'desc') {
+        if (!model) {
+            return '-';
+        }
+        if (!value) {
+            return '-';
+        }
+        const fvalue = model[field];
+        if (mode === 'code') {
+            return `${fvalue}`;
+        }
+        const manager = model.FM(field);
+        const choices = manager.choices;
+        if (!choices) {
+            return `${fvalue}`;
+        }
+        for (const ch of choices) {
+            if (ch.value === fvalue) {
+                if (mode === 'desc') {
+                    return ch.desc;
+                }
+                else {
+                    return `[${fvalue}] ${ch.desc}`;
+                }
+            }
+        }
+        return `[${fvalue}] ??`;
+    }
+}
+PChoicePipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: PChoicePipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
+PChoicePipe.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "14.2.9", ngImport: i0, type: PChoicePipe, isStandalone: true, name: "pchoice" });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: PChoicePipe, decorators: [{
+            type: Pipe,
+            args: [{
+                    name: 'pchoice',
+                    standalone: true,
+                }]
+        }] });
 
 function isValue(value) {
     return !(value == null || value === '' || value !== value);
@@ -2587,6 +2628,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImpor
                     type: Inject,
                     args: [LOCALE_ID]
                 }] }]; } });
+class PFactorPipe {
+    constructor(_locale) {
+        this._locale = _locale;
+    }
+    transform(value, model, field, digitsInfo, locale) {
+        if (!model)
+            return null;
+        if (!value)
+            return null;
+        locale = locale || this._locale;
+        const fvalue = model[field];
+        if (!isValue(fvalue))
+            return null;
+        const manager = model.FM(field);
+        let factor = manager.factor;
+        factor = factor || 1;
+        const num = strToNumber(fvalue);
+        return formatNumber(num / factor, locale, digitsInfo);
+    }
+}
+PFactorPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: PFactorPipe, deps: [{ token: LOCALE_ID }], target: i0.ɵɵFactoryTarget.Pipe });
+PFactorPipe.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "14.2.9", ngImport: i0, type: PFactorPipe, isStandalone: true, name: "pfactor" });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: PFactorPipe, decorators: [{
+            type: Pipe,
+            args: [{
+                    name: 'pfactor',
+                    standalone: true,
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [LOCALE_ID]
+                }] }]; } });
 
 class FactorcPipe {
     constructor(_locale, _defaultCurrencyCode = 'EUR') {
@@ -2633,6 +2706,53 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImpor
                     type: Inject,
                     args: [DEFAULT_CURRENCY_CODE]
                 }] }]; } });
+class PFactorcPipe {
+    constructor(_locale, _defaultCurrencyCode = 'EUR') {
+        this._locale = _locale;
+        this._defaultCurrencyCode = _defaultCurrencyCode;
+    }
+    transform(value, model, field, currencyCode, display, digitsInfo, locale) {
+        if (!model)
+            return null;
+        if (!value)
+            return null;
+        const fvalue = model[field];
+        if (!isValue(fvalue))
+            return null;
+        locale = locale || this._locale;
+        let currency = currencyCode || this._defaultCurrencyCode;
+        if (!display) {
+            display = 'symbol';
+        }
+        if (display !== 'code') {
+            if (display === 'symbol' || display === 'symbol-narrow') {
+                currency = getCurrencySymbol(currency, display === 'symbol' ? 'wide' : 'narrow', locale);
+            }
+            else {
+                currency = display;
+            }
+        }
+        const manager = model.FM(field);
+        const factor = manager.factor || 1;
+        const num = strToNumber(fvalue);
+        return formatCurrency(num / factor, locale, currency, currencyCode, digitsInfo);
+    }
+}
+PFactorcPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: PFactorcPipe, deps: [{ token: LOCALE_ID }, { token: DEFAULT_CURRENCY_CODE }], target: i0.ɵɵFactoryTarget.Pipe });
+PFactorcPipe.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "14.2.9", ngImport: i0, type: PFactorcPipe, isStandalone: true, name: "pfactorc" });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: PFactorcPipe, decorators: [{
+            type: Pipe,
+            args: [{
+                    name: 'pfactorc',
+                    standalone: true,
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [LOCALE_ID]
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [DEFAULT_CURRENCY_CODE]
+                }] }]; } });
 
 class FkselectComponent {
     constructor() {
@@ -5354,5 +5474,5 @@ const slugify = (str) => {
  * Generated bundle index. Do not edit.
  */
 
-export { AuthInterceptor, AuthServiceBase, BanAdapter, BootstrapDataDisplayConfig, BreadcrumbComponent, ChoicePipe, Collection, CollectionMock, DATA_API_URL, DATA_AUTH_PARAMS, DATA_AUTH_SERVICE, DATA_AUTH_USER_SERVICE, DATA_DISPLAY_CONFIG, DATA_MAX_TRANSFERSTATE_TIME, DATA_MESSAGE_SOUNDS, DEFAULT_TIMEOUTS, DataBackend, DataMessageService, DataModel, DataUploaderService, DispeditComponent, FactorPipe, FactorcPipe, FkselectComponent, FlagsComponent, Jwt, Link, M2mselectComponent, Message, MessageZoneComponent, ModelList, ModelListAutocompleteFilter, ModelListAutocompleteMultiFilter, ModelListDateFilter, ModelListDatetimeFilter, ModelListDatetimerangeFilter, ModelListFieldHeaderComponent, ModelListFieldsSelectorComponent, ModelListFilters, ModelListFiltersComponent, ModelListFiltersSelectComponent, ModelListFlagsFilter, ModelListGeodistanceFilter, ModelListNumberFilter, ModelListNumberOperations, ModelListPaginatorComponent, ModelListSelectFilter, ModelListSelectMultiFilter, ModelListService, ModelListSorterComponent, ModelListTextFilter, ModelListTreeFilter, NavDriver, NgFileDropDirective, NgFileSelectDirective, NgxUploaderModule, Queryset, RData, RicheditComponent, STATUS, SafeDeleteComponent, TabMemoryService, UploadStatus, booleanField, charField, dateField, datetimeField, decimalField, detailsField, emailField, floatField, foreignKeyField, humanizeBytes, integerField, isValue, manyToManyField, passwordField, primaryField, reverseForeignKeyField, slugify, strToNumber, textField };
+export { AuthInterceptor, AuthServiceBase, BanAdapter, BootstrapDataDisplayConfig, BreadcrumbComponent, ChoicePipe, Collection, CollectionMock, DATA_API_URL, DATA_AUTH_PARAMS, DATA_AUTH_SERVICE, DATA_AUTH_USER_SERVICE, DATA_DISPLAY_CONFIG, DATA_MAX_TRANSFERSTATE_TIME, DATA_MESSAGE_SOUNDS, DEFAULT_TIMEOUTS, DataBackend, DataMessageService, DataModel, DataUploaderService, DispeditComponent, FactorPipe, FactorcPipe, FkselectComponent, FlagsComponent, Jwt, Link, M2mselectComponent, Message, MessageZoneComponent, ModelList, ModelListAutocompleteFilter, ModelListAutocompleteMultiFilter, ModelListDateFilter, ModelListDatetimeFilter, ModelListDatetimerangeFilter, ModelListFieldHeaderComponent, ModelListFieldsSelectorComponent, ModelListFilters, ModelListFiltersComponent, ModelListFiltersSelectComponent, ModelListFlagsFilter, ModelListGeodistanceFilter, ModelListNumberFilter, ModelListNumberOperations, ModelListPaginatorComponent, ModelListSelectFilter, ModelListSelectMultiFilter, ModelListService, ModelListSorterComponent, ModelListTextFilter, ModelListTreeFilter, NavDriver, NgFileDropDirective, NgFileSelectDirective, NgxUploaderModule, PChoicePipe, PFactorPipe, PFactorcPipe, Queryset, RData, RicheditComponent, STATUS, SafeDeleteComponent, TabMemoryService, UploadStatus, booleanField, charField, dateField, datetimeField, decimalField, detailsField, emailField, floatField, foreignKeyField, humanizeBytes, integerField, isValue, manyToManyField, passwordField, primaryField, reverseForeignKeyField, slugify, strToNumber, textField };
 //# sourceMappingURL=solidev-data.mjs.map