taxtank-core 0.33.69 → 0.33.71

package/esm2022/src/lib/services/xlsx/xlsx.service.mjs

@@ -39,15 +39,8 @@ export class XlsxService {
             // add caption for the current table
             xlsx.utils.sheet_add_aoa(worksheet, [[data.caption?.innerText]], { origin: -1 });
             // Prepare to add table data to the worksheet, processing each cell
-            const rows = Array.from(data.rows).map((row) => Array.from(row.cells).map((cell) => {
-                const cellValue = cell.innerText;
-                // Convert currency strings like "$0.00" to numbers
-                if (/^-?\$/.test(cellValue)) {
-                    // @TODO vik fix
-                    // cellValue = parseFloat(cellValue.replace('$', ''));
-                }
-                return cellValue;
-            }));
+            const rows = Array.from(data.rows)
+                .map((row) => Array.from(row.cells).map(cell => this.htmlToXlsCell(cell)));
             // Add the processed table data to the worksheet
             xlsx.utils.sheet_add_aoa(worksheet, rows, { origin: -1 });
             // set empty row after current table
@@ -56,6 +49,21 @@ export class XlsxService {
         xlsx.utils.book_append_sheet(workbook, worksheet);
         return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });
     }
+    htmlToXlsCell(cell) {
+        const cellValue = cell.innerText;
+        // regex to check currency value
+        return /^-?\$/.test(cellValue) ? this.currencyToNumber(cellValue) : cellValue;
+    }
+    /**
+     * function which reconverts values from customCurrencyPipe
+     * @param cellValue - string with $ and possibly comma.  $123,123.03
+     * @returns value without $ and comma. like 123123.03
+     */
+    currencyToNumber(cellValue) {
+        // remove dollar sign and comma
+        cellValue = cellValue.replace(/[$,]/g, '');
+        return parseFloat(cellValue);
+    }
     /**
      * @TODO vik/artem work with ExportDataTable instead of ExportableCollection
      * @TODO vik/artem why so much code? here is 6 rows solution https://stackoverflow.com/questions/64939994/how-to-export-array-of-objects-to-an-excel-in-angular-8
@@ -91,4 +99,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                     providedIn: 'root'
                 }]
         }] });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"xlsx.service.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/services/xlsx/xlsx.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport * as xlsx from 'xlsx';\nimport * as FileSaver from 'file-saver';\nimport { ExportableCollection } from '../../collections';\nimport { ExportDataTable } from '../../models/export/export-data-table';\n\nconst EXCEL_TYPE: string = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'\n\n@Injectable({\n  providedIn: 'root'\n})\n\n/**\n * Service to work with XLSX (generate, download, e.t.c.)\n */\nexport class XlsxService {\n  /**\n   * Export file form provided HTML tables\n   */\n  exportTables(tables: NodeListOf<HTMLTableElement>, title: string, fileName: string): void {\n    const excelFile: BlobPart = this.generateFromTables(tables, title);\n    const data: Blob = new Blob([excelFile], {\n      type: EXCEL_TYPE\n    });\n\n    FileSaver.saveAs(data, `${fileName}.xlsx`);\n  }\n\n  private generateFromTables(tables: NodeListOf<HTMLTableElement>, title?: string): BlobPart {\n    // create new workbook\n    const workbook: xlsx.WorkBook = xlsx.utils.book_new();\n    // create empty worksheet\n    const worksheet: xlsx.WorkSheet = {\n      SheetNames: [],\n      Sheets: {}\n    };\n\n    tables.forEach((data: HTMLTableElement) => {\n      // add caption for the current table\n      xlsx.utils.sheet_add_aoa(worksheet, [[data.caption?.innerText]], { origin: -1 });\n      // Prepare to add table data to the worksheet, processing each cell\n      const rows = Array.from(data.rows).map((row: HTMLTableRowElement) => Array.from(row.cells).map((cell: HTMLTableCellElement) => {\n        const cellValue: string | number = cell.innerText;\n        // Convert currency strings like \"$0.00\" to numbers\n        if (/^-?\\$/.test(cellValue)) {\n          // @TODO vik fix\n          // cellValue = parseFloat(cellValue.replace('$', ''));\n        }\n\n        return cellValue;\n      }));\n      // Add the processed table data to the worksheet\n      xlsx.utils.sheet_add_aoa(worksheet, rows, { origin: -1 });\n      // set empty row after current table\n      xlsx.utils.sheet_add_aoa(worksheet, [], { origin: -1 });\n    });\n\n    xlsx.utils.book_append_sheet(workbook, worksheet);\n    return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });\n  }\n\n  getFileName = (name: string) => {\n    const sheetName = name || 'ExportResult';\n    const fileName = `${sheetName}`;\n    return {\n      sheetName,\n      fileName\n    };\n  };\n\n  /**\n   * @TODO vik/artem work with ExportDataTable instead of ExportableCollection\n   * @TODO vik/artem why so much code? here is 6 rows solution https://stackoverflow.com/questions/64939994/how-to-export-array-of-objects-to-an-excel-in-angular-8\n   */\n  exportArrayToExcel(exportableCollection: ExportableCollection<any>, name?: string, params? : any) {\n    const workbook: xlsx.WorkBook = xlsx.utils.book_new();\n    // create empty worksheet\n    const worksheet: xlsx.WorkSheet = {\n      SheetNames: [],\n      Sheets: {}\n    };\n\n    const exportData: ExportDataTable = exportableCollection.export(params)\n    const exportAoa = exportableCollection.getBodyAoa(exportData);\n    const { sheetName, fileName } = this.getFileName(name);\n\n    xlsx.utils.sheet_add_aoa(worksheet, [exportData.header], { origin: -1 });\n    // add table table data to the worksheet\n    xlsx.utils.sheet_add_aoa(worksheet, exportAoa, { origin: -1 });\n    // set empty row after current table\n    xlsx.utils.sheet_add_aoa(worksheet, [], { origin: -1 });\n\n    xlsx.utils.book_append_sheet(workbook, worksheet);\n    const excelFile: BlobPart = xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });\n\n    const data: Blob = new Blob([excelFile], {\n      type: EXCEL_TYPE\n    });\n    FileSaver.saveAs(data, `${fileName}.xlsx`);\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"xlsx.service.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/services/xlsx/xlsx.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport * as xlsx from 'xlsx';\nimport * as FileSaver from 'file-saver';\nimport { ExportableCollection } from '../../collections';\nimport { ExportDataTable } from '../../models/export/export-data-table';\n\nconst EXCEL_TYPE: string = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'\n\n@Injectable({\n  providedIn: 'root'\n})\n\n/**\n * Service to work with XLSX (generate, download, e.t.c.)\n */\nexport class XlsxService {\n  /**\n   * Export file form provided HTML tables\n   */\n  exportTables(tables: NodeListOf<HTMLTableElement>, title: string, fileName: string): void {\n    const excelFile: BlobPart = this.generateFromTables(tables, title);\n    const data: Blob = new Blob([excelFile], {\n      type: EXCEL_TYPE\n    });\n\n    FileSaver.saveAs(data, `${fileName}.xlsx`);\n  }\n\n  private generateFromTables(tables: NodeListOf<HTMLTableElement>, title?: string): BlobPart {\n    // create new workbook\n    const workbook: xlsx.WorkBook = xlsx.utils.book_new();\n    // create empty worksheet\n    const worksheet: xlsx.WorkSheet = {\n      SheetNames: [],\n      Sheets: {}\n    };\n\n    tables.forEach((data: HTMLTableElement) => {\n      // add caption for the current table\n      xlsx.utils.sheet_add_aoa(worksheet, [[data.caption?.innerText]], { origin: -1 });\n      // Prepare to add table data to the worksheet, processing each cell\n      const rows = Array.from(data.rows)\n        .map((row: HTMLTableRowElement) => Array.from(row.cells).map(cell => this.htmlToXlsCell(cell)));\n      // Add the processed table data to the worksheet\n      xlsx.utils.sheet_add_aoa(worksheet, rows, { origin: -1 });\n      // set empty row after current table\n      xlsx.utils.sheet_add_aoa(worksheet, [], { origin: -1 });\n    });\n\n    xlsx.utils.book_append_sheet(workbook, worksheet);\n    return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });\n  }\n\n  htmlToXlsCell(cell: HTMLTableCellElement): string | number {\n    const cellValue: string | number = cell.innerText;\n    // regex to check currency value\n    return /^-?\\$/.test(cellValue) ? this.currencyToNumber(cellValue) : cellValue;\n  }\n\n  /**\n   * function which reconverts values from customCurrencyPipe\n   * @param cellValue - string with $ and possibly comma.  $123,123.03\n   * @returns value without $ and comma. like 123123.03\n   */\n  currencyToNumber(cellValue: string): number {\n    // remove dollar sign and comma\n    cellValue = cellValue.replace(/[$,]/g, '');\n\n    return parseFloat(cellValue);\n  }\n\n  getFileName = (name: string) => {\n    const sheetName = name || 'ExportResult';\n    const fileName = `${sheetName}`;\n    return {\n      sheetName,\n      fileName\n    };\n  };\n\n  /**\n   * @TODO vik/artem work with ExportDataTable instead of ExportableCollection\n   * @TODO vik/artem why so much code? here is 6 rows solution https://stackoverflow.com/questions/64939994/how-to-export-array-of-objects-to-an-excel-in-angular-8\n   */\n  exportArrayToExcel(exportableCollection: ExportableCollection<any>, name?: string, params? : any) {\n    const workbook: xlsx.WorkBook = xlsx.utils.book_new();\n    // create empty worksheet\n    const worksheet: xlsx.WorkSheet = {\n      SheetNames: [],\n      Sheets: {}\n    };\n\n    const exportData: ExportDataTable = exportableCollection.export(params)\n    const exportAoa = exportableCollection.getBodyAoa(exportData);\n    const { sheetName, fileName } = this.getFileName(name);\n\n    xlsx.utils.sheet_add_aoa(worksheet, [exportData.header], { origin: -1 });\n    // add table table data to the worksheet\n    xlsx.utils.sheet_add_aoa(worksheet, exportAoa, { origin: -1 });\n    // set empty row after current table\n    xlsx.utils.sheet_add_aoa(worksheet, [], { origin: -1 });\n\n    xlsx.utils.book_append_sheet(workbook, worksheet);\n    const excelFile: BlobPart = xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });\n\n    const data: Blob = new Blob([excelFile], {\n      type: EXCEL_TYPE\n    });\n    FileSaver.saveAs(data, `${fileName}.xlsx`);\n  }\n}\n"]}

package/fesm2022/taxtank-core.mjs

@@ -11279,8 +11279,8 @@ class DataService {
     createModelInstance(model) {
         return plainToClass(this.modelClass, model);
     }
-    createCollectionInstance(collectionClass, items) {
-        return new collectionClass(items);
+    createCollectionInstance(collectionClass, data) {
+        return new collectionClass(data.map((item) => this.createModelInstance(item)));
     }
     /**
      * never return cache directly to prevent update
@@ -11298,7 +11298,7 @@ class DataService {
      * @TODO vik any[] because of problems with base models extending abstractModel
      */
     setCache(data) {
-        this.cache = this.createCollectionInstance(this.collectionClass, data.map((item) => this.createModelInstance(item)));
+        this.cache = this.createCollectionInstance(this.collectionClass, data);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: DataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: DataService, providedIn: 'root' }); }
@@ -11388,13 +11388,17 @@ let RestService$1 = class RestService extends DataService {
     /**
      * Get data from backend and fill the cache
      */
-    fetch(path = this.apiUrl, cache = true) {
-        // Set cache as empty collection to avoid multiple requests before cache filled
-        this.setCache([]);
-        return this.http.get(path)
+    fetch(path = this.apiUrl, cache = true, queryParams = {}) {
+        if (cache) {
+            // Set cache as empty collection to avoid multiple requests before cache filled
+            this.setCache([]);
+        }
+        return this.http.get(path, queryParams)
             .pipe(map((response) => Array.isArray(response) ? response : toArray(response)), map((response) => {
-            this.setCache(response, true);
-            return this.cache;
+            if (cache) {
+                this.setCache(response, true);
+            }
+            return this.createCollectionInstance(this.collectionClass, response);
         }), catchError((error) => this.handleError(error)));
     }
     get(path = this.apiUrl) {
@@ -11555,8 +11559,8 @@ let RestService$1 = class RestService extends DataService {
             case 'delete':
                 cache = this.cache.removeBy('id', items.map((item) => item.id));
                 break;
-            case 'get':
-                cache = this.createCollectionInstance(this.collectionClass, items);
+            // case 'get':
+            //   cache = this.createCollectionInstance(this.collectionClass, items);
         }
         this.setCache(cache.toArray(), true);
     }
@@ -11637,6 +11641,58 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                     args: ['environment']
                 }] }] });
 
