Upgrade natural #9073 #8589 #9074 #8398 #9088

Ecodev · Sep 6, 2022 · a25326c · a25326c
1 parent d5abed1
commit a25326c
Show file tree

Hide file tree

Showing 24 changed files with 215 additions and 77 deletions.
diff --git a/client/app/admin/accounting-documents/services/accounting-document.service.ts b/client/app/admin/accounting-documents/services/accounting-document.service.ts
@@ -8,7 +8,7 @@ import {
     DeleteAccountingDocument,
     DeleteAccountingDocumentVariables,
 } from '../../../shared/generated-types';
-import {NaturalAbstractModelService} from '@ecodev/natural';
+import {NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 
 @Injectable({
     providedIn: 'root',
@@ -25,9 +25,10 @@ export class AccountingDocumentService extends NaturalAbstractModelService<
     DeleteAccountingDocument,
     DeleteAccountingDocumentVariables
 > {
-    public constructor(apollo: Apollo) {
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
         super(
             apollo,
+            naturalDebounceService,
             'accountingDocument',
             null,
             null,

diff --git a/client/app/admin/accounts/services/account.service.ts b/client/app/admin/accounts/services/account.service.ts
@@ -43,6 +43,7 @@ import {
     NaturalAbstractModelService,
     NaturalQueryVariablesManager,
     unique,
+    NaturalDebounceService,
 } from '@ecodev/natural';
 import {Observable} from 'rxjs';
 import {map} from 'rxjs/operators';
@@ -63,8 +64,17 @@ export class AccountService extends NaturalAbstractModelService<
     DeleteAccounts,
     DeleteAccountsVariables
 > {
-    public constructor(apollo: Apollo) {
-        super(apollo, 'account', accountQuery, accountsQuery, createAccount, updateAccount, deleteAccounts);
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
+        super(
+            apollo,
+            naturalDebounceService,
+            'account',
+            accountQuery,
+            accountsQuery,
+            createAccount,
+            updateAccount,
+            deleteAccounts,
+        );
     }
 
     protected getDefaultForServer(): AccountInput {

diff --git a/client/app/admin/bookable-metadata/bookable-metadata.service.ts b/client/app/admin/bookable-metadata/bookable-metadata.service.ts
@@ -7,7 +7,7 @@ import {
     updateBookableMetadataMutation,
 } from './bookable-metadata.queries';
 import {Validators} from '@angular/forms';
-import {FormValidators, NaturalAbstractModelService} from '@ecodev/natural';
+import {FormValidators, NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 import {
     BookableMetadataInput,
     BookableMetadatas,
@@ -33,9 +33,10 @@ export class BookableMetadataService extends NaturalAbstractModelService<
     DeleteBookableMetadatas,
     DeleteBookableMetadatasVariables
 > {
-    public constructor(apollo: Apollo) {
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
         super(
             apollo,
+            naturalDebounceService,
             'bookableMetadata',
             null,
             bookableMetadatasQuery,

diff --git a/client/app/admin/bookableTags/services/bookableTag.service.ts b/client/app/admin/bookableTags/services/bookableTag.service.ts
@@ -1,6 +1,12 @@
 import {Apollo} from 'apollo-angular';
 import {Injectable} from '@angular/core';
-import {FormAsyncValidators, FormValidators, NaturalAbstractModelService, unique} from '@ecodev/natural';
+import {
+    FormAsyncValidators,
+    FormValidators,
+    NaturalAbstractModelService,
+    NaturalDebounceService,
+    unique,
+} from '@ecodev/natural';
 import {
     bookableTagQuery,
     bookableTagsQuery,
@@ -39,9 +45,10 @@ export class BookableTagService extends NaturalAbstractModelService<
     DeleteBookableTags,
     DeleteBookableTagsVariables
 > {
-    public constructor(apollo: Apollo) {
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
         super(
             apollo,
+            naturalDebounceService,
             'bookableTag',
             bookableTagQuery,
             bookableTagsQuery,

diff --git a/client/app/admin/bookables/services/bookable.service.ts b/client/app/admin/bookables/services/bookable.service.ts
@@ -34,6 +34,7 @@ import {
     NaturalAbstractModelService,
     NaturalQueryVariablesManager,
     unique,
+    NaturalDebounceService,
 } from '@ecodev/natural';
 import {BookableTagService} from '../../bookableTags/services/bookableTag.service';
 
@@ -99,8 +100,21 @@ export class BookableService extends NaturalAbstractModelService<
         filter: {groups: [{conditions: [{bookingType: {in: {values: [BookingType.application]}}}]}]},
     };
 
-    public constructor(apollo: Apollo, private readonly bookingService: BookingService) {
-        super(apollo, 'bookable', bookableQuery, bookablesQuery, createBookable, updateBookable, deleteBookables);
+    public constructor(
+        apollo: Apollo,
+        naturalDebounceService: NaturalDebounceService,
+        private readonly bookingService: BookingService,
+    ) {
+        super(
+            apollo,
+            naturalDebounceService,
+            'bookable',
+            bookableQuery,
+            bookablesQuery,
+            createBookable,
+            updateBookable,
+            deleteBookables,
+        );
     }
 
     public static getFiltersByTagId(tagId: string): BookablesVariables {

diff --git a/client/app/admin/bookables/services/image.service.ts b/client/app/admin/bookables/services/image.service.ts
@@ -2,7 +2,7 @@ import {Apollo, gql} from 'apollo-angular';
 import {Injectable} from '@angular/core';
 import {userMetaFragment} from '../../../shared/queries/fragments';
 import {CreateImage, CreateImageVariables, ImageInput} from '../../../shared/generated-types';
-import {NaturalAbstractModelService} from '@ecodev/natural';
+import {NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 
 export const createImageMutation = gql`
     mutation CreateImage($input: ImageInput!) {
@@ -31,8 +31,8 @@ export class ImageService extends NaturalAbstractModelService<
     any,
     any
 > {
-    public constructor(apollo: Apollo) {
-        super(apollo, 'image', null, null, createImageMutation, null, null);
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
+        super(apollo, naturalDebounceService, 'image', null, null, createImageMutation, null, null);
     }
 
     protected getDefaultForServer(): ImageInput {

diff --git a/client/app/admin/bookables/services/usage-bookable.service.ts b/client/app/admin/bookables/services/usage-bookable.service.ts
@@ -16,7 +16,7 @@ import {
     UsageBookablesVariables,
 } from '../../../shared/generated-types';
 import {BookingService} from '../../bookings/services/booking.service';
-import {NaturalAbstractModelService} from '@ecodev/natural';
+import {NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 import {Observable, of} from 'rxjs';
 
 @Injectable({
@@ -34,8 +34,21 @@ export class UsageBookableService extends NaturalAbstractModelService<
     DeleteBookables,
     DeleteBookablesVariables
 > {
-    public constructor(apollo: Apollo, protected readonly bookingService: BookingService) {
-        super(apollo, 'bookable', bookableQuery, usageBookablesQuery, createBookable, updateBookable, deleteBookables);
+    public constructor(
+        apollo: Apollo,
+        naturalDebounceService: NaturalDebounceService,
+        protected readonly bookingService: BookingService,
+    ) {
+        super(
+            apollo,
+            naturalDebounceService,
+            'bookable',
+            bookableQuery,
+            usageBookablesQuery,
+            createBookable,
+            updateBookable,
+            deleteBookables,
+        );
     }
 
     public getPartialVariablesForAll(): Observable<Partial<BookablesVariables>> {

diff --git a/client/app/admin/bookings/services/PricedBooking.service.ts b/client/app/admin/bookings/services/PricedBooking.service.ts
@@ -2,7 +2,7 @@ import {Apollo} from 'apollo-angular';
 import {Injectable} from '@angular/core';
 import {pricedBookingsQuery} from './booking.queries';
 import {Bookings, BookingsVariables} from '../../../shared/generated-types';
-import {NaturalAbstractModelService} from '@ecodev/natural';
+import {NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 
 @Injectable({
     providedIn: 'root',
@@ -19,7 +19,7 @@ export class PricedBookingService extends NaturalAbstractModelService<
     any,
     any
 > {
-    public constructor(apollo: Apollo) {
-        super(apollo, 'booking', null, pricedBookingsQuery, null, null, null);
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
+        super(apollo, naturalDebounceService, 'booking', null, pricedBookingsQuery, null, null, null);
     }
 }
diff --git a/client/app/admin/bookings/services/booking-with-owner.service.ts b/client/app/admin/bookings/services/booking-with-owner.service.ts
@@ -19,7 +19,7 @@ import {
     UpdateBooking,
     UpdateBookingVariables,
 } from '../../../shared/generated-types';
-import {NaturalAbstractModelService} from '@ecodev/natural';
+import {NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 import {Observable, of} from 'rxjs';
 import {BookingService} from './booking.service';
 
@@ -38,9 +38,14 @@ export class BookingWithOwnerService extends NaturalAbstractModelService<
     DeleteBookings,
     DeleteBookingsVariables
 > {
-    public constructor(apollo: Apollo, private readonly bookingService: BookingService) {
+    public constructor(
+        apollo: Apollo,
+        naturalDebounceService: NaturalDebounceService,
+        private readonly bookingService: BookingService,
+    ) {
         super(
             apollo,
+            naturalDebounceService,
             'booking',
             bookingQuery,
             bookingsWithOwnerBalanceQuery,

diff --git a/client/app/admin/bookings/services/booking.service.ts b/client/app/admin/bookings/services/booking.service.ts
@@ -36,7 +36,13 @@ import {Validators} from '@angular/forms';
 import {forkJoin, Observable, of} from 'rxjs';
 import {map} from 'rxjs/operators';
 import {BookingResolve} from '../booking';
-import {formatIsoDateTime, FormValidators, NaturalAbstractModelService, NaturalEnumService} from '@ecodev/natural';
+import {
+    formatIsoDateTime,
+    FormValidators,
+    NaturalAbstractModelService,
+    NaturalEnumService,
+    NaturalDebounceService,
+} from '@ecodev/natural';
 import {BookableTagService} from '../../bookableTags/services/bookableTag.service';
 
 @Injectable({
@@ -178,8 +184,21 @@ export class BookingService extends NaturalAbstractModelService<
         };
     }
 
-    public constructor(apollo: Apollo, private readonly enumService: NaturalEnumService) {
-        super(apollo, 'booking', bookingQuery, bookingsQuery, createBooking, updateBooking, deleteBookings);
+    public constructor(
+        apollo: Apollo,
+        naturalDebounceService: NaturalDebounceService,
+        private readonly enumService: NaturalEnumService,
+    ) {
+        super(
+            apollo,
+            naturalDebounceService,
+            'booking',
+            bookingQuery,
+            bookingsQuery,
+            createBooking,
+            updateBooking,
+            deleteBookings,
+        );
     }
 
     protected getDefaultForServer(): BookingInput {

diff --git a/client/app/admin/expenseClaim/services/expenseClaim.service.ts b/client/app/admin/expenseClaim/services/expenseClaim.service.ts
@@ -4,6 +4,7 @@ import {
     FormValidators,
     money,
     NaturalAbstractModelService,
+    NaturalDebounceService,
     NaturalQueryVariablesManager,
     SortingOrder,
 } from '@ecodev/natural';
@@ -49,9 +50,10 @@ export class ExpenseClaimService extends NaturalAbstractModelService<
     DeleteExpenseClaims,
     DeleteExpenseClaimsVariables
 > {
-    public constructor(apollo: Apollo) {
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
         super(
             apollo,
+            naturalDebounceService,
             'expenseClaim',
             expenseClaimQuery,
             expenseClaimsQuery,

diff --git a/client/app/admin/licenses/services/license.service.ts b/client/app/admin/licenses/services/license.service.ts
@@ -1,6 +1,12 @@
 import {Apollo} from 'apollo-angular';
 import {Injectable} from '@angular/core';
-import {FormAsyncValidators, FormValidators, NaturalAbstractModelService, unique} from '@ecodev/natural';
+import {
+    FormAsyncValidators,
+    FormValidators,
+    NaturalAbstractModelService,
+    unique,
+    NaturalDebounceService,
+} from '@ecodev/natural';
 import {createLicense, deleteLicenses, licenseQuery, licensesQuery, updateLicense} from './license.queries';
 import {
     CreateLicense,
@@ -33,8 +39,17 @@ export class LicenseService extends NaturalAbstractModelService<
     DeleteLicenses,
     DeleteLicensesVariables
 > {
-    public constructor(apollo: Apollo) {
-        super(apollo, 'license', licenseQuery, licensesQuery, createLicense, updateLicense, deleteLicenses);
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
+        super(
+            apollo,
+            naturalDebounceService,
+            'license',
+            licenseQuery,
+            licensesQuery,
+            createLicense,
+            updateLicense,
+            deleteLicenses,
+        );
     }
 
     protected getDefaultForServer(): LicenseInput {

diff --git a/client/app/admin/logs/services/log.service.ts b/client/app/admin/logs/services/log.service.ts
@@ -1,6 +1,6 @@
 import {Apollo} from 'apollo-angular';
 import {Injectable} from '@angular/core';
-import {NaturalAbstractModelService} from '@ecodev/natural';
+import {NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 import {Logs, LogsVariables} from '../../../shared/generated-types';
 import {logsQuery} from './log.queries';
 import {Observable, of} from 'rxjs';
@@ -20,8 +20,8 @@ export class LogService extends NaturalAbstractModelService<
     never,
     never
 > {
-    public constructor(apollo: Apollo) {
-        super(apollo, 'log', null, logsQuery, null, null, null);
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
+        super(apollo, naturalDebounceService, 'log', null, logsQuery, null, null, null);
     }
 
     public getPartialVariablesForAll(): Observable<Partial<LogsVariables>> {

diff --git a/client/app/admin/transactionTags/services/transactionTag.service.ts b/client/app/admin/transactionTags/services/transactionTag.service.ts
@@ -1,6 +1,6 @@
 import {Apollo} from 'apollo-angular';
 import {Injectable} from '@angular/core';
-import {FormValidators, NaturalAbstractModelService} from '@ecodev/natural';
+import {FormValidators, NaturalAbstractModelService, NaturalDebounceService} from '@ecodev/natural';
 import {
     createTransactionTag,
     deleteTransactionTags,
@@ -38,9 +38,10 @@ export class TransactionTagService extends NaturalAbstractModelService<
     any,
     any
 > {
-    public constructor(apollo: Apollo) {
+    public constructor(apollo: Apollo, naturalDebounceService: NaturalDebounceService) {
         super(
             apollo,
+            naturalDebounceService,
             'transactionTag',
             transactionTagQuery,
             transactionTagsQuery,

diff --git a/client/app/admin/transactions/services/transaction.service.ts b/client/app/admin/transactions/services/transaction.service.ts
@@ -1,7 +1,13 @@
 import {Apollo} from 'apollo-angular';
 import {Injectable} from '@angular/core';
 import {Validators} from '@angular/forms';
-import {formatIsoDateTime, FormValidators, Literal, NaturalAbstractModelService} from '@ecodev/natural';
+import {
+    formatIsoDateTime,
+    FormValidators,
+    Literal,
+    NaturalAbstractModelService,
+    NaturalDebounceService,
+} from '@ecodev/natural';
 import {
     Accounts_accounts_items,
     CreateTransaction,
@@ -47,11 +53,13 @@ export class TransactionService extends NaturalAbstractModelService<
 
     public constructor(
         apollo: Apollo,
+        naturalDebounceService: NaturalDebounceService,
         private readonly transactionLineService: TransactionLineService,
         private accountService: AccountService,
     ) {
         super(
             apollo,
+            naturalDebounceService,
             'transaction',
             transactionQuery,
             transactionsQuery,