taxtank-core 0.32.10 → 0.32.11

package/fesm2022/taxtank-core.mjs

@@ -4,7 +4,7 @@ import * as i1$1 from '@angular/common';
 import { formatDate, CommonModule, CurrencyPipe, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { map, mergeMap, filter, first as first$1, catchError, take, switchMap, finalize, debounceTime, distinctUntilChanged, delay } from 'rxjs/operators';
+import { map, mergeMap, filter, first as first$1, catchError, take, switchMap, finalize, debounceTime, distinctUntilChanged, startWith, delay } from 'rxjs/operators';
 import { ReplaySubject, Subject, Observable, throwError, combineLatest, BehaviorSubject, forkJoin, of, from, merge as merge$1 } from 'rxjs';
 import { plainToClass, Type, Transform, Exclude, Expose, classToPlain } from 'class-transformer';
 import get from 'lodash/get';
@@ -40,6 +40,7 @@ import html2pdf from 'html2pdf.js';
 import * as xlsx from 'xlsx';
 import * as FileSaver from 'file-saver';
 import isEqual from 'lodash/isEqual';
+import { RxwebValidators } from '@rxweb/reactive-form-validators';
 
 /**
  * https://api-uat.corelogic.asia/property/au/v2/suggest.json
@@ -1654,6 +1655,7 @@ var MonthNumberEnum;
 const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
 
 /**
+ * @TODO refactor with Map
  * List of collections grouped by passed property
  */
 class CollectionDictionary {
@@ -1834,7 +1836,7 @@ class Collection {
     groupBy(path = 'id') {
         return new CollectionDictionary(this, path);
     }
-    indexBy(path) {
+    indexBy(path = 'id') {
         return new Dictionary(this.items, path);
     }
     filter(callback) {
@@ -8186,6 +8188,7 @@ class VehicleExpenseCollection extends Collection {
 }
 
 /**
+ * @TODO refactor with Map
  * List of objects grouped by passed property
  */
 class Dictionary {
@@ -8194,10 +8197,6 @@ class Dictionary {
         if (!items.length) {
             return;
         }
-        // Do nothing if provided path was not found in the 1st item
-        if (!hasIn(items[0], path.split('.')[0])) {
-            return;
-        }
         this.groupItems(items, path);
     }
     add(key, value) {
@@ -8214,6 +8213,10 @@ class Dictionary {
         return Object.values(this.items);
     }
     groupItems(items, path) {
+        // Do nothing if provided path was not found in the 1st item
+        if (!hasIn(items[0], path.split('.')[0])) {
+            return;
+        }
         items.forEach((item) => {
             let key = get(item, path);
             // if object does not have property for grouping it will be grouped as 'other'
@@ -8226,6 +8229,9 @@ class Dictionary {
     get keys() {
         return Object.keys(this.items);
     }
+    get length() {
+        return this.keys.length;
+    }
 }
 
 class SoleBusinessLossesCollection extends Collection {
@@ -10345,10 +10351,12 @@ class Budget extends Budget$1 {
     }
 }
 __decorate([
-    Type(() => BudgetRule)
+    Type(() => BudgetRule),
+    Expose()
 ], Budget.prototype, "rules", void 0);
 __decorate([
-    Type(() => User)
+    Type(() => User),
+    Expose()
 ], Budget.prototype, "user", void 0);
 
 class TaxReturnCategory extends TaxReturnCategory$1 {
@@ -20320,6 +20328,7 @@ class AbstractForm extends UntypedFormGroup {
     // @TODO vik required, otherwise modelClass won't exist
     model, validatorOrOpts, asyncValidator) {
         super(controls, validatorOrOpts, asyncValidator);
+        this.excludeExtraneousValues = false;
         /**
          * @TODO Alex bad name, it's also about unchanged
          * Flag display if some form values changed
@@ -20379,7 +20388,7 @@ class AbstractForm extends UntypedFormGroup {
      * @param data
      */
     createModelInstance(data = {}) {
-        return plainToClass(this.modelClass, data);
+        return plainToClass(this.modelClass, data, { excludeExtraneousValues: this.excludeExtraneousValues });
     }
     /**
      * emit current form values
@@ -20596,17 +20605,26 @@ class AddressForm extends AbstractForm {
 class BudgetForm extends AbstractForm {
     constructor(budget) {
         super({
-            rules: new UntypedFormArray((budget.rules || [plainToClass(BudgetRule, {})]).map((rule) => new UntypedFormGroup({
-                chartAccounts: new UntypedFormControl(rule.chartAccounts, Validators.required),
-                amount: new UntypedFormControl(rule.amount, Validators.required)
-            })))
+            category: new UntypedFormControl(),
+            searchQuery: new UntypedFormControl(''),
+            rules: new UntypedFormArray((budget.rules || [plainToClass(BudgetRule, {})]).map((budgetRule) => BudgetForm.createRuleFormGroup(budgetRule))),
         }, budget);
-        this.filteredRules = this.rulesArray.controls;
+        this.excludeExtraneousValues = true;
+        combineLatest([
+            this.get('category').valueChanges.pipe(startWith(null)),
+            this.get('searchQuery').valueChanges.pipe(startWith(null))
+        ]).subscribe(() => this.filterRules());
+        this.total = budget.rulesCollection.sumBy('amount');
+        this.get('rules').valueChanges.subscribe((rules) => {
+            this.total = new Collection(rules).sumBy('amount');
+        });
     }
     get rulesArray() {
         return this.get('rules');
     }
-    filterRules(searchQuery, categories) {
+    filterRules() {
+        const category = this.get('category').value;
+        const searchQuery = this.get('searchQuery').value;
         let filteredRules = this.rulesArray.controls;
         if (searchQuery) {
             filteredRules = filteredRules.filter((ruleGroup) => {
@@ -20618,24 +20636,31 @@ class BudgetForm extends AbstractForm {
                 return chartAccountsName.includes(searchQuery) || ruleAmount.includes(searchQuery);
             });
         }
-        filteredRules = filteredRules.filter((ruleGroup) => {
-            const chartAccounts = ruleGroup.get('chartAccounts').value;
-            if (!chartAccounts) {
-                return true;
-            }
-            return categories.includes(chartAccounts?.category);
-        });
-        this.filteredRules = filteredRules;
+        if (category) {
+            filteredRules = filteredRules.filter((ruleGroup) => {
+                const chartAccounts = ruleGroup.get('chartAccounts').value;
+                if (!chartAccounts) {
+                    return true;
+                }
+                return chartAccounts.category === category;
+            });
+        }
+        this.filteredRules = new Map(filteredRules.map((rule) => [this.rulesArray.controls.indexOf(rule), rule]));
     }
-    addRule() {
-        const formGroup = new UntypedFormGroup({
-            chartAccounts: new UntypedFormControl(null, Validators.required),
-            amount: new UntypedFormControl(null, Validators.required)
+    static createRuleFormGroup(budgetRule) {
+        return new UntypedFormGroup({
+            chartAccounts: new UntypedFormControl(budgetRule.chartAccounts, [Validators.required, RxwebValidators.unique()]),
+            amount: new UntypedFormControl(budgetRule.amount, Validators.required)
         });
-        this.rulesArray.push(formGroup);
+    }
+    addRule(budgetRule = plainToClass(BudgetRule, {})) {
+        const rule = BudgetForm.createRuleFormGroup(budgetRule);
+        this.rulesArray.push(rule);
+        this.filteredRules.set(this.rulesArray.controls.indexOf(rule), rule);
     }
     deleteRule(index) {
         this.rulesArray.removeAt(index);
+        this.filteredRules.delete(index);
     }
 }