taxtank-core 0.33.2 → 0.33.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.33.2",
+  "version": "0.33.3",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^17.0.0",

package/public-api.d.ts

@@ -39,7 +39,7 @@ export * from './src/lib/db/Enums/depreciation-calculation.enum';
 export * from './src/lib/db/Enums/depreciation-calculation-percent.enum';
 export * from './src/lib/db/Enums/depreciation-type.enum';
 export * from './src/lib/db/Enums/depreciation-write-off-amount.enum';
-export * from './src/lib/db/Enums/firm-type.enum';
+export * from './src/lib/db/Enums/firm/firm-type.enum';
 export * from './src/lib/db/Enums/income-source';
 export * from './src/lib/db/Enums/invite-status.enum';
 export * from './src/lib/db/Enums/bank/loan';
@@ -173,7 +173,6 @@ export * from './src/lib/functions/enum-to-list';
 export * from './src/lib/functions/get-doc-icon';
 export * from './src/lib/functions/mat-options-functions';
 export * from './src/lib/functions/mat-sort-options';
-export * from './src/lib/functions/tax-review-filter-predicate';
 export * from './src/lib/functions/array';
 /**
  * Interceptors

package/src/lib/collections/bank-transaction.collection.d.ts

@@ -1,7 +1,8 @@
-import { BankAccount, BankTransaction, IncomeSource, MonthNumberEnum } from '../models';
+import { BankTransaction, IncomeSource, MonthNumberEnum } from '../models';
 import { Collection } from './collection';
 import { CollectionDictionary } from './collection-dictionary';
 import { TransactionAllocationCollection } from './transaction';
+import { BankAccountCollection } from './bank-account.collection';
 /**
  * Collection of bank transactions.
  * IMPORTANT: Create this collection based on bank transactions from TransactionAllocationService
@@ -40,7 +41,7 @@ export declare class BankTransactionCollection extends Collection<BankTransactio
      * get list of transactions by provided bank accounts
      * @param bankAccounts by which transactions should be returned
      */
-    getByBankAccounts(bankAccounts: BankAccount[]): BankTransaction[];
+    getByBankAccounts(bankAccounts: BankAccountCollection): BankTransactionCollection;
     /**
      * get list of transactions by provided ids of bank accounts
      * @param ids of bank accounts

package/src/lib/collections/chat/chat.collection.d.ts

@@ -1,9 +1,5 @@
 import { Collection } from '../collection';
-import { Chat, Message } from '../../models';
+import { Chat } from '../../models';
 export declare class ChatCollection extends Collection<Chat> {
-    /**
-     * Sort chats by last messages (newest first) + empty chats in the end
-     */
-    getSortedByNewest(messages: Message[]): this;
     getActive(): this;
 }

package/src/lib/collections/client-movement.collection.d.ts

@@ -1,8 +1,8 @@
 import { Collection } from './collection';
 import { ClientMovement } from '../models';
-import { EmployeeCollection } from './employee.collection';
+import { EmployeeCollection } from './firm';
 import { ClientCollection } from './client.collection';
-import { FirmTypeEnum } from '../db/Enums/firm-type.enum';
+import { FirmTypeEnum } from '../db/Enums';
 import { CollectionDictionary } from './collection-dictionary';
 /**
  * Collection of tax review

package/src/lib/collections/client.collection.d.ts

@@ -1,4 +1,4 @@
 import { Collection } from './collection';
-import { User } from '../models/user/user';
+import { User } from '../models';
 export declare class ClientCollection extends Collection<User> {
 }

package/src/lib/collections/collection-dictionary.d.ts

@@ -20,6 +20,7 @@ export declare class CollectionDictionary<Collection extends BaseCollection<Abst
      * List of collections keys
      */
     get keys(): string[];
+    get values(): Collection[];
     /**
      * push new elements in existing item
      */

package/src/lib/collections/collection.d.ts

