taxtank-core 0.32.21 → 0.32.23

package/fesm2022/taxtank-core.mjs

@@ -4,7 +4,7 @@ import * as i1$1 from '@angular/common';
 import { formatDate, CommonModule, CurrencyPipe, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpClient, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { map, mergeMap, filter, catchError, first as first$1, last as last$1, take, switchMap, finalize, debounceTime, distinctUntilChanged, startWith, delay } from 'rxjs/operators';
+import { map, mergeMap, filter, catchError, first as first$1, take, switchMap, finalize, debounceTime, distinctUntilChanged, startWith, delay } from 'rxjs/operators';
 import { ReplaySubject, Subject, BehaviorSubject, throwError, Observable, combineLatest, forkJoin, of, from, merge as merge$1 } from 'rxjs';
 import { plainToClass, Type, Transform, Exclude, Expose, classToPlain } from 'class-transformer';
 import get from 'lodash/get';
@@ -11057,9 +11057,7 @@ let RestService$1 = class RestService extends DataService {
         if (!this.mercureTopic) {
             return;
         }
-        console.log(this.mercureTopic);
         this.sseService.on(this.mercureTopic).pipe(map((response) => {
-            console.log(response);
             let model = this.createModelInstance(response);
             let method;
             if (model.id) {
@@ -11068,11 +11066,10 @@ let RestService$1 = class RestService extends DataService {
             else {
                 method = 'delete';
                 // we got empty body when item deleted, so we should get id from Api Platform data (@id)
-                model = merge(model, { id: +last$1(model['@id'].split('/')) });
+                model = merge(model, { id: +last(model['@id'].split('/')) });
             }
             return { method, model };
         })).subscribe((change) => {
-            console.log(change);
             this.handleResponse([change.model], change.method);
         });
     }
@@ -11211,10 +11208,10 @@ class BankConnectionService extends RestService$1 {
             .pipe(map((response) => {
             const result = plainToClass(BankConnection, response);
             if (bankConnection.id) {
-                this.handleResponse([result], 'put');
+                // this.handleResponse([result], 'put');
             }
             else {
-                this.handleResponse([result], 'post');
+                // this.handleResponse([result], 'post');
                 if (result.isBasiq()) {
                     switch (true) {
                         case result.isLoginSuccess():
@@ -12258,7 +12255,7 @@ class ClientInviteService extends RestService$1 {
             // TaxReviewService is listening client invites acception. With the new rest we are using listenCSE method, but old rest does not have this method.
             // We need to refactor TaxReviewService with new rest first, then we can listenCSE and remove manual events
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_INVITE_ACCEPTED, null));
-            this.handleResponse([invite], 'delete');
+            // this.handleResponse([invite], 'delete');
         }));
     }
     /**
@@ -12273,10 +12270,9 @@ class ClientInviteService extends RestService$1 {
     resend(invite) {
         // cant use parent method because of custom specific handler
         return this.http.post(`${this.apiUrl}/${invite.id}/resend`, null)
-            .pipe(map((inviteBase) => plainToClass(ClientInvite, inviteBase)), map((resentInvite) => {
-            this.handleResponse([resentInvite], 'put');
-            return resentInvite;
-        }));
+            .pipe(map((inviteBase) => plainToClass(ClientInvite, inviteBase)), map((resentInvite) => 
+        // this.handleResponse([resentInvite], 'put');
+        resentInvite));
     }
     /**
      * Send invitation from client to firm
@@ -12334,7 +12330,9 @@ class ClientMovementService extends RestService$1 {
     }
     listenEvents() {
         // client invite accept triggers client movement update
-        this.listenCSE(ClientInvite, this.refreshCache, ['post', 'put', 'delete']);
+        this.eventDispatcherService.on([AppEventTypeEnum.CLIENT_INVITE_ACCEPTED]).subscribe(() => {
+            this.refreshCache();
+        });
         // @TODO remove when TT-3826 is ready
         this.listenSSE();
     }
@@ -12356,8 +12354,8 @@ class ClientMovementService extends RestService$1 {
         // extend base 'add' method and pass into it movement without id
         return super.post(plainToClass(ClientMovement, Object.assign({}, movement, { id: null }))).pipe(map((updatedMovement) => {
             // remove provided movement from cache
-            this.cache = this.cache.filter((item) => item.id !== movement.id);
-            this.updateCache([updatedMovement], 'post');
+            // this.cache = this.cache.filter((item: ClientMovement) => item.id !== movement.id);
+            // this.updateCache([updatedMovement], 'post');
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_TRANSFER_TO_OTHER_EMPLOYEE, [updatedMovement.client]));
             return updatedMovement;
         }));
@@ -12379,8 +12377,8 @@ class ClientMovementService extends RestService$1 {
             .pipe(map(() => {
             // @TODO remove when TaxReviewService refactored with the new rest and use there listenCSE instead
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_MOVEMENT_CLOSED, null));
-            this.cache = this.cache.filter((movement) => movement.id !== clientMovement.id);
-            this.updateCache([clientMovement], 'delete');
+            // this.cache = this.cache.filter((movement: ClientMovement): boolean => movement.id !== clientMovement.id);
+            // this.updateCache([clientMovement], 'delete');
         }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -14082,6 +14080,7 @@ class ServicePaymentMethodService extends RestService$1 {
         this.endpointUri = 'service-payment-methods';
         this.collectionClass = Collection;
         this.modelClass = ServicePaymentMethod;
+        this.mercureTopic = 'servicePaymentMethods';
         this.listenEvents();
     }
     listenEvents() {
@@ -14162,12 +14161,7 @@ class SubscriptionService extends RestService$1 {
         this.listenSSE();
     }
     startTrial(subscription) {
-        return this.http.post(`${this.apiUrl}/trial`, subscription)
-            .pipe(map((response) => {
-            const newSubscription = plainToClass(ServiceSubscription, response);
-            this.handleResponse([newSubscription], 'post');
-            return newSubscription;
-        }));
+        return this.post(subscription, null, `${this.apiUrl}/trial`);
     }
     postStripeSubscription(subscription) {
         return this.http.post(this.apiUrl, classToPlain(subscription))
@@ -15596,11 +15590,9 @@ class UserService extends RestService$1 {
      */
     listenServiceSubscriptionUpdated() {
         this.listenCSE(ServiceSubscription, (response) => {
-            console.log(response);
             // @TODO vik test and remove
             setTimeout(() => {
                 this.refreshCache();
-                this.toastService.success('Subscription successfully updated');
             }, 2000);
         }, ['post', 'put']);
     }
@@ -18951,13 +18943,13 @@ class PropertyCalculationService {
         // best performance properties could be only from active properties list
         const activeProperties = properties.getActiveProperties();
         const bestPerformanceGrowthProperty = activeProperties.getBestPerformanceGrowthProperty();
-        const bestPerformanceTaxProperty = activeProperties.getBestPerformanceTaxProperty(transactions, depreciations);
+        const bestPerformanceTaxProperty = activeProperties.getTaxInclusive().getBestPerformanceTaxProperty(transactions, depreciations);
         switch (true) {
             case !property.isActive:
                 return new Badge('Inactive', BadgeColorEnum.GRAY);
-            case property.id === bestPerformanceTaxProperty.id && property.id === bestPerformanceGrowthProperty.id:
+            case property.id === bestPerformanceTaxProperty?.id && property.id === bestPerformanceGrowthProperty.id:
                 return new Badge('Best performance growth & tax', BadgeColorEnum.GOLD);
-            case property.id === bestPerformanceTaxProperty.id:
+            case property.id === bestPerformanceTaxProperty?.id:
                 return new Badge('Best performance tax', BadgeColorEnum.GOLD);
             case property.id === bestPerformanceGrowthProperty.id:
                 return new Badge('Best performance growth', BadgeColorEnum.GREEN);
@@ -19411,9 +19403,9 @@ const ENDPOINTS = {
     CLIENTS_INVITES_GET: new Endpoint('GET', '\\/clients\\/\\invites'),
     CLIENTS_INVITES_POST: new Endpoint('POST', '\\/clients\\/\\invites'),
     CLIENTS_INVITES_DELETE: new Endpoint('DELETE', '\\/clients\\/\\invites\\/\\d+'),
-    CLIENTS_INVITES_ACCEPT_POST: new Endpoint('POST', '\\/clients\\/\\invites\\/\\d+\\/accept'),
-    CLIENTS_INVITES_REJECT_POST: new Endpoint('POST', '\\/clients\\/\\invites\\/\\d+\\/reject'),
-    CLIENTS_INVITES_RESEND_POST: new Endpoint('POST', '\\/clients\\/\\invites\\/\\d+\\/resend'),
+    CLIENTS_INVITES_ACCEPT: new Endpoint('PUT', '\\/clients\\/\\invites\\/\\d+\\/accept'),
+    CLIENTS_INVITES_REJECT: new Endpoint('PUT', '\\/clients\\/\\invites\\/\\d+\\/reject'),
+    CLIENTS_INVITES_RESEND: new Endpoint('POST', '\\/clients\\/\\invites\\/\\d+\\/resend'),
     CLIENT_MOVEMENTS_CLOSE: new Endpoint('PUT', '\\/client-movements\\/\\d+\\/close'),
     CLIENT_MOVEMENTS_GET: new Endpoint('GET', '\\/client-movements'),
     CLIENT_MOVEMENTS_POST: new Endpoint('POST', '\\/client-movements'),
@@ -22025,7 +22017,6 @@ class PropertyCategoryMovementForm extends AbstractForm {
         }, movement);
         this.get('valuation').get('date').valueChanges.subscribe((value) => {
             this.get('fromDate').setValue(value);
-            console.log(this.get('fromDate').value);
         });
     }
     submit() {