taxtank-core 0.16.9 → 0.16.12

package/bundles/taxtank-core.umd.js

@@ -2205,6 +2205,9 @@
         IncomeSourceCollection.prototype.filterByTypes = function (types) {
             return this.items.filter(function (incomeSource) { return types.includes(incomeSource.type); });
         };
+        IncomeSourceCollection.prototype.getSalary = function () {
+            return this.items.filter(function (incomeSource) { return incomeSource.isSalaryIncome(); });
+        };
         Object.defineProperty(IncomeSourceCollection.prototype, "forecasts", {
             /**
              * Get income sources list of forecasts
@@ -4288,10 +4291,9 @@
 
     exports.IncomeSourceTypeEnum = void 0;
     (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";
     })(exports.IncomeSourceTypeEnum || (exports.IncomeSourceTypeEnum = {}));
 
     var SalaryForecast$1 = /** @class */ (function (_super) {
@@ -4371,13 +4373,9 @@
         return IncomeSourceType;
     }(AbstractModel));
 
-    var IncomeSourceTypeListSalaryEnum;
-    (function (IncomeSourceTypeListSalaryEnum) {
-        IncomeSourceTypeListSalaryEnum[IncomeSourceTypeListSalaryEnum["BONUSES"] = 1] = "BONUSES";
-    })(IncomeSourceTypeListSalaryEnum || (IncomeSourceTypeListSalaryEnum = {}));
-
     exports.IncomeSourceTypeListWorkEnum = void 0;
     (function (IncomeSourceTypeListWorkEnum) {
+        IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["BONUSES"] = 1] = "BONUSES";
         IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIRECTOR_FEES"] = 2] = "DIRECTOR_FEES";
         IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIVIDENDS"] = 3] = "DIVIDENDS";
         IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["INTEREST"] = 4] = "INTEREST";
@@ -4399,8 +4397,8 @@
         function IncomeSourceType() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        IncomeSourceType.prototype.isSalary = function () {
-            return !!IncomeSourceTypeListSalaryEnum[this.id];
+        IncomeSourceType.prototype.isBonuses = function () {
+            return this.id === exports.IncomeSourceTypeListWorkEnum.BONUSES;
         };
         IncomeSourceType.prototype.isWork = function () {
             return !!exports.IncomeSourceTypeListWorkEnum[this.id];
@@ -4409,13 +4407,12 @@
             return !!exports.IncomeSourceTypeListOtherEnum[this.id];
         };
         IncomeSourceType.prototype.isSole = function () {
+            // @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
             return !!exports.IncomeSourceTypeListOtherEnum[this.id];
         };
         Object.defineProperty(IncomeSourceType.prototype, "type", {
             get: function () {
                 switch (true) {
-                    case this.isSalary():
-                        return exports.IncomeSourceTypeEnum.SALARY;
                     case this.isWork():
                         return exports.IncomeSourceTypeEnum.WORK;
                     case this.isSole():
@@ -4472,7 +4469,9 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         IncomeSource.prototype.isSalaryIncome = function () {
-            return this.type === exports.IncomeSourceTypeEnum.SALARY;
+            return !!this.salaryForecasts.length;
+            // @TODO Vik: old code
+            // return this.type === IncomeSourceTypeEnum.SALARY;
         };
         IncomeSource.prototype.isSoleIncome = function () {
             return this.type === exports.IncomeSourceTypeEnum.SOLE;
@@ -10101,11 +10100,11 @@
             var batch = [];
             // Salary item is completed when user added salary income source
             if (incomeTypes.salary) {
-                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(exports.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(exports.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) {
@@ -10130,11 +10129,17 @@
             return rxjs.combineLatest(batch).pipe(operators.map(function (items) { return 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
          */
-        AccountSetupService.prototype.getIncomeSourcesByType = function (type) {
+        AccountSetupService.prototype.getIncomeSources = function (isSalary) {
+            if (isSalary === void 0) { isSalary = false; }
             return this.incomeSourceService.get().pipe(operators.map(function (incomeSources) {
-                return new IncomeSourceCollection(incomeSources).getBy('type', type).toArray();
+                var collection = new IncomeSourceCollection(incomeSources);
+                if (isSalary) {
+                    return collection.getSalary();
+                }
+                return collection.items.filter(function (incomeSource) { return !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome(); });
             }));
         };
         /**
@@ -10484,14 +10489,6 @@
                     }]
             }] });
 
-    /**
-     * Basiq consent UI initial URL. Replace USER_ID and TOKEN by user data + handle action parameter
-     */
-    var 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
-     */
-    var FINISH_BASIQ_EVENT = 'finish-basiq';
     /**
      * basiq is a middleman between bank and user
      * service is responsible for fetching bank related information
@@ -10511,25 +10508,6 @@
         BasiqService.prototype.listenEvents = function () {
             this.listenToBankConnectionAdded();
             this.listenNotifications();
-            this.listenBasiqConcentUpdated();
-        };
-        /**
-         * Update user's basiq consents data on backend
-         */
-        BasiqService.prototype.confirmConsents = function () {
-            var _this = this;
-            return this.http.put(this.environment.apiV2 + "/basiq/consents", {}).pipe(operators.map(function (isConfirmed) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_CONSENT_UPDATED, isConfirmed));
-            }));
-        };
-        /**
-         * Notify backend to update connections
-         */
-        BasiqService.prototype.updateConnections = function () {
-            var _this = this;
-            return this.http.post(this.environment.apiV2 + "/basiq/connections", {}).pipe(operators.map(function (connections) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_CONNECTION_UPDATED, !!connections));
-            }));
         };
         /**
          * access token to use basiq connect ui iframe
@@ -10543,15 +10521,11 @@
                     return new BasiqToken(response['access_token'], new Date(now + response['expires_in'] * 1000));
                 }))
                     .subscribe(function (token) {
-                    _this.token = token;
                     _this.tokenSubject.next(token);
                 });
             }
             return this.tokenSubject.asObservable();
         };
-        /**
-         * Get list of user's bank conections
-         */
         BasiqService.prototype.getConnections = function () {
             return this.get().pipe(operators.map(function (bankAccounts) {
                 // get all connections
@@ -10562,41 +10536,6 @@
                 return __spreadArray([], __read(new Map(connections.map(function (connection) { return [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
-         */
-        BasiqService.prototype.listenBasiqResponse = function (isBasiqConsentExist, callback) {
-            var _this = this;
-            window.addEventListener('message', function (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(operators.take(1)).subscribe();
-                }
-                else {
-                    _this.confirmConsents().pipe(operators.take(1)).subscribe();
-                }
-                callback();
-            });
-        };
-        /**
-         * Get URL with filled params to run basiq UI iframe
-         */
-        BasiqService.prototype.generateBasiqConsentUrl = function (user) {
-            return this.getToken().pipe(operators.map(function (token) {
-                var 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
          */
@@ -10621,18 +10560,6 @@
                 }
             });
         };
-        /**
-         * Update user's basiq connections when user confirmed basiq consent
-         */
-        BasiqService.prototype.listenBasiqConcentUpdated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.BASIQ_CONSENT_UPDATED).subscribe(function (isConfirmed) {
-                if (!isConfirmed) {
-                    return;
-                }
-                _this.updateConnections().pipe(operators.take(1)).subscribe();
-            });
-        };
         return BasiqService;
     }(RestService));
     BasiqService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });