taxtank-core 0.16.9 → 0.16.12

package/fesm2015/taxtank-core.js

@@ -1621,6 +1621,9 @@ class IncomeSourceCollection extends Collection {
     filterByTypes(types) {
         return this.items.filter((incomeSource) => types.includes(incomeSource.type));
     }
+    getSalary() {
+        return this.items.filter((incomeSource) => incomeSource.isSalaryIncome());
+    }
     /**
      * Get income sources list of forecasts
      */
@@ -3176,10 +3179,9 @@ class IncomeSource$1 extends AbstractModel {
 
 var IncomeSourceTypeEnum;
 (function (IncomeSourceTypeEnum) {
-    IncomeSourceTypeEnum[IncomeSourceTypeEnum["SALARY"] = 1] = "SALARY";
-    IncomeSourceTypeEnum[IncomeSourceTypeEnum["WORK"] = 2] = "WORK";
+    IncomeSourceTypeEnum[IncomeSourceTypeEnum["WORK"] = 1] = "WORK";
+    IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 2] = "SOLE";
     IncomeSourceTypeEnum[IncomeSourceTypeEnum["OTHER"] = 3] = "OTHER";
-    IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 4] = "SOLE";
 })(IncomeSourceTypeEnum || (IncomeSourceTypeEnum = {}));
 
 class SalaryForecast$1 extends AbstractModel {
@@ -3222,13 +3224,9 @@ var SalaryForecastFrequencyEnum;
 class IncomeSourceType$1 extends AbstractModel {
 }
 
-var IncomeSourceTypeListSalaryEnum;
-(function (IncomeSourceTypeListSalaryEnum) {
-    IncomeSourceTypeListSalaryEnum[IncomeSourceTypeListSalaryEnum["BONUSES"] = 1] = "BONUSES";
-})(IncomeSourceTypeListSalaryEnum || (IncomeSourceTypeListSalaryEnum = {}));
-
 var IncomeSourceTypeListWorkEnum;
 (function (IncomeSourceTypeListWorkEnum) {
+    IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["BONUSES"] = 1] = "BONUSES";
     IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIRECTOR_FEES"] = 2] = "DIRECTOR_FEES";
     IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIVIDENDS"] = 3] = "DIVIDENDS";
     IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["INTEREST"] = 4] = "INTEREST";
@@ -3246,8 +3244,8 @@ var IncomeSourceTypeListOtherEnum;
 })(IncomeSourceTypeListOtherEnum || (IncomeSourceTypeListOtherEnum = {}));
 
 class IncomeSourceType extends IncomeSourceType$1 {
-    isSalary() {
-        return !!IncomeSourceTypeListSalaryEnum[this.id];
+    isBonuses() {
+        return this.id === IncomeSourceTypeListWorkEnum.BONUSES;
     }
     isWork() {
         return !!IncomeSourceTypeListWorkEnum[this.id];
@@ -3256,12 +3254,11 @@ class IncomeSourceType extends IncomeSourceType$1 {
         return !!IncomeSourceTypeListOtherEnum[this.id];
     }
     isSole() {
+        // @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
         return !!IncomeSourceTypeListOtherEnum[this.id];
     }
     get type() {
         switch (true) {
-            case this.isSalary():
-                return IncomeSourceTypeEnum.SALARY;
             case this.isWork():
                 return IncomeSourceTypeEnum.WORK;
             case this.isSole():
@@ -3299,7 +3296,9 @@ __decorate([
 
 class IncomeSource extends IncomeSource$1 {
     isSalaryIncome() {
-        return this.type === IncomeSourceTypeEnum.SALARY;
+        return !!this.salaryForecasts.length;
+        // @TODO Vik: old code
+        // return this.type === IncomeSourceTypeEnum.SALARY;
     }
     isSoleIncome() {
         return this.type === IncomeSourceTypeEnum.SOLE;
@@ -8050,11 +8049,11 @@ class AccountSetupService {
         const batch = [];
         // Salary item is completed when user added salary income source
         if (incomeTypes.salary) {
-            batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(IncomeSourceTypeEnum.WORK)));
+            batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)));
         }
         // Other income item is completed when user added at least one other income source
         if (incomeTypes.dividends || incomeTypes.other) {
-            batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSourcesByType(IncomeSourceTypeEnum.OTHER)));
+            batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
         }
         // Rental income item is completed when user added at least one property
         if (incomeTypes.property) {
@@ -8079,11 +8078,16 @@ class AccountSetupService {
         return combineLatest(batch).pipe(map((items) => new AccountSetupItemCollection(items)));
     }
     /**
-     * @TODO work with collection when services refactored
+     * @TODO Alex: work with collection when services refactored
+     * @TODO Vik: waiting for income sources refactoring
      */
-    getIncomeSourcesByType(type) {
+    getIncomeSources(isSalary = false) {
         return this.incomeSourceService.get().pipe(map((incomeSources) => {
-            return new IncomeSourceCollection(incomeSources).getBy('type', type).toArray();
+            const collection = new IncomeSourceCollection(incomeSources);
+            if (isSalary) {
+                return collection.getSalary();
+            }
+            return collection.items.filter((incomeSource) => !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome());
         }));
     }
     /**
@@ -8404,14 +8408,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
-/**
- * Basiq consent UI initial URL. Replace USER_ID and TOKEN by user data + handle action parameter
- */
-const BASIQ_CONSENT_URL = 'https://consent.basiq.io/home?userId=USER_ID&token=TOKEN&action=connect';
-/**
- * Event message name we listen to handle basiq UI result
- */
-const FINISH_BASIQ_EVENT = 'finish-basiq';
+// @TODO Basiq 1.0 remove if we will use basiq 2.0 or refactor if we stay with basiq 1.0
 /**
  * basiq is a middleman between bank and user
  * service is responsible for fetching bank related information
@@ -8429,23 +8426,6 @@ class BasiqService extends RestService {
     listenEvents() {
         this.listenToBankConnectionAdded();
         this.listenNotifications();
-        this.listenBasiqConcentUpdated();
-    }
-    /**
-     * Update user's basiq consents data on backend
-     */
-    confirmConsents() {
-        return this.http.put(`${this.environment.apiV2}/basiq/consents`, {}).pipe(map((isConfirmed) => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_CONSENT_UPDATED, isConfirmed));
-        }));
-    }
-    /**
-     * Notify backend to update connections
-     */
-    updateConnections() {
-        return this.http.post(`${this.environment.apiV2}/basiq/connections`, {}).pipe(map((connections) => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_CONNECTION_UPDATED, !!connections));
-        }));
     }
     /**
      * access token to use basiq connect ui iframe
@@ -8458,15 +8438,11 @@ class BasiqService extends RestService {
                 return new BasiqToken(response['access_token'], new Date(now + response['expires_in'] * 1000));
             }))
                 .subscribe((token) => {
-                this.token = token;
                 this.tokenSubject.next(token);
             });
         }
         return this.tokenSubject.asObservable();
     }
-    /**
-     * Get list of user's bank conections
-     */
     getConnections() {
         return this.get().pipe(map((bankAccounts) => {
             // get all connections
@@ -8477,40 +8453,6 @@ class BasiqService extends RestService {
             return [...new Map(connections.map((connection) => [connection.id, connection])).values()];
         }));
     }
-    /**
-     * Listen response from basiq UI to handle result.
-     * @param isBasiqConsentExist flag from User.ClientDetails - true if user confirmed basiq consent
-     * @param callback function we run after basiq UI work is finished
-     */
-    listenBasiqResponse(isBasiqConsentExist, callback) {
-        window.addEventListener('message', (message) => {
-            if (message.data !== FINISH_BASIQ_EVENT) {
-                return;
-            }
-            // update user's basiq consent confirmation status for the first basiq ui run
-            if (isBasiqConsentExist) {
-                this.updateConnections().pipe(take(1)).subscribe();
-            }
-            else {
-                this.confirmConsents().pipe(take(1)).subscribe();
-            }
-            callback();
-        });
-    }
-    /**
-     * Get URL with filled params to run basiq UI iframe
-     */
-    generateBasiqConsentUrl(user) {
-        return this.getToken().pipe(map((token) => {
-            let url = BASIQ_CONSENT_URL;
-            url = url.replace('USER_ID', user.basiqId);
-            url = url.replace('TOKEN', token.value);
-            if (!user.clientDetails.basiqConsentExist) {
-                url = url.split('&action')[0];
-            }
-            return url;
-        }));
-    }
     /**
      * Listen to EventDispatcherService event related to added Bank connection
      */
@@ -8533,17 +8475,6 @@ class BasiqService extends RestService {
             }
         });
     }
-    /**
-     * Update user's basiq connections when user confirmed basiq consent
-     */
-    listenBasiqConcentUpdated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.BASIQ_CONSENT_UPDATED).subscribe((isConfirmed) => {
-            if (!isConfirmed) {
-                return;
-            }
-            this.updateConnections().pipe(take(1)).subscribe();
-        });
-    }
 }
 BasiqService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 BasiqService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, providedIn: 'root' });