+var UserEventTypeTypeEnum;
+(function (UserEventTypeTypeEnum) {
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTERED"] = 1000] = "REGISTERED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PASSWORD_RESET_REQUEST"] = 1001] = "PASSWORD_RESET_REQUEST";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["APP_FEATURES"] = 1010] = "APP_FEATURES";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIBED"] = 2000] = "SUBSCRIBED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["UNSUBSCRIBED"] = 2001] = "UNSUBSCRIBED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_UPDATE"] = 2004] = "SUBSCRIPTION_UPDATE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_TRIAL_UPDATE"] = 2005] = "SUBSCRIPTION_TRIAL_UPDATE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_PAYMENT_FAILED"] = 2006] = "SUBSCRIPTION_PAYMENT_FAILED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE"] = 2010] = "CLIENT_INVITE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_TO_REGISTER"] = 2011] = "CLIENT_INVITE_TO_REGISTER";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_ACCEPTED"] = 2012] = "FIRM_INVITE_ACCEPTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REJECTED"] = 2013] = "FIRM_INVITE_REJECTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REGISTERED"] = 2014] = "FIRM_INVITE_REGISTERED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE"] = 2020] = "PROPERTY_SHARE_INVITE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_TO_REGISTER"] = 2021] = "PROPERTY_SHARE_INVITE_TO_REGISTER";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_ACCEPTED"] = 2022] = "PROPERTY_SHARE_INVITE_ACCEPTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REJECTED"] = 2023] = "PROPERTY_SHARE_INVITE_REJECTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REGISTERED"] = 2024] = "PROPERTY_SHARE_INVITE_REGISTERED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REQUESTED"] = 2025] = "PROPERTY_SHARE_CHANGE_REQUESTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_ACCEPTED"] = 2026] = "PROPERTY_SHARE_CHANGE_ACCEPTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REJECTED"] = 2027] = "PROPERTY_SHARE_CHANGE_REJECTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_SUBSCRIBED"] = 2028] = "OWNER_SUBSCRIBED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_UNSUBSCRIBED"] = 2029] = "OWNER_UNSUBSCRIBED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_NEW_ACCOUNTS"] = 2030] = "BASIQ_NEW_ACCOUNTS";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_FIRST_IMPORT_COMPLETE"] = 2031] = "BASIQ_FIRST_IMPORT_COMPLETE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_AUTHORIZATION_FAIL"] = 2032] = "BASIQ_AUTHORIZATION_FAIL";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["TRANSACTION_ALLOCATE_REMINDER"] = 2033] = "TRANSACTION_ALLOCATE_REMINDER";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["INVOICE_AUTO_ALLOCATED"] = 2035] = "INVOICE_AUTO_ALLOCATED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["INVOICE_AUTO_PART_ALLOCATED"] = 2036] = "INVOICE_AUTO_PART_ALLOCATED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["RULES_AUTO_ALLOCATED"] = 2037] = "RULES_AUTO_ALLOCATED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE"] = 2040] = "REGISTRATION_INVITE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE_ACCEPTED"] = 2041] = "REGISTRATION_INVITE_ACCEPTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_EMAIL_CONFIRMED"] = 2050] = "CLIENT_EMAIL_CONFIRMED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_REQUESTED"] = 2060] = "TAX_REVIEW_REQUESTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_TO_REGISTER"] = 3000] = "FIRM_INVITE_TO_REGISTER";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE"] = 3001] = "FIRM_INVITE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_ACCEPTED"] = 3002] = "CLIENT_INVITE_ACCEPTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REJECTED"] = 3003] = "CLIENT_INVITE_REJECTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REGISTERED"] = 3004] = "CLIENT_INVITE_REGISTERED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_NEW_CLIENT"] = 3005] = "FIRM_NEW_CLIENT";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_LOST_CLIENT"] = 3006] = "FIRM_LOST_CLIENT";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE"] = 3010] = "EMPLOYEE_INVITE";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_LOST_CLIENT"] = 3011] = "EMPLOYEE_LOST_CLIENT";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_NEW_CLIENT"] = 3012] = "EMPLOYEE_NEW_CLIENT";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE_ACCEPTED"] = 3013] = "EMPLOYEE_INVITE_ACCEPTED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_EMAIL_CONFIRMED"] = 3020] = "EMPLOYEE_EMAIL_CONFIRMED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_RECEIVED"] = 3030] = "TAX_REVIEW_RECEIVED";
+    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SHARESIGHT_IMPORT"] = 2070] = "SHARESIGHT_IMPORT";
+})(UserEventTypeTypeEnum || (UserEventTypeTypeEnum = {}));
+
 /**
  * Service that handling user's bank accounts logic
  */
