taxtank-core 0.31.47 → 0.31.49

package/fesm2020/taxtank-core.mjs

@@ -11238,7 +11238,7 @@ class BasiqTokenService extends RestService$1 {
      * Access token to use basiq flow
      */
     get() {
-        if (this.cache && this.getCacheFirst().isExpired()) {
+        if (this.getCacheFirst() && this.getCacheFirst().isExpired()) {
             this.cache = undefined;
         }
         return super.get();
@@ -15508,11 +15508,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
         }] });
 
 class UserService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = User;
         this.collectionClass = Collection;
         this.endpointUri = 'users';
@@ -15594,13 +15591,13 @@ class UserService extends RestService$1 {
     }
     updatePhoto(photo) {
         return this.http.post(`${this.apiUrl}/photo?_method=PUT`, photo).pipe(map((photoUrl) => {
-            this.setCache([Object.assign(this.cache, { photo: photoUrl })], true);
+            this.setCache([Object.assign(this.getCacheFirst(), { photo: photoUrl })], true);
         }));
     }
     createBasiq() {
         return this.http.post(`${this.environment.apiV2}/basiq/user`, {})
             .pipe(map((basiqId) => {
-            this.setCache([Object.assign(this.cache, { basiqId })], true);
+            this.setCache([Object.assign(this.getCacheFirst(), { basiqId })], true);
             return basiqId;
         }));
     }
@@ -15622,17 +15619,14 @@ class UserService extends RestService$1 {
         this.eventDispatcherService.on(AppEventTypeEnum.BASIQ_CONSENT_UPDATED).subscribe(() => this.refreshCache());
     }
 }
-UserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+UserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 UserService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 class FinancialYearService {
     constructor(http, environment, mpService) {
@@ -19476,6 +19470,7 @@ const ENDPOINTS = {
     BASIQ_ACCOUNTS_GET: new Endpoint('GET', '\\/basiq\\/accounts'),
     BASIQ_TOKEN_GET: new Endpoint('GET', '\\/basiq\\/tokens'),
     BASIQ_DELETE: new Endpoint('PUT', '\\/bank-connections/\\d+\\/remove-basiq'),
+    BASIQ_USER_POST: new Endpoint('POST', '\\/basiq\\/user'),
     BUDGETS_GET: new Endpoint('GET', '\\/budgets'),
     BUDGETS_POST: new Endpoint('POST', '\\/budgets'),
     BUDGETS_PUT: new Endpoint('PUT', '\\/budgets\\/\\d+'),
@@ -20438,29 +20433,6 @@ class AbstractForm extends UntypedFormGroup {
     }
 }
 
-/**
- * Validator for address, check if corelogic suggestion selected correctly
- */
-function addressCorelogicValidator() {
-    return (form) => {
-        // we are interested in corelogic ids only for Australian addresses
-        if (!form.isAustraliaSelected()) {
-            return null;
-        }
-        // we need at least corelogic locality id to get growth percent
-        const locIdControl = form.get('corelogicLocId');
-        const refIdControl = form.get('corelogicRefId');
-        if (locIdControl.enabled && locIdControl.hasError('required')) {
-            return { address: 'City, state or postal code not specified' };
-        }
-        // @TODO Artem why?
-        // if (refIdControl.enabled && refIdControl.hasError('required')) {
-        //   return { address: 'Street number not specified' };
-        // }
-        return null;
-    };
-}
-
 /**
  * Address form. Works with corelogic or manual address
  */
@@ -20474,20 +20446,19 @@ class AddressForm extends AbstractForm {
             searchQuery: new UntypedFormControl(address?.address ? address.nameLong : null, Validators.required),
             type: new UntypedFormControl(address?.type || AddressTypeEnum.STREET, Validators.required),
             // corelogic fields (required for Australia and disabled for other countries)
-            corelogicLocId: new UntypedFormControl({ value: address?.corelogicLocId, disabled: true }, Validators.required),
+            // @TODO not required temporary, waiting for corelogic support response why it can't find some suburbs (like Hamilton Island)
+            corelogicLocId: new UntypedFormControl({ value: address?.corelogicLocId, disabled: true }),
             corelogicRefId: new UntypedFormControl({ value: address?.corelogicRefId, disabled: true }),
-            // @TODO Artem why?
-            // corelogicRefId: new UntypedFormControl({value: address?.corelogicRefId, disabled: true}, Validators.required),
             // manual fields (using when address not found in corelogic)
             unitNumber: new UntypedFormControl({ value: address?.unitNumber, disabled: true }),
-            address: new UntypedFormControl({ value: address?.address, disabled: true }, Validators.required),
+            address: new UntypedFormControl({ value: address?.address, disabled: true }),
             streetNumber: new UntypedFormControl({ value: address?.streetNumber, disabled: true }, [Validators.required, Validators.pattern(AddressForm.streetNumberPattern)]),
             street: new UntypedFormControl({ value: address?.street, disabled: true }, Validators.required),
             city: new UntypedFormControl({ value: address?.city, disabled: true }, Validators.required),
             state: new UntypedFormControl({ value: address?.state, disabled: true }, Validators.required),
             postcode: new UntypedFormControl({ value: address?.postcode, disabled: true }, Validators.required),
             country: new UntypedFormControl({ value: address?.country || Country.australia, disabled: true }, Validators.required)
-        }, address, addressCorelogicValidator());
+        }, address);
         /**
          * Emit event to search address in corelogic when user filled enough data for corelogic
          */
@@ -20516,13 +20487,13 @@ class AddressForm extends AbstractForm {
      */
     onSelectSuggestion(suggestion) {
         // if no suggestion then 'Add manually' option selected
-        if (!suggestion) {
+        if (!suggestion && !this.isManual) {
             this.switchToManual();
             return;
         }
         this.patchValue({
-            corelogicLocId: suggestion.localityId,
-            corelogicRefId: suggestion.propertyId
+            corelogicLocId: suggestion?.localityId ?? null,
+            corelogicRefId: suggestion?.propertyId ?? null
         });
     }
     /**