Skip to content

Commit 4e6d820

Browse files
DhaaraniCITDhaaraniCIT
authored
fix: basic .value to get().value (#971)
1 parent be243d3 commit 4e6d820

File tree

69 files changed

+357
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+357
-357
lines changed

‎src/app/core/models/bamboo-hr/bamboo-hr.model.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ export class BambooHrModel {
4343
static constructBambooConnectionPayload(bambooConnectionForm: FormGroup): BambooHrConnection {
4444
return {
4545
input: {
46-
api_token: bambooConnectionForm.value.apiToken,
47-
subdomain: bambooConnectionForm.value.subDomain
46+
api_token: bambooConnectionForm.get('apiToken')?.value,
47+
subdomain: bambooConnectionForm.get('subDomain')?.value
4848
}
4949
};
5050
}
5151

5252
static constructBambooConfigurationPayload(bambooHrConfigurationForm: FormGroup, orgId: number): BambooHRConfigurationPost {
5353
return {
5454
org: orgId,
55-
additional_email_options: bambooHrConfigurationForm.value.additionalEmails ? bambooHrConfigurationForm.value.additionalEmails : [],
56-
emails_selected: bambooHrConfigurationForm.value.email
55+
additional_email_options: bambooHrConfigurationForm.get('additionalEmails')?.value ? bambooHrConfigurationForm.get('additionalEmails')?.value : [],
56+
emails_selected: bambooHrConfigurationForm.get('email')?.value
5757
};
5858
}
5959
}

‎src/app/core/models/intacct/intacct-configuration/connector.model.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export class IntacctConnectorModel {
2121

2222
static constructPayload(form: FormGroup): SageIntacctCredential {
2323
return {
24-
si_user_id: form.value.userID,
25-
si_company_id: form.value.companyID,
26-
si_user_password: form.value.userPassword
24+
si_user_id: form.get('userID')?.value,
25+
si_company_id: form.get('companyID')?.value,
26+
si_user_password: form.get('userPassword')?.value
2727
};
2828
}
2929
}

‎src/app/core/models/intacct/intacct-configuration/import-settings.model.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,46 +75,46 @@ export class ImportSettings {
7575
});
7676

