Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/app/core/models/bamboo-hr/bamboo-hr.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ export class BambooHrModel {
static constructBambooConnectionPayload(bambooConnectionForm: FormGroup): BambooHrConnection {
return {
input: {
api_token: bambooConnectionForm.value.apiToken,
subdomain: bambooConnectionForm.value.subDomain
api_token: bambooConnectionForm.get('apiToken')?.value,
subdomain: bambooConnectionForm.get('subDomain')?.value
}
};
}

static constructBambooConfigurationPayload(bambooHrConfigurationForm: FormGroup, orgId: number): BambooHRConfigurationPost {
return {
org: orgId,
additional_email_options: bambooHrConfigurationForm.value.additionalEmails ? bambooHrConfigurationForm.value.additionalEmails : [],
emails_selected: bambooHrConfigurationForm.value.email
additional_email_options: bambooHrConfigurationForm.get('additionalEmails')?.value ? bambooHrConfigurationForm.get('additionalEmails')?.value : [],
emails_selected: bambooHrConfigurationForm.get('email')?.value
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ export class IntacctConnectorModel {

static constructPayload(form: FormGroup): SageIntacctCredential {
return {
si_user_id: form.value.userID,
si_company_id: form.value.companyID,
si_user_password: form.value.userPassword
si_user_id: form.get('userID')?.value,
si_company_id: form.get('companyID')?.value,
si_user_password: form.get('userPassword')?.value
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,46 +75,46 @@ export class ImportSettings {
});

let dependentFieldSetting = null;
if (existingDependentFieldSettings || importSettingsForm.value.isDependentImportEnabled) {
if (existingDependentFieldSettings || importSettingsForm.get('isDependentImportEnabled')?.value) {
dependentFieldSetting = {
is_import_enabled: importSettingsForm.value.isDependentImportEnabled,
is_import_enabled: importSettingsForm.get('isDependentImportEnabled')?.value,
cost_code_field_name: importSettingsForm.get('costCodes')?.value?.attribute_type,
cost_code_placeholder: importSettingsForm.get('costCodes')?.value?.source_placeholder,
cost_type_field_name: importSettingsForm.get('costTypes')?.value?.attribute_type,
cost_type_placeholder: importSettingsForm.get('costTypes')?.value?.source_placeholder,
workspace: importSettingsForm.value.workspaceId
workspace: importSettingsForm.get('workspaceId')?.value
};
}

let isCategoryImportEnabled = false;

if (brandingConfig.brandId === 'fyle') {
isCategoryImportEnabled = importSettingsForm.value.importCategories ? importSettingsForm.value.importCategories : false;
isCategoryImportEnabled = importSettingsForm.get('importCategories')?.value ? importSettingsForm.get('importCategories')?.value : false;
} else {
isCategoryImportEnabled = filteredExpenseFieldArray.filter((field: MappingSetting) => field.source_field === 'CATEGORY' && field.import_to_fyle).length > 0 ? true : false;
}

// Import_code_field value construction
const importCodeFields = importSettingsForm.value.importCodeFields;
const importCodeFields = importSettingsForm.get('importCodeFields')?.value;

const importCodeFieldArray = importCodeFields.filter((field: { import_code: any; }) => field.import_code).map((value: { source_field: any; }) => {
return value.source_field;
});

const finalimportCodeFieldArray: string[] = importSettingsForm.value.importCodeField.filter((value: string) => value!=='COST_CODE' && value !== 'COST_TYPE').concat(importCodeFieldArray);
const finalimportCodeFieldArray: string[] = importSettingsForm.get('importCodeField')?.value.filter((value: string) => value!=='COST_CODE' && value !== 'COST_TYPE').concat(importCodeFieldArray);

// Actual Payload
const importSettingPayload: ImportSettingPost = {
configurations: {
import_categories: isCategoryImportEnabled,
import_tax_codes: importSettingsForm.value.importTaxCodes ? importSettingsForm.value.importTaxCodes : false,
import_vendors_as_merchants: importSettingsForm.value.importVendorAsMerchant ? importSettingsForm.value.importVendorAsMerchant : false,
import_tax_codes: importSettingsForm.get('importTaxCodes')?.value ? importSettingsForm.get('importTaxCodes')?.value : false,
import_vendors_as_merchants: importSettingsForm.get('importVendorAsMerchant')?.value ? importSettingsForm.get('importVendorAsMerchant')?.value : false,
import_code_fields: finalimportCodeFieldArray
},
general_mappings: {
default_tax_code: importSettingsForm.value.importTaxCodes ? {
name: importSettingsForm.value.sageIntacctTaxCodes.value,
id: importSettingsForm.value.sageIntacctTaxCodes.destination_id
default_tax_code: importSettingsForm.get('importTaxCodes')?.value ? {
name: importSettingsForm.get('sageIntacctTaxCodes')?.value.value,
id: importSettingsForm.get('sageIntacctTaxCodes')?.value.destination_id
} : emptyDestinationAttribute
},
mapping_settings: mappingSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function getFrequencyTime(advancedSettingForm: FormGroup) {
export class QBDAdvancedSettingModel {
static constructPayload(advancedSettingForm: FormGroup): QBDAdvancedSettingsPost {
const topMemo: string[] = [];
topMemo.push(advancedSettingForm.value.topMemoStructure);
topMemo.push(advancedSettingForm.get('topMemoStructure')?.value);
const time = getFrequencyTime(advancedSettingForm);
const advancedSettingPayload: QBDAdvancedSettingsPost = {
expense_memo_structure: advancedSettingForm.get('expenseMemoStructure')?.value ? advancedSettingForm.get('expenseMemoStructure')?.value : null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ export class QBOExportSettingModel extends ExportSettingModel {
static getMandatoryField(form: FormGroup, controllerName: string): boolean {
switch (controllerName) {
case 'bankAccount':
return form.value.employeeMapping === EmployeeFieldMapping.EMPLOYEE && form.controls.reimbursableExportType.value && form.controls.reimbursableExportType.value !== QBOReimbursableExpensesObject.EXPENSE;
return form.controls.employeeMapping.value === EmployeeFieldMapping.EMPLOYEE && form.controls.reimbursableExportType.value && form.controls.reimbursableExportType.value !== QBOReimbursableExpensesObject.EXPENSE;
case 'accountsPayable':
return (form.controls.reimbursableExportType.value === QBOReimbursableExpensesObject.BILL || (form.controls.reimbursableExportType.value === QBOReimbursableExpensesObject.JOURNAL_ENTRY && form.value.employeeMapping === EmployeeFieldMapping.VENDOR)) || (form.controls.creditCardExportType.value === QBOCorporateCreditCardExpensesObject.BILL);
return (form.controls.reimbursableExportType.value === QBOReimbursableExpensesObject.BILL || (form.controls.reimbursableExportType.value === QBOReimbursableExpensesObject.JOURNAL_ENTRY && form.controls.employeeMapping.value === EmployeeFieldMapping.VENDOR)) || (form.controls.creditCardExportType.value === QBOCorporateCreditCardExpensesObject.BILL);
case 'defaultCCCAccount':
return form.controls.creditCardExportType.value && form.controls.creditCardExportType.value !== QBOCorporateCreditCardExpensesObject.BILL && form.controls.creditCardExportType.value !== QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE;
case 'defaultCreditCardVendor':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export class TravelperkAdvancedSettingModel {
default_category_id: advancedSettingsForm.get('defaultCategory')?.value ? advancedSettingsForm.get('defaultCategory')?.value.source_id : null,
description_structure: advancedSettingsForm.get('descriptionStructure')?.value ? advancedSettingsForm.get('descriptionStructure')?.value : null,
invoice_lineitem_structure: advancedSettingsForm.get('invoiceLineitemStructure')?.value ? advancedSettingsForm.get('invoiceLineitemStructure')?.value : null,
category_mappings: this.constructCategoryMapping(advancedSettingsForm.value.categoryMappings)
category_mappings: this.constructCategoryMapping(advancedSettingsForm.get('categoryMappings')?.value)
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class TravelperkPaymentProfileSettingModel {
}

static createPaymentProfileSettingPayload(travelperkPaymentProfileSettingForm: FormGroup){
return this.constructPaymentProfileMapping(travelperkPaymentProfileSettingForm.value.paymentProfileMappings);
return this.constructPaymentProfileMapping(travelperkPaymentProfileSettingForm.get('paymentProfileMappings')?.value);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ xdescribe('ConfigurationComponent', () => {

expect(component.showDialog).toBeFalse();

const selectedEmails = component.cofigurationForm.value.emails;
const selectedEmails = component.cofigurationForm.get('emails')?.value;

const newEmail = selectedEmails.filter((email: any) => email.email === '[email protected]');
expect(newEmail.length).toBe(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,22 @@ export class ConfigurationComponent implements OnInit {
}

removeEmail(): void {
const selectedEmails = this.cofigurationForm.value.emails;
const selectedEmails = this.cofigurationForm.get('emails')?.value;
selectedEmails.splice(0, 1);

this.cofigurationForm.controls.emails.patchValue(selectedEmails);
this.selectedEmail = this.cofigurationForm.value.emails.length ? this.cofigurationForm.value.emails[0].email : null;
this.selectedEmail = this.cofigurationForm.get('emails')?.value.length ? this.cofigurationForm.get('emails')?.value[0].email : null;
}

addEmail(): void {
this.trackingService.onClickEvent(TrackingApp.BAMBOO_HR, ClickEvent.ADD_BAMBOO_HR_EMAIL_MANUALLY);
const selectedEmails = this.cofigurationForm.value.emails || [];
selectedEmails.push(this.addEmailForm.value);
const selectedEmails = this.cofigurationForm.get('emails')?.value || [];
selectedEmails.push(this.addEmailForm.getRawValue());

const additionalEmails = this.cofigurationForm.value.additionalEmails || [];
additionalEmails.push(this.addEmailForm.value);
const additionalEmails = this.cofigurationForm.get('additionalEmails')?.value || [];
additionalEmails.push(this.addEmailForm.getRawValue());

this.emails.push(this.addEmailForm.value);
this.emails.push(this.addEmailForm.getRawValue());

this.cofigurationForm.controls.emails.patchValue(selectedEmails);
this.cofigurationForm.controls.additionalEmails.patchValue(additionalEmails);
Expand All @@ -95,7 +95,7 @@ export class ConfigurationComponent implements OnInit {
}

private createEmailAdditionWatcher(): void {
this.assignSelectedEmail(this.cofigurationForm.value.emails);
this.assignSelectedEmail(this.cofigurationForm.get('emails')?.value);
this.cofigurationForm.controls.emails.valueChanges.subscribe((emails: EmailOption[]) => {
this.assignSelectedEmail(emails);
});
Expand All @@ -116,7 +116,7 @@ export class ConfigurationComponent implements OnInit {
search: []
});

this.emails = this.getEmailOptions(this.cofigurationForm.value.additionalEmails, this.additionalEmails);
this.emails = this.getEmailOptions(this.cofigurationForm.get('additionalEmails')?.value, this.additionalEmails);

this.createEmailAdditionWatcher();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
[formControllerName]="'scheduleEnabled'"
[iconPath]="'calendar'">
</app-configuration-toggle-field>
<div *ngIf="advancedSettingForm.value.scheduleEnabled">
<div *ngIf="advancedSettingForm.get('scheduleEnabled')?.value">
<app-configuration-schedule-export
[form]="advancedSettingForm"
[appName]="appName"
Expand Down Expand Up @@ -80,9 +80,9 @@ <h4 class="tw-text-form-label-text-color tw-mb-12-px">Preview of the Description
[iconPath]="'list'"
[redirectLink]="skipExportRedirectLink">
</app-configuration-toggle-field>
<div *ngIf="advancedSettingForm.value.skipExport">
<div *ngIf="advancedSettingForm.get('skipExport')?.value">
<app-configuration-skip-export
[enableSkipExport]="advancedSettingForm.value.skipExport"
[enableSkipExport]="advancedSettingForm.get('skipExport')?.value"
[skipExportForm]="skipExportForm"
[expenseFilter]="expenseFilters"
[conditionFieldOptions]="conditionFieldOptions"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export class BusinessCentralAdvancedSettingsComponent implements OnInit {
}

private createMemoStructureWatcher(): void {
this.memoStructure = this.advancedSettingForm.value.memoStructure;
this.memoStructure = this.advancedSettingForm.get('memoStructure')?.value;
const memo = AdvancedSettingsModel.formatMemoPreview(this.memoStructure, this.defaultMemoOptions);
this.memoPreviewText = memo[0];
this.advancedSettingForm.controls.memoStructure.patchValue(memo[1]);
Expand Down Expand Up @@ -137,25 +137,25 @@ export class BusinessCentralAdvancedSettingsComponent implements OnInit {
valueField = SkipExportModel.constructSkipExportValue(valueField);
valueField.rank = 1;
const skipExportRank1: ExpenseFilterPayload = SkipExportModel.constructExportFilterPayload(valueField);
const payload1 = SkipExportModel.constructSkipExportPayload(skipExportRank1, this.skipExportForm.value.value1);
const payload1 = SkipExportModel.constructSkipExportPayload(skipExportRank1, this.skipExportForm.get('value1')?.value);
this.skipExportService.postExpenseFilter(payload1).subscribe((skipExport1: ExpenseFilter) => {
if (valueField.condition2 && valueField.operator2) {
valueField.rank = 2;
const skipExportRank2: ExpenseFilterPayload = SkipExportModel.constructExportFilterPayload(valueField);
const payload2 = SkipExportModel.constructSkipExportPayload(skipExportRank2, this.skipExportForm.value.value2);
const payload2 = SkipExportModel.constructSkipExportPayload(skipExportRank2, this.skipExportForm.get('value2')?.value);
this.skipExportService.postExpenseFilter(payload2).subscribe((skipExport2: ExpenseFilter) => {});
}
});
}

constructPayloadAndSave(){
this.isSaveInProgress = true;
if (!this.advancedSettingForm.value.skipExport && this.expenseFilters.results.length > 0){
if (!this.advancedSettingForm.get('skipExport')?.value && this.expenseFilters.results.length > 0){
this.expenseFilters.results.forEach((value) => {
this.deleteExpenseFilter(value.id);
});
}
if (this.advancedSettingForm.value.skipExport) {
if (this.advancedSettingForm.get('skipExport')?.value) {
this.saveSkipExportFields();
}
const advancedSettingPayload = BusinessCentralAdvancedSettingsModel.createAdvancedSettingPayload(this.advancedSettingForm);
Expand Down
Loading
Loading