@@ -11662,10 +11718,12 @@ class BankAccountService extends RestService$1 {
      */
     listenEvents() {
         this.listenToEventDispatcherChanges();
+        // @TODO why?
         this.listenCSE(BankTransaction, this.refreshCache, ['post', 'delete']);
         this.listenCSE(PropertyShare, this.refreshCache, ['put']);
         this.listenCSE(BankConnection, this.refreshCache, ['post']);
-        this.listenConnections();
+        this.listenNotifications();
+        // this.listenConnections();
     }
     /**
      * Update bank account current balance
@@ -11699,6 +11757,19 @@ class BankAccountService extends RestService$1 {
             this.refreshCache();
         });
     }
+    listenNotifications() {
+        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
+            const events = [
+                UserEventTypeTypeEnum.BASIQ_NEW_ACCOUNTS,
+                UserEventTypeTypeEnum.BASIQ_FIRST_IMPORT_COMPLETE,
+                UserEventTypeTypeEnum.BASIQ_AUTHORIZATION_FAIL,
+            ];
+            if (!notification.isRead && events.includes(notification.eventType)) {
+                // @TODO TT-3826 move to unified mercure event
+                this.refreshCache();
+            }
+        });
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BankAccountService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BankAccountService, providedIn: 'root' }); }
 }
@@ -11750,12 +11821,10 @@ class BankConnectionService extends RestService$1 {
         this.collectionClass = Collection;
         this.endpointUri = 'bank-connections';
         this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
-        this.mercureTopic = 'bankConnections';
         this.listenEvents();
     }
     listenEvents() {
-        // @TODO remove when TT-3826 is ready
-        this.listenSSE();
+        this.listenNotifications();
     }
     /**
      * there is no put BankConnection method, we have to post to update
@@ -11798,6 +11867,19 @@ class BankConnectionService extends RestService$1 {
     deactivate(bankConnection) {
         return this.put(bankConnection, `${this.apiUrl}/${bankConnection.id}/deactivate`);
     }
+    listenNotifications() {
+        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
+            const events = [
+                UserEventTypeTypeEnum.BASIQ_NEW_ACCOUNTS,
+                UserEventTypeTypeEnum.BASIQ_FIRST_IMPORT_COMPLETE,
+                UserEventTypeTypeEnum.BASIQ_AUTHORIZATION_FAIL,
+            ];
+            if (!notification.isRead && events.includes(notification.eventType)) {
+                // @TODO TT-3826 move to unified mercure event
+                this.refreshCache();
+            }
+        });
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BankConnectionService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BankConnectionService, providedIn: 'root' }); }
 }
@@ -11811,58 +11893,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                     args: ['environment']
                 }] }] });
 
-var UserEventTypeTypeEnum;
-(function (UserEventTypeTypeEnum) {
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTERED"] = 1000] = "REGISTERED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PASSWORD_RESET_REQUEST"] = 1001] = "PASSWORD_RESET_REQUEST";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["APP_FEATURES"] = 1010] = "APP_FEATURES";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIBED"] = 2000] = "SUBSCRIBED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["UNSUBSCRIBED"] = 2001] = "UNSUBSCRIBED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_UPDATE"] = 2004] = "SUBSCRIPTION_UPDATE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_TRIAL_UPDATE"] = 2005] = "SUBSCRIPTION_TRIAL_UPDATE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_PAYMENT_FAILED"] = 2006] = "SUBSCRIPTION_PAYMENT_FAILED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE"] = 2010] = "CLIENT_INVITE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_TO_REGISTER"] = 2011] = "CLIENT_INVITE_TO_REGISTER";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_ACCEPTED"] = 2012] = "FIRM_INVITE_ACCEPTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REJECTED"] = 2013] = "FIRM_INVITE_REJECTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REGISTERED"] = 2014] = "FIRM_INVITE_REGISTERED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE"] = 2020] = "PROPERTY_SHARE_INVITE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_TO_REGISTER"] = 2021] = "PROPERTY_SHARE_INVITE_TO_REGISTER";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_ACCEPTED"] = 2022] = "PROPERTY_SHARE_INVITE_ACCEPTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REJECTED"] = 2023] = "PROPERTY_SHARE_INVITE_REJECTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REGISTERED"] = 2024] = "PROPERTY_SHARE_INVITE_REGISTERED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REQUESTED"] = 2025] = "PROPERTY_SHARE_CHANGE_REQUESTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_ACCEPTED"] = 2026] = "PROPERTY_SHARE_CHANGE_ACCEPTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REJECTED"] = 2027] = "PROPERTY_SHARE_CHANGE_REJECTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_SUBSCRIBED"] = 2028] = "OWNER_SUBSCRIBED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_UNSUBSCRIBED"] = 2029] = "OWNER_UNSUBSCRIBED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_NEW_ACCOUNTS"] = 2030] = "BASIQ_NEW_ACCOUNTS";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_FIRST_IMPORT_COMPLETE"] = 2031] = "BASIQ_FIRST_IMPORT_COMPLETE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_AUTHORIZATION_FAIL"] = 2032] = "BASIQ_AUTHORIZATION_FAIL";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["TRANSACTION_ALLOCATE_REMINDER"] = 2033] = "TRANSACTION_ALLOCATE_REMINDER";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["INVOICE_AUTO_ALLOCATED"] = 2035] = "INVOICE_AUTO_ALLOCATED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["INVOICE_AUTO_PART_ALLOCATED"] = 2036] = "INVOICE_AUTO_PART_ALLOCATED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["RULES_AUTO_ALLOCATED"] = 2037] = "RULES_AUTO_ALLOCATED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE"] = 2040] = "REGISTRATION_INVITE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE_ACCEPTED"] = 2041] = "REGISTRATION_INVITE_ACCEPTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_EMAIL_CONFIRMED"] = 2050] = "CLIENT_EMAIL_CONFIRMED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_REQUESTED"] = 2060] = "TAX_REVIEW_REQUESTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_TO_REGISTER"] = 3000] = "FIRM_INVITE_TO_REGISTER";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE"] = 3001] = "FIRM_INVITE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_ACCEPTED"] = 3002] = "CLIENT_INVITE_ACCEPTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REJECTED"] = 3003] = "CLIENT_INVITE_REJECTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REGISTERED"] = 3004] = "CLIENT_INVITE_REGISTERED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_NEW_CLIENT"] = 3005] = "FIRM_NEW_CLIENT";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_LOST_CLIENT"] = 3006] = "FIRM_LOST_CLIENT";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE"] = 3010] = "EMPLOYEE_INVITE";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_LOST_CLIENT"] = 3011] = "EMPLOYEE_LOST_CLIENT";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_NEW_CLIENT"] = 3012] = "EMPLOYEE_NEW_CLIENT";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE_ACCEPTED"] = 3013] = "EMPLOYEE_INVITE_ACCEPTED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_EMAIL_CONFIRMED"] = 3020] = "EMPLOYEE_EMAIL_CONFIRMED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_RECEIVED"] = 3030] = "TAX_REVIEW_RECEIVED";
-    UserEventTypeTypeEnum[UserEventTypeTypeEnum["SHARESIGHT_IMPORT"] = 2070] = "SHARESIGHT_IMPORT";
-})(UserEventTypeTypeEnum || (UserEventTypeTypeEnum = {}));
-
 /**
  * Service for bank transactions business logic
  */
@@ -12908,6 +12938,7 @@ class ClientMovementService extends RestService$1 {
         this.collectionClass = ClientMovementCollection;
         this.modelClass = ClientMovement;
         this.disabledMethods = ['postBatch', 'delete', 'deleteBatch'];
+        this.mercureTopic = 'clientMovements';
         this.listenEvents();
     }
     listenEvents() {
@@ -12915,7 +12946,8 @@ class ClientMovementService extends RestService$1 {
         this.eventDispatcherService.on([AppEventTypeEnum.CLIENT_INVITE_ACCEPTED]).subscribe(() => {
             this.refreshCache();
         });
-        this.listenNotifications();
+        // @TODO remove when TT-3826 is ready
+        this.listenSSE();
     }
     getActive() {
         return this.get().pipe(map((clientMovements) => clientMovements.active));
@@ -12963,21 +12995,6 @@ class ClientMovementService extends RestService$1 {
             // this.updateCache([clientMovement], 'delete');
         }));
     }