7777
let dependentFieldSetting = null;
78-
if (existingDependentFieldSettings || importSettingsForm.value.isDependentImportEnabled) {
78+
if (existingDependentFieldSettings || importSettingsForm.get('isDependentImportEnabled')?.value) {
7979
dependentFieldSetting = {
80-
is_import_enabled: importSettingsForm.value.isDependentImportEnabled,
80+
is_import_enabled: importSettingsForm.get('isDependentImportEnabled')?.value,
8181
cost_code_field_name: importSettingsForm.get('costCodes')?.value?.attribute_type,
8282
cost_code_placeholder: importSettingsForm.get('costCodes')?.value?.source_placeholder,
8383
cost_type_field_name: importSettingsForm.get('costTypes')?.value?.attribute_type,
8484
cost_type_placeholder: importSettingsForm.get('costTypes')?.value?.source_placeholder,
85-
workspace: importSettingsForm.value.workspaceId
85+
workspace: importSettingsForm.get('workspaceId')?.value
8686
};
8787
}
8888

8989
let isCategoryImportEnabled = false;
9090

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

9797
// Import_code_field value construction
98-
const importCodeFields = importSettingsForm.value.importCodeFields;
98+
const importCodeFields = importSettingsForm.get('importCodeFields')?.value;
9999

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

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

106106
// Actual Payload
107107
const importSettingPayload: ImportSettingPost = {
108108
configurations: {
109109
import_categories: isCategoryImportEnabled,
110-
import_tax_codes: importSettingsForm.value.importTaxCodes ? importSettingsForm.value.importTaxCodes : false,
111-
import_vendors_as_merchants: importSettingsForm.value.importVendorAsMerchant ? importSettingsForm.value.importVendorAsMerchant : false,
110+
import_tax_codes: importSettingsForm.get('importTaxCodes')?.value ? importSettingsForm.get('importTaxCodes')?.value : false,
111+
import_vendors_as_merchants: importSettingsForm.get('importVendorAsMerchant')?.value ? importSettingsForm.get('importVendorAsMerchant')?.value : false,
112112
import_code_fields: finalimportCodeFieldArray
113113
},
114114
general_mappings: {
115-
default_tax_code: importSettingsForm.value.importTaxCodes ? {
116-
name: importSettingsForm.value.sageIntacctTaxCodes.value,
117-
id: importSettingsForm.value.sageIntacctTaxCodes.destination_id
115+
default_tax_code: importSettingsForm.get('importTaxCodes')?.value ? {
116+
name: importSettingsForm.get('sageIntacctTaxCodes')?.value.value,
117+
id: importSettingsForm.get('sageIntacctTaxCodes')?.value.destination_id
118118
} : emptyDestinationAttribute
119119
},
120120
mapping_settings: mappingSettings,

‎src/app/core/models/qbd/qbd-configuration/qbd-advanced-setting.model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function getFrequencyTime(advancedSettingForm: FormGroup) {
5454
export class QBDAdvancedSettingModel {
5555
static constructPayload(advancedSettingForm: FormGroup): QBDAdvancedSettingsPost {
5656
const topMemo: string[] = [];
57-
topMemo.push(advancedSettingForm.value.topMemoStructure);
57+
topMemo.push(advancedSettingForm.get('topMemoStructure')?.value);
5858
const time = getFrequencyTime(advancedSettingForm);
5959
const advancedSettingPayload: QBDAdvancedSettingsPost = {
6060
expense_memo_structure: advancedSettingForm.get('expenseMemoStructure')?.value ? advancedSettingForm.get('expenseMemoStructure')?.value : null,

‎src/app/core/models/qbo/qbo-configuration/qbo-export-setting.model.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ export class QBOExportSettingModel extends ExportSettingModel {
193193
static getMandatoryField(form: FormGroup, controllerName: string): boolean {
194194
switch (controllerName) {
195195
case 'bankAccount':
196-
return form.value.employeeMapping === EmployeeFieldMapping.EMPLOYEE && form.controls.reimbursableExportType.value && form.controls.reimbursableExportType.value !== QBOReimbursableExpensesObject.EXPENSE;
196+
return form.controls.employeeMapping.value === EmployeeFieldMapping.EMPLOYEE && form.controls.reimbursableExportType.value && form.controls.reimbursableExportType.value !== QBOReimbursableExpensesObject.EXPENSE;
197197
case 'accountsPayable':
198-
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);
198+
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);
199199
case 'defaultCCCAccount':
200200
return form.controls.creditCardExportType.value && form.controls.creditCardExportType.value !== QBOCorporateCreditCardExpensesObject.BILL && form.controls.creditCardExportType.value !== QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE;
201201
case 'defaultCreditCardVendor':

‎src/app/core/models/travelperk/travelperk-configuration/travelperk-advanced-settings.model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class TravelperkAdvancedSettingModel {
136136
default_category_id: advancedSettingsForm.get('defaultCategory')?.value ? advancedSettingsForm.get('defaultCategory')?.value.source_id : null,
137137
description_structure: advancedSettingsForm.get('descriptionStructure')?.value ? advancedSettingsForm.get('descriptionStructure')?.value : null,
138138
invoice_lineitem_structure: advancedSettingsForm.get('invoiceLineitemStructure')?.value ? advancedSettingsForm.get('invoiceLineitemStructure')?.value : null,
139-
category_mappings: this.constructCategoryMapping(advancedSettingsForm.value.categoryMappings)
139+
category_mappings: this.constructCategoryMapping(advancedSettingsForm.get('categoryMappings')?.value)
140140
};
141141
}
142142
}

‎src/app/core/models/travelperk/travelperk-configuration/travelperk-payment-profile-settings.model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class TravelperkPaymentProfileSettingModel {
7575
}
7676

7777
static createPaymentProfileSettingPayload(travelperkPaymentProfileSettingForm: FormGroup){
78-
return this.constructPaymentProfileMapping(travelperkPaymentProfileSettingForm.value.paymentProfileMappings);
78+
return this.constructPaymentProfileMapping(travelperkPaymentProfileSettingForm.get('paymentProfileMappings')?.value);
7979
}
8080

8181
}

‎src/app/integrations/bamboo-hr/configuration/configuration.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ xdescribe('ConfigurationComponent', () => {
8181

8282
expect(component.showDialog).toBeFalse();
8383

84-
const selectedEmails = component.cofigurationForm.value.emails;
84+
const selectedEmails = component.cofigurationForm.get('emails')?.value;
8585

8686
const newEmail = selectedEmails.filter((email: any) => email.email === '[email protected]');
8787
expect(newEmail.length).toBe(1);

‎src/app/integrations/bamboo-hr/configuration/configuration.component.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,22 @@ export class ConfigurationComponent implements OnInit {
5656
}
5757

5858
removeEmail(): void {
59-
const selectedEmails = this.cofigurationForm.value.emails;
59+
const selectedEmails = this.cofigurationForm.get('emails')?.value;
6060
selectedEmails.splice(0, 1);
6161

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

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

71-
const additionalEmails = this.cofigurationForm.value.additionalEmails || [];
72-
additionalEmails.push(this.addEmailForm.value);
71+
const additionalEmails = this.cofigurationForm.get('additionalEmails')?.value || [];
72+
additionalEmails.push(this.addEmailForm.getRawValue());
7373

74-
this.emails.push(this.addEmailForm.value);
74+
this.emails.push(this.addEmailForm.getRawValue());
7575

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

9797
private createEmailAdditionWatcher(): void {
98-
this.assignSelectedEmail(this.cofigurationForm.value.emails);
98+
this.assignSelectedEmail(this.cofigurationForm.get('emails')?.value);
9999
this.cofigurationForm.controls.emails.valueChanges.subscribe((emails: EmailOption[]) => {
100100
this.assignSelectedEmail(emails);
101101
});
@@ -116,7 +116,7 @@ export class ConfigurationComponent implements OnInit {
116116
search: []
117117
});
118118

119-
this.emails = this.getEmailOptions(this.cofigurationForm.value.additionalEmails, this.additionalEmails);
119+
this.emails = this.getEmailOptions(this.cofigurationForm.get('additionalEmails')?.value, this.additionalEmails);
120120

121121
this.createEmailAdditionWatcher();
122122
}

‎src/app/integrations/business-central/business-central-shared/business-central-advanced-settings/business-central-advanced-settings.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[formControllerName]="'scheduleEnabled'"
3131
[iconPath]="'calendar'">
3232
</app-configuration-toggle-field>
33-
<div *ngIf="advancedSettingForm.value.scheduleEnabled">
33+
<div *ngIf="advancedSettingForm.get('scheduleEnabled')?.value">
3434
<app-configuration-schedule-export
3535
[form]="advancedSettingForm"
3636
[appName]="appName"
@@ -80,9 +80,9 @@ <h4 class="tw-text-form-label-text-color tw-mb-12-px">Preview of the Description
8080
[iconPath]="'list'"
8181
[redirectLink]="skipExportRedirectLink">
8282
</app-configuration-toggle-field>
83-
<div *ngIf="advancedSettingForm.value.skipExport">
83+
<div *ngIf="advancedSettingForm.get('skipExport')?.value">
8484
<app-configuration-skip-export
85-
[enableSkipExport]="advancedSettingForm.value.skipExport"
85+
[enableSkipExport]="advancedSettingForm.get('skipExport')?.value"
8686
[skipExportForm]="skipExportForm"
8787
[expenseFilter]="expenseFilters"
8888
[conditionFieldOptions]="conditionFieldOptions"

0 commit comments

Comments
 (0)