@@ -36,13 +36,17 @@ export declare class Collection<Model extends AbstractModel> implements Iterable
     groupBy(path?: string): CollectionDictionary<this>;
     indexBy(path?: string): Dictionary<Model>;
     filter(callback: (item: Model) => boolean): this;
-    filterBy(path: string, values: any): this;
+    filterBy(path: string, values: any, skipIfEmpty?: boolean): this;
     filterByRange(path: string, from: any, to: any): this;
     filterByFinancialYear(pathFrom: string, pathTo?: string, financialYear?: FinancialYear): this;
     find(callback: (item: Model) => boolean): Model | null;
     findBy(path: string, value: any): Model | null;
     findIndexBy(path: string, value: any): number;
     push(...items: Model[]): this;
+    /**
+     * @TODO performance check this.create performance and why we do it instead of changing collection
+     */
+    unshift(...items: Model[]): this;
     remove(...items: Model[]): this;
     /**
      * @TODO it's filter, not remove

package/src/lib/collections/firm/employee-invite.collection.d.ts

@@ -0,0 +1,5 @@
+import { Collection } from '../collection';
+import { EmployeeInvite } from '../../models/employee/employee-invite';
+export declare class EmployeeInviteCollection extends Collection<EmployeeInvite> {
+    filterByBranchIds(firmBranchIds: number[]): this;
+}

package/src/lib/collections/firm/employee.collection.d.ts

@@ -0,0 +1,6 @@
+import { UserCollection } from '../user/user.collection';
+import { CollectionDictionary } from '../collection-dictionary';
+export declare class EmployeeCollection extends UserCollection {
+    groupByBranch(): CollectionDictionary<EmployeeCollection>;
+    filterByBranchIds(firmBranchIds: number[]): this;
+}

package/src/lib/collections/firm/index.d.ts

@@ -0,0 +1,2 @@
+export * from './employee.collection';
+export * from './employee-invite.collection';

package/src/lib/collections/income-source/income-source.collection.d.ts

@@ -9,7 +9,7 @@ import { IIncomeSourceForecast } from '../../interfaces';
 export declare class IncomeSourceCollection extends Collection<IncomeSource> {
     filterByTank(tank: TankTypeEnum): IncomeSource[];
     /**
-     * Filter income sources by provided tyoes
+     * Filter income sources by provided types
      * @param types
      */
     filterByTypes(types: IncomeSourceTypeEnum[]): IncomeSource[];

package/src/lib/collections/index.d.ts

@@ -21,7 +21,7 @@ export * from './client-portfolio-report.collection';
 export * from './client.collection';
 export * from './depreciation-forecast.collection';
 export * from './depreciation.collection';
-export * from './employee.collection';
+export * from './firm';
 export * from './exportable.collection';
 export * from './income-source';
 export * from './tax-review.collection';
@@ -29,3 +29,4 @@ export * from './user-event-setting.collection';
 export * from './user-event-type-collection';
 export * from './holding';
 export * from './asset-sale.collection';
+export * from './user/user.collection';

package/src/lib/collections/property/property-valuation.collection.d.ts

@@ -1,4 +1,8 @@
 import { Collection } from '../collection';
 import { PropertyValuation } from '../../models';
 export declare class PropertyValuationCollection extends Collection<PropertyValuation> {
+    /**
+     * @TODO vik find by year when backend refactored (all years would exist)
+     */
+    getMarketValue(date: Date): number;
 }

package/src/lib/collections/report/property/property-report-item-depreciation.collection.d.ts

@@ -1,8 +1,8 @@
 import { Collection } from '../../collection';
-import { ChartAccounts } from '../../../models/chart-accounts/chart-accounts';
+import { ChartAccounts } from '../../../models';
 import { DepreciationCollection } from '../../depreciation.collection';
 import { PropertyReportItemCollection } from './property-report-item.collection';
-import { PropertyCollection } from '../../property/property.collection';
+import { PropertyCollection } from '../../property';
 /**
  * Collection to work with depreciation-based property report items
  */

package/src/lib/collections/report/property/property-report-item-transaction.collection.d.ts

