taxtank-core 0.30.142 → 0.30.143

package/fesm2020/taxtank-core.mjs

@@ -3807,7 +3807,7 @@ var UserRolesEnum;
     UserRolesEnum["PROPERTY_TANK"] = "ROLE_USER_PROPERTY";
     UserRolesEnum["SOLE_TANK"] = "ROLE_USER_SOLE";
     UserRolesEnum["HOLDING_TANK"] = "ROLE_USER_HOLDING";
-    UserRolesEnum["SWITCH_USER"] = "ROLE_PREVIOUS_ADMIN";
+    UserRolesEnum["SWITCH_USER"] = "IS_IMPERSONATOR";
 })(UserRolesEnum || (UserRolesEnum = {}));
 
 const USER_WORK_POSITION = {
@@ -6008,13 +6008,9 @@ class BorrowingReport extends BorrowingReport$1 {
      * some fields calculated automatically until user filled them manually
      */
     static calculate(salaryForecasts, incomeSourceForecasts, clientDetails = plainToClass(AnnualClientDetails, {}), report = plainToClass(BorrowingReport, {})) {
-        if (!report.netSalary) {
-            report.netSalary = new Collection(salaryForecasts).sumBy('monthlyAmount')
-                + new IncomeSourceForecastCollection(incomeSourceForecasts).bonuses.sumBy('monthlyAmount');
-        }
-        if (!report.spouseNetSalary) {
-            report.spouseNetSalary = clientDetails.spouseMonthlyIncome;
-        }
+        report.netSalary = report.netSalary ?? new Collection(salaryForecasts).sumBy('monthlyAmount')
+            + new IncomeSourceForecastCollection(incomeSourceForecasts).bonuses.sumBy('monthlyAmount');
+        report.spouseNetSalary = report.spouseNetSalary ?? clientDetails.spouseMonthlyIncome;
         return report;
     }
     /**
@@ -21858,23 +21854,26 @@ class PropertySaleExemptionsForm extends AbstractForm {
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4717608961/Borrowing+Power+Report+-+Property+Tank
  */
 class BorrowingReportForm extends AbstractForm {
-    constructor(report) {
+    /**
+     * extra params are auto-calculated numbers used if user didn't specify manual numbers
+     */
+    constructor(report = plainToClass(BorrowingReport, {}), netSalary, spouseNetSalary) {
         super({
             netRentIncome: new FormControl(report.netRentIncome, Validators.required),
             loanRepaymentAmount: new FormControl(report.loanRepaymentAmount, Validators.required),
-            netSalary: new FormControl(report.netSalary),
-            spouseNetSalary: new FormControl(report.spouseNetSalary),
+            netSalary: new FormControl(report.netSalary ?? netSalary),
+            spouseNetSalary: new FormControl(report.spouseNetSalary ?? spouseNetSalary),
             otherLiabilities: new FormControl(report.otherLiabilities, Validators.required),
             livingExpenses: new FormControl(report.livingExpenses, Validators.required),
         }, report);
     }
     /**
-     * some fields are auto-calculated, shouldn't be updated until changedby user
+     * some fields are auto-calculated, shouldn't be updated until changed by user
      */
     submit(data = {}, includeDisabledFields = false) {
         return super.submit({
-            netSalary: this.fieldChanged('netSalary') ? this.get('netSalary').value : null,
-            spouseNetSalary: this.fieldChanged('spouseNetSalary') ? this.get('spouseNetSalary').value : null,
+            netSalary: (this.model.netSalary || this.fieldChanged('netSalary')) ? this.get('netSalary').value : null,
+            spouseNetSalary: (this.model.netSalary || this.fieldChanged('spouseNetSalary')) ? this.get('spouseNetSalary').value : null,
         }, includeDisabledFields);
     }
 }