taxtank-core 0.21.10 → 0.21.11

package/bundles/taxtank-core.umd.js

@@ -3376,20 +3376,34 @@
          * check if bank account related to work tank
          */
         BankAccount.prototype.isWorkTank = function () {
-            return this.tankType === exports.TankTypeEnum.WORK;
+            return !this.isPropertyTank() && !this.isSoleTank();
         };
         /**
          * check if bank account related to work tank
          */
         BankAccount.prototype.isPropertyTank = function () {
-            return this.tankType === exports.TankTypeEnum.PROPERTY;
+            return !!this.bankAccountProperties.length;
         };
         /**
          * check if bank account related to sole tank
          */
         BankAccount.prototype.isSoleTank = function () {
-            return this.tankType === exports.TankTypeEnum.SOLE;
+            return !!this.businessAllocations.length;
         };
+        Object.defineProperty(BankAccount.prototype, "tankType", {
+            get: function () {
+                switch (true) {
+                    case this.isPropertyTank():
+                        return exports.TankTypeEnum.PROPERTY;
+                    case this.isSoleTank():
+                        return exports.TankTypeEnum.SOLE;
+                    default:
+                        return exports.TankTypeEnum.WORK;
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
          * Get Bank account property by id
          * @param id Id of property
@@ -8749,11 +8763,18 @@
             return this.method === exports.VehicleClaimMethodEnum.KMS;
         };
         VehicleClaim.prototype.isWorkTank = function () {
-            return this.tankType === exports.TankTypeEnum.WORK;
+            return !this.business;
         };
         VehicleClaim.prototype.isSoleTank = function () {
-            return this.tankType === exports.TankTypeEnum.SOLE;
+            return !!this.business;
         };
+        Object.defineProperty(VehicleClaim.prototype, "tankType", {
+            get: function () {
+                return this.isSoleTank() ? exports.TankTypeEnum.SOLE : exports.TankTypeEnum.WORK;
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
          * Claim amount for KLMs method. Exists only for KLMs method.
          */
@@ -11814,6 +11835,7 @@
 
     /**
      * server sent events service
+     * https://symfony.com/doc/current/mercure.html
      */
     var SseService = /** @class */ (function () {
         function SseService(zone, jwtService, environment) {
@@ -15006,6 +15028,7 @@
 
     /**
      * Abstract form class
+     * @TODO rename to AbstractFormGroup
      */
     var AbstractForm = /** @class */ (function (_super) {
         __extends(AbstractForm, _super);
@@ -15032,6 +15055,10 @@
             this.onSubmit.emit(model);
             return model;
         };
+        AbstractForm.prototype.addControl = function (name, control, options) {
+            _super.prototype.addControl.call(this, name, control, options);
+            return this;
+        };
         AbstractForm.prototype.createModelInstance = function (data) {
             if (data === void 0) { data = {}; }
             return classTransformer.plainToClass(this.modelClass, data);
@@ -15039,30 +15066,61 @@
         return AbstractForm;
     }(forms.FormGroup));
 
+    function conditionalValidator(condition, validator) {
+        return function (control) {
+            revalidateOnChanges(control);
+            if (control && control.parent) {
+                if (condition(control.parent)) {
+                    return validator(control);
+                }
+            }
+            return null;
+        };
+    }
     /**
-     * Form with bank account loan details
+     * Conditional validator depends on other fields and should be updated on each form value change
      */
-    var BankAccountLoanForm = /** @class */ (function (_super) {
-        __extends(BankAccountLoanForm, _super);
-        function BankAccountLoanForm(loan) {
-            if (loan === void 0) { loan = classTransformer.plainToClass(Loan, {}); }
-            return _super.call(this, {
-                type: new forms.FormControl(loan.type, forms.Validators.required),
-                amount: new forms.FormControl(loan.amount, forms.Validators.required),
-                repaymentType: new forms.FormControl(loan.repaymentType, forms.Validators.required),
-                interestRate: new forms.FormControl(loan.interestRate, [forms.Validators.required, forms.Validators.min(0), forms.Validators.max(100)]),
-                interestType: new forms.FormControl(loan.interestType, forms.Validators.required),
-                availableRedraw: new forms.FormControl(loan.availableRedraw, forms.Validators.required),
-                commencementDate: new forms.FormControl(loan.commencementDate, forms.Validators.required),
-                repaymentAmount: new forms.FormControl(loan.repaymentAmount, forms.Validators.required),
-                repaymentFrequency: new forms.FormControl(loan.repaymentFrequency, forms.Validators.required)
-            }, loan) || this;
+    function revalidateOnChanges(control) {
+        if (control && control.parent && !control['_revalidateOnChanges']) {
+            control['_revalidateOnChanges'] = true;
+            control.parent.valueChanges.pipe(operators.distinctUntilChanged(function (a, b) { return JSON.stringify(a) === JSON.stringify(b); }))
+                .subscribe(function () {
+                control.updateValueAndValidity({ emitEvent: false });
+            });
         }
-        return BankAccountLoanForm;
-    }(AbstractForm));
+        return;
+    }
+
+    /**
+     * Validator that check if sum amount of provided fields is greater than provided sum
+     * @param field to check in each formArray element
+     * @param summary to compare with fields sum
+     * @param fieldAlias to show it in error message
+     */
+    function fieldsSumValidator(field, summary, fieldAlias) {
+        if (summary === void 0) { summary = 100; }
+        return function (formArray) {
+            // calculate sum of desired fields in formArray control
+            var fieldsSum = formArray['controls']
+                .reduce(function (acc, group) { return acc += group.get(field).value; }, 0);
+            if (fieldsSum <= summary) {
+                return null;
+            }
+            else {
+                return {
+                    fieldsSum: {
+                        name: field,
+                        alias: fieldAlias,
+                        summary: summary
+                    }
+                };
+            }
+        };
+    }
 
     /**
      * Form array with bank account properties
+     * @TODO create AbstractFormArray
      */
     var BankAccountPropertiesForm = /** @class */ (function (_super) {
         __extends(BankAccountPropertiesForm, _super);
@@ -15070,20 +15128,37 @@
             if (bankAccountProperties === void 0) { bankAccountProperties = [classTransformer.plainToClass(BankAccountProperty, {})]; }
             return _super.call(this, bankAccountProperties.map(function (bankAccountProperty) {
                 return new forms.FormGroup({
-                    property: new forms.FormControl(bankAccountProperty.property, forms.Validators.required),
+                    property: new forms.FormControl(bankAccountProperty === null || bankAccountProperty === void 0 ? void 0 : bankAccountProperty.property, forms.Validators.required),
                     percent: new forms.FormControl(bankAccountProperty.percent, forms.Validators.required)
                 });
-            })) || this;
+            }), [
+                conditionalValidator(function (control) { return control.get('tankType').value === exports.TankTypeEnum.PROPERTY; }, forms.Validators.required),
+                fieldsSumValidator('percent', 100)
+            ]) || this;
         }
         BankAccountPropertiesForm.prototype.add = function () {
             this.push(new forms.FormGroup({
                 property: new forms.FormControl(null, forms.Validators.required),
-                percent: new forms.FormControl({
-                    value: 100,
-                    disabled: !this.at(0).contains('percent')
-                }, forms.Validators.required)
-            }));
-        };
+                // @TODO disable for loans
+                percent: new forms.FormControl({ value: 100, disabled: !this.at(0).contains('percent') }, forms.Validators.required),
+                // @TODO enable for loans
+                // amount: new FormControl(
+                //   {value: this.bankAccount.currentBalance * bankAccountProperty.percent / 100},
+                //   [Validators.required, Validators.max(Math.abs(this.bankAccount.currentBalance))]
+                // ),
+            }));
+        };
+        // @TODO enable for loans
+        // /**
+        //  * Recalculate property percentage for current property form group and round to no more than 3 decimal places
+        //  * @param amount: new control value
+        //  * @param currentPropertyGroup for which amount will be recalculated
+        //  */
+        // recalculatePropertyPercentage(amount: number, currentPropertyGroup: FormGroup): void {
+        //   currentPropertyGroup.get('percent').setValue(
+        //     roundTo(amount / this.bankAccount.currentBalance, 3)
+        //   );
+        // }
         BankAccountPropertiesForm.prototype.enablePercent = function () {
             this.controls.forEach(function (propertyFormGroup) {
                 propertyFormGroup.get('percent').enable();
@@ -15097,6 +15172,57 @@
         return BankAccountPropertiesForm;
     }(forms.FormArray));
 
+    var BankAccountAllocationForm = /** @class */ (function (_super) {
+        __extends(BankAccountAllocationForm, _super);
+        function BankAccountAllocationForm(bankAccount) {
+            var _this = _super.call(this, {
+                tankType: new forms.FormControl(bankAccount ? bankAccount.tankType : null, forms.Validators.required),
+            }, classTransformer.plainToClass(BankAccount, bankAccount || {})) || this;
+            _this.bankAccount = bankAccount;
+            if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isPropertyTank()) {
+                _this.addControl('bankAccountProperties', new BankAccountPropertiesForm(bankAccount.bankAccountProperties));
+            }
+            _this.watchTankType();
+            return _this;
+        }
+        BankAccountAllocationForm.prototype.watchTankType = function () {
+            var _this = this;
+            this.get('tankType').valueChanges.subscribe(function (tankType) {
+                var _a;
+                // @TODO vik add businessAllocation
+                if (tankType === exports.TankTypeEnum.PROPERTY) {
+                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm((_a = _this.bankAccount) === null || _a === void 0 ? void 0 : _a.bankAccountProperties));
+                }
+                else {
+                    _this.removeControl('bankAccountProperties');
+                }
+            });
+        };
+        return BankAccountAllocationForm;
+    }(AbstractForm));
+
+    /**
+     * Form with bank account loan details
+     */
+    var BankAccountLoanForm = /** @class */ (function (_super) {
+        __extends(BankAccountLoanForm, _super);
+        function BankAccountLoanForm(loan) {
+            if (loan === void 0) { loan = classTransformer.plainToClass(Loan, {}); }
+            return _super.call(this, {
+                type: new forms.FormControl(loan.type, forms.Validators.required),
+                amount: new forms.FormControl(loan.amount, forms.Validators.required),
+                repaymentType: new forms.FormControl(loan.repaymentType, forms.Validators.required),
+                interestRate: new forms.FormControl(loan.interestRate, [forms.Validators.required, forms.Validators.min(0), forms.Validators.max(100)]),
+                interestType: new forms.FormControl(loan.interestType, forms.Validators.required),
+                availableRedraw: new forms.FormControl(loan.availableRedraw, forms.Validators.required),
+                commencementDate: new forms.FormControl(loan.commencementDate, forms.Validators.required),
+                repaymentAmount: new forms.FormControl(loan.repaymentAmount, forms.Validators.required),
+                repaymentFrequency: new forms.FormControl(loan.repaymentFrequency, forms.Validators.required)
+            }, loan) || this;
+        }
+        return BankAccountLoanForm;
+    }(AbstractForm));
+
     /**
      * Form is using for import basiq bank accounts.
      * Basiq accounts has all data except tank type, properties and loan partially
@@ -15104,40 +15230,16 @@
     var BankAccountImportForm = /** @class */ (function (_super) {
         __extends(BankAccountImportForm, _super);
         function BankAccountImportForm(bankAccount) {
-            var _this = _super.call(this, {
-                tankType: new forms.FormControl(bankAccount.tankType, forms.Validators.required),
-            }, bankAccount) || this;
+            var _this = _super.call(this, bankAccount) || this;
             if (bankAccount.isLoan()) {
                 _this.addControl('loan', new BankAccountLoanForm(bankAccount.loan));
             }
             // basiq account import form should be disabled (unchecked) by default
             _this.disable();
-            _this.listenEvents();
             return _this;
         }
-        BankAccountImportForm.prototype.listenEvents = function () {
-            this.listenTankTypeChanges();
-        };
-        /**
-         * Add/Remove bank account properties form depends on selected tank type
-         */
-        BankAccountImportForm.prototype.listenTankTypeChanges = function () {
-            var _this = this;
-            this.get('tankType').valueChanges.subscribe(function (tankType) {
-                if (tankType === exports.TankTypeEnum.PROPERTY) {
-                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
-                    // property percent allowed only for loan bank accounts
-                    if (!_this.contains('loan')) {
-                        _this.get('bankAccountProperties').disablePercent();
-                    }
-                }
-                else {
-                    _this.removeControl('bankAccountProperties');
-                }
-            });
-        };
         return BankAccountImportForm;
-    }(AbstractForm));
+    }(BankAccountAllocationForm));
 
     /**
      * Form is using for single manual bank account creation (not Basiq)
@@ -15145,20 +15247,18 @@
     var BankAccountAddManualForm = /** @class */ (function (_super) {
         __extends(BankAccountAddManualForm, _super);
         function BankAccountAddManualForm(connection) {
-            var _this = _super.call(this, {
-                type: new forms.FormControl(null, forms.Validators.required),
-                accountName: new forms.FormControl(null, forms.Validators.required),
-                currentBalance: new forms.FormControl(null, forms.Validators.required),
-                accountNumber: new forms.FormControl(null, [forms.Validators.required, forms.Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]),
-                tankType: new forms.FormControl(null, forms.Validators.required),
-            }, classTransformer.plainToClass(BankAccount, {})) || this;
+            var _this = _super.call(this) || this;
             _this.connection = connection;
+            _this
+                .addControl('type', new forms.FormControl(null, forms.Validators.required))
+                .addControl('accountName', new forms.FormControl(null, forms.Validators.required))
+                .addControl('currentBalance', new forms.FormControl(null, forms.Validators.required))
+                .addControl('accountNumber', new forms.FormControl(null, [forms.Validators.required, forms.Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]));
             _this.listenEvents();
             return _this;
         }
         BankAccountAddManualForm.prototype.listenEvents = function () {
             this.listenTypeChanges();
-            this.listenTankTypeChanges();
         };
         /**
          * Add/Remove loan form depends on selected bank account type
@@ -15168,38 +15268,9 @@
             this.get('type').valueChanges.subscribe(function (type) {
                 if (BankAccount.loanTypes.includes(type)) {
                     _this.addControl('loan', new BankAccountLoanForm());
-                    // property percent allowed only for loan bank accounts
-                    if (_this.contains('bankAccountProperties')) {
-                        _this.get('bankAccountProperties').enablePercent();
-                    }
                 }
                 else {
                     _this.removeControl('loan');
-                    // property percent allowed only for loan bank accounts
-                    if (_this.contains('bankAccountProperties')) {
-                        _this.get('bankAccountProperties').disablePercent();
-                    }
-                }
-            });
-        };
-        /**
-         * Add/Remove bank account properties form depends on selected tank type
-         */
-        BankAccountAddManualForm.prototype.listenTankTypeChanges = function () {
-            var _this = this;
-            this.get('tankType').valueChanges.subscribe(function (tankType) {
-                if (tankType === exports.TankTypeEnum.PROPERTY) {
-                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
-                    // property percent allowed only for loan bank accounts
-                    if (_this.contains('loan')) {
-                        _this.get('bankAccountProperties').enablePercent();
-                    }
-                    else {
-                        _this.get('bankAccountProperties').disablePercent();
-                    }
-                }
-                else {
-                    _this.removeControl('bankAccountProperties');
                 }
             });
         };
@@ -15210,7 +15281,7 @@
             return _super.prototype.submit.call(this, { bankConnection: this.connection });
         };
         return BankAccountAddManualForm;
-    }(AbstractForm));
+    }(BankAccountAllocationForm));
     BankAccountAddManualForm.accountNumberPattern = '^[0-9]{6}[ ]{1}[0-9]{1,}$';
 
     /**
@@ -15343,31 +15414,6 @@
         };
     }
 
-    function conditionalValidator(condition, validator) {
-        return function (control) {
-            revalidateOnChanges(control);
-            if (control && control.parent) {
-                if (condition(control.parent)) {
-                    return validator(control);
-                }
-            }
-            return null;
-        };
-    }
-    /**
-     * Conditional validator depends on other fields and should be updated on each form value change
-     */
-    function revalidateOnChanges(control) {
-        if (control && control.parent && !control['_revalidateOnChanges']) {
-            control['_revalidateOnChanges'] = true;
-            control.parent.valueChanges.pipe(operators.distinctUntilChanged(function (a, b) { return JSON.stringify(a) === JSON.stringify(b); }))
-                .subscribe(function () {
-                control.updateValueAndValidity({ emitEvent: false });
-            });
-        }
-        return;
-    }
-
     /**
      * Regular expressions that are used to check password strength and valid values
      */
@@ -16039,6 +16085,7 @@
     exports.Bank = Bank;
     exports.BankAccount = BankAccount;
     exports.BankAccountAddManualForm = BankAccountAddManualForm;
+    exports.BankAccountAllocationForm = BankAccountAllocationForm;
     exports.BankAccountCalculationService = BankAccountCalculationService;
     exports.BankAccountChartData = BankAccountChartData;
     exports.BankAccountCollection = BankAccountCollection;