-    listenNotifications() {
-        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
-            const events = [
-                UserEventTypeTypeEnum.FIRM_INVITE_ACCEPTED,
-                UserEventTypeTypeEnum.FIRM_INVITE_REJECTED,
-                UserEventTypeTypeEnum.CLIENT_INVITE_ACCEPTED,
-                UserEventTypeTypeEnum.CLIENT_INVITE_REJECTED,
-                UserEventTypeTypeEnum.CLIENT_INVITE_REGISTERED,
-            ];
-            if (!notification.isRead && events.includes(notification.eventType)) {
-                // @TODO TT-3826 move to unified mercure event
-                this.refreshCache();
-            }
-        });
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ClientMovementService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ClientMovementService, providedIn: 'root' }); }
 }
@@ -16436,15 +16453,15 @@ class HoldingTypeService extends RestService$1 {
         this.endpointUri = 'holding-types';
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
         this.roles = [UserRolesEnum.HOLDING_TANK];
-        // this.listenEvents();
+        this.listenEvents();
+    }
+    search(query, category = null) {
+        query = query.toLowerCase().trim();
+        return this.fetch(`${this.apiUrl}`, false, { params: { query, category } });
+    }
+    getCurrent() {
+        return this.get(`${this.apiUrl}/current`);
     }