@@ -1,8 +1,8 @@
 import { Collection } from '../../collection';
-import { TransactionCollection } from '../../transaction/transaction.collection';
-import { ChartAccounts } from '../../../models/chart-accounts/chart-accounts';
+import { TransactionCollection } from '../../transaction';
+import { ChartAccounts } from '../../../models';
 import { PropertyReportItemCollection } from './property-report-item.collection';
-import { PropertyCollection } from '../../property/property.collection';
+import { PropertyCollection } from '../../property';
 /**
  * Collection to work with transaction-based property report items
  */

package/src/lib/collections/report/property/property-report-item.collection.d.ts

@@ -1,5 +1,5 @@
 import { Collection } from '../../collection';
-import { PropertyReportItem } from '../../../models/report/property/property-report-item';
+import { PropertyReportItem } from '../../../models/report';
 /**
  * Base collection to work with property report items
  */

package/src/lib/collections/tax-review.collection.d.ts

@@ -18,10 +18,6 @@ export declare class TaxReviewCollection extends Collection<TaxReview> {
      * Get tax reviews items in work (In progress, Waiting for client, Waiting for Approval, Is approved)
      */
     getInWork(): TaxReview[];
-    /**
-     * Get percentage of completed reviews of the total review amount
-     */
-    getCompletedPercentage(): number;
     /**
      * get list of items filtered by status
      * @param status

package/src/lib/collections/transaction/transaction.collection.d.ts

@@ -98,4 +98,5 @@ export declare class TransactionCollection extends ExportableCollection<Transact
      * @TODO vik business transactions calculated differently, separated collection?
      */
     getBusinessClaimAmount(businessId?: number): number;
+    getTaxable(): this;
 }

package/src/lib/collections/user/user.collection.d.ts

@@ -0,0 +1,4 @@
+import { User } from '../../models';
+import { Collection } from '../collection';
+export declare class UserCollection extends Collection<User> {
+}

package/src/lib/collections/vehicle/vehicle-logbook.collection.d.ts

@@ -1,6 +1,9 @@
 import { Collection } from '../collection';
 import { VehicleClaim, VehicleLogbook } from '../../models';
 import { BestVehicleLogbookCollection } from './best-vehicle-logbook.collection';
+/**
+ * this collection sorted by date desc, that's why first/last methods works different
+ */
 export declare class VehicleLogbookCollection extends Collection<VehicleLogbook> {
     /**
      * Calculate total kilometers traveled
@@ -12,4 +15,7 @@ export declare class VehicleLogbookCollection extends Collection<VehicleLogbook>
      * get collection of logbooks with the biggest work usage for {@link BestVehicleLogbookCollection.periodDuration}
      */
     getBest(): BestVehicleLogbookCollection | null;
+    get first(): VehicleLogbook;
+    get last(): VehicleLogbook;
+    get preLast(): VehicleLogbook;
 }

package/src/lib/core.module.d.ts

