taxtank-core 0.16.5 → 0.16.8

package/bundles/taxtank-core.umd.js

@@ -3951,8 +3951,7 @@
     exports.PropertyCategoryListEnum = void 0;
     (function (PropertyCategoryListEnum) {
         PropertyCategoryListEnum[PropertyCategoryListEnum["OWNER_OCCUPIED"] = 3] = "OWNER_OCCUPIED";
-        // @TODO prod use 5
-        PropertyCategoryListEnum[PropertyCategoryListEnum["VACANT_LAND"] = 6] = "VACANT_LAND";
+        PropertyCategoryListEnum[PropertyCategoryListEnum["VACANT_LAND"] = 5] = "VACANT_LAND";
     })(exports.PropertyCategoryListEnum || (exports.PropertyCategoryListEnum = {}));
 
     exports.TaxExemptionMetadataEnum = void 0;
@@ -4372,10 +4371,10 @@
         return IncomeSourceType;
     }(AbstractModel));
 
-    exports.IncomeSourceTypeListSalaryEnum = void 0;
+    var IncomeSourceTypeListSalaryEnum;
     (function (IncomeSourceTypeListSalaryEnum) {
         IncomeSourceTypeListSalaryEnum[IncomeSourceTypeListSalaryEnum["BONUSES"] = 1] = "BONUSES";
-    })(exports.IncomeSourceTypeListSalaryEnum || (exports.IncomeSourceTypeListSalaryEnum = {}));
+    })(IncomeSourceTypeListSalaryEnum || (IncomeSourceTypeListSalaryEnum = {}));
 
     exports.IncomeSourceTypeListWorkEnum = void 0;
     (function (IncomeSourceTypeListWorkEnum) {
@@ -4401,7 +4400,7 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         IncomeSourceType.prototype.isSalary = function () {
-            return !!exports.IncomeSourceTypeListSalaryEnum[this.id];
+            return !!IncomeSourceTypeListSalaryEnum[this.id];
         };
         IncomeSourceType.prototype.isWork = function () {
             return !!exports.IncomeSourceTypeListWorkEnum[this.id];
@@ -6090,6 +6089,11 @@
         DepreciationWriteOffAmountEnum[DepreciationWriteOffAmountEnum["BORROWING_EXPENSES"] = 100] = "BORROWING_EXPENSES";
     })(exports.DepreciationWriteOffAmountEnum || (exports.DepreciationWriteOffAmountEnum = {}));
 
+    exports.IncomeSourceTypeListSoleEnum = void 0;
+    (function (IncomeSourceTypeListSoleEnum) {
+        IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
+    })(exports.IncomeSourceTypeListSoleEnum || (exports.IncomeSourceTypeListSoleEnum = {}));
+
     exports.InviteStatusEnum = void 0;
     (function (InviteStatusEnum) {
         InviteStatusEnum[InviteStatusEnum["PENDING"] = 1] = "PENDING";
@@ -8897,7 +8901,7 @@
             clientIncomeTypes: ['sole']
         }),
         _a[AccountSetupItemsEnum.TRANSACTION] = classTransformer.plainToClass(AccountSetupItem, {
-            title: 'Allocation transactions',
+            title: 'Allocate transactions',
             description: 'Select one or multiple transactions, the category from the dropdown and attach your receipt. It’s that simple to capture every possible deduction, and keep organised all throughout the year.',
             url: '/client/bank-feeds',
             urlFragment: 'allocationProductTour',
@@ -8916,6 +8920,8 @@
         ClientIncomeTypesService.prototype.get = function () {
             var _this = this;
             if (!this.cache) {
+                // @TODO alex fix everywhere, start with rest service
+                this.cache = classTransformer.plainToClass(ClientIncomeTypes, {});
                 this.http.get(this.environment.apiV2 + "/client-income-types")
                     .pipe(operators.map(function (response) {
                     return classTransformer.plainToClass(ClientIncomeTypes, response['hydra:member'][0], { excludePrefixes: ['@'] });
@@ -9054,6 +9060,7 @@
          */
         RestService.prototype.get = function () {
             if (!this.cache) {
+                this.cache = [];
                 this.fetch().subscribe();
             }
             return this.cacheSubject.asObservable();
@@ -10043,12 +10050,22 @@
         AccountSetupService.prototype.get = function () {
             var _this = this;
             if (!this.cache) {
-                this.clientIncomeTypesService.get().subscribe(function (incomeTypes) {
+                this.cache = new AccountSetupItemCollection([]);
+                this.clientIncomeTypesService.get()
+                    .pipe(
+                // we need account setup only when user selected at least one income type
+                operators.filter(function (incomeTypes) { return !!incomeTypes.length; }), operators.mergeMap(function (incomeTypes) {
                     _this.clientIncomeTypesId = incomeTypes.id;
-                    rxjs.combineLatest(_this.createBatch(incomeTypes)).subscribe(function (items) {
-                        _this.cache = new AccountSetupItemCollection(items);
-                        _this.cacheSubject.next(_this.cache);
-                    });
+                    return _this.createBatch(incomeTypes);
+                }))
+                    .subscribe(function (items) {
+                    switch (true) {
+                        case !_this.cache:
+                        case _this.cache.getBy('isCompleted', true).length !== items.getBy('isCompleted', true).length:
+                        case _this.cache.length !== items.length:
+                            _this.cache = cloneDeep__default["default"](items);
+                            _this.cacheSubject.next(_this.cache);
+                    }
                 });
             }
             return this.cacheSubject.asObservable();
@@ -10068,6 +10085,9 @@
                 if (result.length) {
                     item.isCompleted = true;
                 }
+                else {
+                    item.isCompleted = false;
+                }
                 return item;
             }));
         };
@@ -10079,7 +10099,7 @@
             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.SALARY)));
+                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(exports.IncomeSourceTypeEnum.WORK)));
             }
             // Other income item is completed when user added at least one other income source
             if (incomeTypes.dividends || incomeTypes.other) {
@@ -10105,7 +10125,7 @@
             // }
             // Allocation item is completed when user added at least one transaction allocation
             batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));
-            return batch;
+            return rxjs.combineLatest(batch).pipe(operators.map(function (items) { return new AccountSetupItemCollection(items); }));
         };
         /**
          * @TODO work with collection when services refactored
@@ -10119,15 +10139,15 @@
          * Show logbook item when user has at least 1 vehicle transaction
          */
         AccountSetupService.prototype.getLogbookItem = function () {
-            return rxjs.combineLatest([
-                this.transactionService.get(),
-                this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get())
-            ]).pipe(operators.map(function (_a) {
-                var _b = __read(_a, 2), transactions = _b[0], item = _b[1];
-                if (new TransactionCollection(transactions).getVehicleTransactions().length) {
-                    return item;
+            var _this = this;
+            return this.transactionService.get()
+                .pipe(
+            // @TODO Alex: remove map when services start work with collections
+            operators.map(function (transactions) { return new TransactionCollection(transactions); }), operators.mergeMap(function (transactions) {
+                if (transactions.getVehicleTransactions().length) {
+                    return _this.create(AccountSetupItemsEnum.WORK_LOGBOOK, _this.vehicleClaimService.get());
                 }
-                return null;
+                return rxjs.of(null);
             }));
         };
         return AccountSetupService;
@@ -10462,6 +10482,14 @@
                     }]
             }] });
 
+    /**
+     * 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
@@ -10481,6 +10509,7 @@
         BasiqService.prototype.listenEvents = function () {
             this.listenToBankConnectionAdded();
             this.listenNotifications();
+            this.listenBasiqConcentUpdated();
         };
         /**
          * Update user's basiq consents data on backend
@@ -10489,7 +10518,6 @@
             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));
-                return isConfirmed;
             }));
         };
         /**
@@ -10516,6 +10544,9 @@
             }
             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
@@ -10526,6 +10557,41 @@
                 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
          */
@@ -10550,6 +10616,18 @@
                 }
             });
         };
+        /**
+         * 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 });