-    // search(searchQuery: string, category: HoldingTypeCategoryEnum = null): Observable<HoldingType[]> {
-    //   searchQuery = searchQuery.toLowerCase().trim();
-    //
-    //   return this.http.get(`${this.apiUrl}`, { params: { searchQuery, category } }).pipe(
-    //     map((userBase: UserBase) => this.createModelInstance(userBase))
-    //   );
-    // }
     listenEvents() {
         this.listenCSE(BankTransaction, (trade) => this.hasInCache(trade.holdingType.id) ? this.updateCache([trade.holdingType], 'post') : '', ['post']);
     }
@@ -19873,15 +19890,8 @@ class XlsxService {
             // add caption for the current table
             xlsx.utils.sheet_add_aoa(worksheet, [[data.caption?.innerText]], { origin: -1 });
             // Prepare to add table data to the worksheet, processing each cell
-            const rows = Array.from(data.rows).map((row) => Array.from(row.cells).map((cell) => {
-                const cellValue = cell.innerText;
-                // Convert currency strings like "$0.00" to numbers
-                if (/^-?\$/.test(cellValue)) {
-                    // @TODO vik fix
-                    // cellValue = parseFloat(cellValue.replace('$', ''));
-                }
-                return cellValue;
-            }));
+            const rows = Array.from(data.rows)
+                .map((row) => Array.from(row.cells).map(cell => this.htmlToXlsCell(cell)));
             // Add the processed table data to the worksheet
             xlsx.utils.sheet_add_aoa(worksheet, rows, { origin: -1 });
             // set empty row after current table
@@ -19890,6 +19900,21 @@ class XlsxService {
         xlsx.utils.book_append_sheet(workbook, worksheet);
         return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });
     }
+    htmlToXlsCell(cell) {
+        const cellValue = cell.innerText;
+        // regex to check currency value
+        return /^-?\$/.test(cellValue) ? this.currencyToNumber(cellValue) : cellValue;
+    }
+    /**
+     * function which reconverts values from customCurrencyPipe
+     * @param cellValue - string with $ and possibly comma.  $123,123.03
+     * @returns value without $ and comma. like 123123.03
+     */
+    currencyToNumber(cellValue) {
+        // remove dollar sign and comma
+        cellValue = cellValue.replace(/[$,]/g, '');
+        return parseFloat(cellValue);
+    }
     /**
      * @TODO vik/artem work with ExportDataTable instead of ExportableCollection
      * @TODO vik/artem why so much code? here is 6 rows solution https://stackoverflow.com/questions/64939994/how-to-export-array-of-objects-to-an-excel-in-angular-8