@@ -1,4 +1,5 @@
 import { ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/common";
 import * as i2 from "./interceptors/interceptors.module";
@@ -6,7 +7,7 @@ import * as i2 from "./interceptors/interceptors.module";
  * https://angular.io/guide/creating-libraries
  */
 export declare class CoreModule {
-    static forRoot(environment: object): ModuleWithProviders<CoreModule>;
+    static forRoot(environment: object): ModuleWithProviders<CommonModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<CoreModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<CoreModule, never, [typeof i1.CommonModule, typeof i2.InterceptorsModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<CoreModule>;

package/src/lib/db/Enums/bank/bank-connection-status.enum.d.ts

@@ -1,5 +1,6 @@
 export declare enum BankConnectionStatusEnum {
     PENDING = 1,
     ACTIVE = 2,
+    INVALID = 3,
     RECONNECTING = 4
 }

package/src/lib/db/Enums/chart-accounts/chart-accounts-property-adjustments-list.enum.d.ts

@@ -1,7 +1,7 @@
 export declare enum ChartAccountsPropertyAdjustmentsListEnum {
     INTEREST_ON_LOAN = 302,
     ADVERTISING_FOR_TENANTS = 308,
-    BODY_CORPORATE_FEES = 3010,
+    BODY_CORPORATE_FEES = 310,
     SPECIAL_LEVY = 311,
     BORROWING_EXPENSES_BANK_FEES = 313,
     BORROWING_EXPENSES = 315,

package/src/lib/db/Enums/firm/employee-invite-role.enum.d.ts

@@ -0,0 +1,4 @@
+export declare enum EmployeeInviteRoleEnum {
+    EMPLOYEE = 1,
+    MANAGER = 2
+}

package/src/lib/db/Enums/firm/index.d.ts

@@ -0,0 +1,2 @@
+export * from './employee-invite-role.enum';
+export * from './firm-type.enum';

package/src/lib/db/Enums/holding/holding-type-exchange-list.enum.d.ts

@@ -1,8 +1,9 @@
 export declare enum HoldingTypeExchangeListEnum {
     US = 1,
     AU = 2,
-    TO = 3,
-    HK = 4,
-    SG = 5,
-    CC = 6
+    LSE = 3,
+    TO = 4,
+    HK = 5,
+    SG = 6,
+    CC = 7
 }

package/src/lib/db/Enums/index.d.ts

@@ -3,9 +3,11 @@ export * from './allocation-rule-condition-field.enum';
 export * from './allocation-rule-condition-operator.enum';
 export * from './allocation-rule-type.enum';
 export * from './bank';
+export * from './firm';
 export * from './annual-frequency.enum';
 export * from './chart-accounts';
 export * from './document-type.enum';
 export * from './holding';
 export * from './tax-return';
 export * from './subscription';
+export * from './user';

package/src/lib/db/Enums/user/gender.enum.d.ts

@@ -0,0 +1,12 @@
+export declare enum GenderEnum {
+    PREFER_NOT_TO_SAY = 0,
+    MALE = 1,
+    FEMALE = 2,
+    TRANSGENDER = 3,
+    GENDERQUEER = 4,
+    NON_BINARY = 5,
+    GENDERFLUID = 6,
+    AGENDER = 7,
+    BIGENDER = 8,
+    OTHER = 9
+}

package/src/lib/db/Enums/user/index.d.ts

@@ -0,0 +1 @@
+export * from './gender.enum';

package/src/lib/db/Models/bank/bank-connection.d.ts

@@ -14,4 +14,5 @@ export declare class BankConnection extends ObservableModel {
     basiqJob?: BasiqJob;
     lastSuccessImportDate?: Date;
     provider?: BankProviderEnum;
+    expiryDate?: Date;
 }

package/src/lib/db/Models/client/annual-client-details.d.ts

@@ -1,6 +1,5 @@
 import { ClientDetails } from './client-details';
 export declare class AnnualClientDetails {
-    capitalLoss?: number;
     privateHealthCare?: boolean;
     spouse?: boolean;
     spouseAnnualIncome?: number;

package/src/lib/db/Models/client/client-details.d.ts

@@ -16,6 +16,7 @@ export declare class ClientDetails extends AbstractModel {
     dateOfBirth?: Date;
     isGST?: boolean;
     basiqConsentId?: string;
+    basiqConsentExpiryDate?: Date;
     deletedAt?: Date;
     createdAt?: Date;
     updatedAt?: Date;

package/src/lib/db/Models/firm/accountant/tax-review.d.ts

@@ -2,6 +2,7 @@ import { TaxReviewStatusEnum } from '../../../Enums/tax-review-status.enum';
 import { User } from '../../user/user';
 import { Firm } from '../firm';
 import { AbstractModel } from '../../abstract-model';
+import { FirmBranch } from '../../../../models';
 export declare class TaxReview extends AbstractModel {
     id?: number;
     financialYear?: number;
@@ -11,4 +12,5 @@ export declare class TaxReview extends AbstractModel {
     client?: User;
     employee?: User;
     firm?: Firm;
+    firmBranch?: FirmBranch;
 }

package/src/lib/db/Models/firm/chat.d.ts

@@ -4,6 +4,7 @@ import { User } from '../user/user';
 import { Message } from './message';
 import { MessageDocument } from './message-document';
 import { AbstractModel } from '../abstract-model';
+import { FirmBranch } from '../../../models';
 export declare class Chat extends AbstractModel {
     status?: ChatStatusEnum;
     createdAt?: Date;
@@ -14,4 +15,5 @@ export declare class Chat extends AbstractModel {
     client?: User;
     messages?: Message[];
     documents?: MessageDocument[];
+    firmBranch?: FirmBranch;
 }

package/src/lib/db/Models/firm/client-invite.d.ts

@@ -1,9 +1,10 @@
 import { ClientInviteTypeEnum } from '../../Enums/client-invite-type.enum';
 import { ClientInviteStatusEnum } from '../../Enums/client-invite-status.enum';
 import { User } from '../user/user';
-import { Firm } from './firm';
 import { RegistrationInvite } from '../user/registration-invite';
 import { ObservableModel } from '../observable-model';
+import { FirmBranchInterface } from '../../../models/firm/firm-branch.interface';
+import { Firm } from './firm';
 export declare class ClientInvite extends ObservableModel {
     static className: string;
     type?: ClientInviteTypeEnum;
@@ -12,6 +13,8 @@ export declare class ClientInvite extends ObservableModel {
     updatedAt?: Date;
     employee?: User;
     client?: User;
-    firm?: Firm;
     registrationInvite?: RegistrationInvite;
+    address?: string;
+    firm?: Firm;
+    firmBranch?: FirmBranchInterface;
 }

package/src/lib/db/Models/firm/client-movement.d.ts

@@ -1,11 +1,11 @@
-import { Firm } from './firm';
 import { User } from '../user/user';
 import { ObservableModel } from '../observable-model';
+import { FirmBranch } from '../../../models';
 export declare class ClientMovement extends ObservableModel {
     static className: string;
     dateFrom?: Date;
     dateTo?: Date;
-    firm?: Firm;
     client?: User;
     employee?: User;
+    firmBranch?: FirmBranch;
 }

package/src/lib/db/Models/firm/employee-invite.d.ts

@@ -1,9 +1,11 @@
 import { User } from '../user/user';
-import { Firm } from './firm';
 import { RegistrationInvite } from '../user/registration-invite';
 import { AbstractModel } from '../abstract-model';
+import { FirmBranch } from '../../../models';
+import { EmployeeInviteRoleEnum } from '../../Enums';
 export declare class EmployeeInvite extends AbstractModel {
     employee?: User;
-    firm?: Firm;
     registrationInvite?: RegistrationInvite;
+    firmBranches?: FirmBranch[];
+    role?: EmployeeInviteRoleEnum;
 }

package/src/lib/db/Models/firm/firm.d.ts

@@ -1,4 +1,4 @@
-import { FirmTypeEnum } from '../../Enums/firm-type.enum';
+import { FirmTypeEnum } from '../../Enums';
 import { Address } from '../address';
 import { Phone } from '../phone';
 import { User } from '../user/user';

package/src/lib/db/Models/firm/message-document.d.ts

@@ -2,14 +2,10 @@ import { Chat } from './chat';
 import { Message } from './message';
 import { User } from '../user/user';
 import { AbstractModel } from '../abstract-model';
+import { File } from '../file';
 export declare class MessageDocument extends AbstractModel {
-    name?: string;
-    originalName?: string;
-    size?: number;
-    mimeType?: string;
-    createdAt?: Date;
-    updatedAt?: Date;
     chat?: Chat;
     message?: Message;
     user?: User;
+    file: File;
 }

package/src/lib/db/Models/incomeSource/income-source-forecast.d.ts

@@ -1,4 +1,4 @@
-import { IncomeSourceForecastTrustTypeEnum } from '../../Enums/income-source/income-source-forecast-trust-type.enum';
+import { IncomeSourceForecastTrustTypeEnum } from '../../Enums/income-source';
 import { IncomeSource } from './income-source';
 import { IncomeSourceType } from './income-source-type';
 import { AbstractModel } from '../abstract-model';
@@ -11,4 +11,5 @@ export declare class IncomeSourceForecast extends AbstractModel {
     trustType?: IncomeSourceForecastTrustTypeEnum;
     incomeSource?: IncomeSource;
     incomeSourceType?: IncomeSourceType;
+    isManual?: boolean;
 }

package/src/lib/db/Models/incomeSource/income-source.d.ts

@@ -2,7 +2,7 @@ import { User } from '../user/user';
 import { SalaryForecast } from './salary-forecast';
 import { SoleForecast } from '../sole/sole-forecast';
 import { IncomeSourceForecast } from './income-source-forecast';
-import { IncomeSourceTypeEnum } from '../../Enums/income-source/income-source-type.enum';
+import { IncomeSourceTypeEnum } from '../../Enums/income-source';
 import { AbstractModel } from '../abstract-model';
 export declare class IncomeSource extends AbstractModel {
     name?: string;

package/src/lib/db/Models/incomeSource/salary-forecast.d.ts

@@ -12,4 +12,5 @@ export declare class SalaryForecast extends AbstractModel {
     createdAt?: Date;
     updatedAt?: Date;
     incomeSource?: IncomeSource;
+    isManual?: boolean;
 }

package/src/lib/db/Models/property/property-forecast.d.ts

@@ -12,4 +12,5 @@ export declare class PropertyForecast extends AbstractModel {
     updatedAt?: Date;
     property?: Property;
     claimPercent?: number;
+    isManual?: boolean;
 }

package/src/lib/db/Models/sole/sole-business-loss.d.ts

@@ -6,4 +6,5 @@ export declare class SoleBusinessLoss extends AbstractModel {
     financialYear?: number;
     business?: SoleBusiness;
     offsetRule?: SoleBusinessLossOffsetRule;
+    isManual?: boolean;
 }

package/src/lib/db/Models/sole/sole-business.d.ts

@@ -6,12 +6,12 @@ import { SoleInvoiceTemplate } from './sole-invoice-template';
 import { VehicleClaim } from '../vehicle/vehicle-claim';
 import { Transaction } from '../transaction/transaction';
 import { Depreciation } from '../depreciation/depreciation';
-import { AbstractModel } from '../abstract-model';
 import { VehicleLogbook } from '../vehicle/vehicle-logbook';
 import { SoleBusinessActivity } from './sole-business-activity';
 import { IncomeSource } from '../incomeSource/income-source';
 import { File } from '../file';
-export declare class SoleBusiness extends AbstractModel {
+import { ObservableModel } from '../observable-model';
+export declare class SoleBusiness extends ObservableModel {
     name?: string;
     description?: string;
     website?: string;

package/src/lib/db/Models/sole/sole-forecast.d.ts

@@ -5,4 +5,5 @@ export declare class SoleForecast extends AbstractModel {
     amount?: number;
     taxInstalments?: number;
     incomeSource?: IncomeSource;
+    isManual?: boolean;
 }

package/src/lib/db/Models/user/employee-details.d.ts

@@ -1,7 +1,9 @@
 import { User } from './user';
 import { Firm } from '../firm/firm';
 import { AbstractModel } from '../abstract-model';
+import { FirmBranchInterface } from '../../../models/firm/firm-branch.interface';
 export declare class EmployeeDetails extends AbstractModel {
     user?: User;
     firm?: Firm;
+    firmBranches: FirmBranchInterface[];
 }

package/src/lib/db/Models/user/user.d.ts

@@ -17,6 +17,7 @@ import { SoleDetails } from '../sole/sole-details';
 import { File } from '../file';
 import { ObservableModel } from '../observable-model';
 import { SetupItem } from '../setup-item';
+import { GenderEnum } from '../../Enums/user/gender.enum';
 export declare class User extends ObservableModel {
     static className: string;
     intercomId?: number;
@@ -28,6 +29,7 @@ export declare class User extends ObservableModel {
     firstName?: string;
     lastName?: string;
     title?: UserTitleEnum;
+    gender?: GenderEnum;
     status?: UserStatusEnum;
     isConfirmed?: boolean;
     verificationCode?: string;

package/src/lib/db/Models/vehicle/vehicle-claim-details.d.ts

@@ -4,6 +4,6 @@ import { AbstractModel } from '../abstract-model';
 export declare class VehicleClaimDetails extends AbstractModel {
     financialYear?: number;
     method?: VehicleClaimDetailsMethodEnum;
-    isManual?: boolean;
     user?: User;
+    isManual?: boolean;
 }

package/src/lib/forms/abstract.form.d.ts

@@ -1,16 +1,24 @@
-import { AbstractControl, AbstractControlOptions, AsyncValidatorFn, UntypedFormGroup, ValidatorFn } from '@angular/forms';
+import { AbstractControl, AbstractControlOptions, AsyncValidatorFn, FormGroup, ValidatorFn } from '@angular/forms';
 import { EventEmitter, Type } from '@angular/core';
+/**
+ * Default Controls Interface with loose typing
+ */
+export interface ControlsInterface {
+    [key: string]: AbstractControl<any, any>;
+}
 /**
  * Abstract form class
  * @TODO rename to AbstractFormGroup
  * @TODO Alex TT-2190: refactor: check and improve logic
+ * @TODO Model extends AbstractModel
  */
-export declare abstract class AbstractForm<Model> extends UntypedFormGroup {
+export declare abstract class AbstractForm<Model, Controls extends ControlsInterface = ControlsInterface> extends FormGroup<Controls> {
     static inputMaxLength: number;
     /**
      * Initial form value for comparison with changes to check saved/unsaved state
+     * @TODO typehint to model interface when all db/models migrated to interfaces
      */
-    initialValue: Model;
+    initialValue: any;
     protected excludeExtraneousValues: boolean;
     protected modelClass: Type<Model>;
     model: Model;
@@ -21,11 +29,10 @@ export declare abstract class AbstractForm<Model> extends UntypedFormGroup {
      */
     unsaved: boolean;
     onSubmit: EventEmitter<Model>;
-    protected constructor(controls: {
-        [key: string]: AbstractControl;
-    }, model?: Model, validatorOrOpts?: ValidatorFn | ValidatorFn[] | AbstractControlOptions | null, asyncValidator?: AsyncValidatorFn | AsyncValidatorFn[] | null);
+    protected constructor(controls: Controls, model?: Model, validatorOrOpts?: ValidatorFn | ValidatorFn[] | AbstractControlOptions | null, asyncValidator?: AsyncValidatorFn | AsyncValidatorFn[] | null);
     get saved(): boolean;
     get currentValue(): Model;
+    toggleEnabledState(): void;
     /**
      * Check validation and return a new instance of generic model.
      * Merge form value to initial object
@@ -33,7 +40,7 @@ export declare abstract class AbstractForm<Model> extends UntypedFormGroup {
      * @param includeDisabledFields ignore disabled fields
      */
     submit(data?: object, includeDisabledFields?: boolean): Model;
-    addControl(name: string, control: AbstractControl, options?: {
+    addControl(name: string, control: Controls[string], options?: {
         emitEvent?: boolean;
     }): this;
     markAsUnsaved(): void;

package/src/lib/forms/bank/bank-account/bank-accounts-import.form.d.ts

@@ -1,4 +1,4 @@
-import { BankAccount } from '../../../models/bank/bank-account';
+import { BankAccount } from '../../../models';
 import { AbstractForm } from '../../abstract.form';
 /**
  * Form for import multiple basiq bank accounts