Skip to content

Commit e032ea2

Browse files
fix: checkbox remains checked on re-enabling the import field (#856)
* make the 'dependent imports' checkbox always checked * fix: make 'dependent imports' checkbox always checked for sage300 only * fix: re-add check to show dependent import fields * fix: checkbox remains checked on re-enabling the import field * also enable the checkbox on dropdown change * fix(linting): remove trailing whitespace (cherry picked from commit 26b2ca4)
1 parent a38b68e commit e032ea2

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <h5 *ngIf="!isCloneSettingView" class="!tw-text-text-muted tw-text-14-px !tw-fon
9999
{{brandingConfig.brandName}} Fields should be unique
100100
</p>
101101
</div>
102-
<p-inputSwitch *ngIf="!isDestinationFixedImport" (onChange)="onShowWarningForDependentFields($event, expenseField)" [pTooltip]="isExpenseFieldDependent(expenseField.value) ? 'You cannot import dependent fields' : '' " (click)="updateDependentField(expenseField.value.source_field,expenseField.value.import_to_fyle)" formControlName="import_to_fyle" class="input-toggle-section tw-pl-4-px tw-pt-10-px"></p-inputSwitch>
102+
<p-inputSwitch *ngIf="!isDestinationFixedImport" (onChange)="onSwitchChanged($event, expenseField)" [pTooltip]="isExpenseFieldDependent(expenseField.value) ? 'You cannot import dependent fields' : '' " (click)="updateDependentField(expenseField.value.source_field,expenseField.value.import_to_fyle)" formControlName="import_to_fyle" class="input-toggle-section tw-pl-4-px tw-pt-10-px"></p-inputSwitch>
103103
</div>
104104
<div class="tw-pt-26-px" *ngIf="expenseField.value.source_field==='PROJECT' && expenseField.value.import_to_fyle && expenseField.value.destination_field === dependentDestinationValue" [formGroup]="form">
105105
<div class="tw-flex">

src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts

+11
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ export class ConfigurationImportFieldComponent implements OnInit {
126126
(this.form.get('expenseFields') as FormArray).at(index)?.get('import_to_fyle')?.setValue(true);
127127
}
128128

129+
if ( this.appName === AppName.SAGE300) {
130+
this.form.controls.isDependentImportEnabled.setValue(true);
131+
}
132+
129133
if (selectedValue === MappingSourceField.PROJECT && (this.form.get('expenseFields') as FormArray).at(index)?.get('source_field')?.value !== XeroFyleField.CUSTOMER && this.appName === AppName.XERO) {
130134
this.isXeroProjectMapped = true;
131135
this.xeroProjectMapping.emit(this.isXeroProjectMapped);
@@ -154,6 +158,13 @@ export class ConfigurationImportFieldComponent implements OnInit {
154158
this.xeroProjectMapping.emit(this.isXeroProjectMapped);
155159
}
156160

161+
onSwitchChanged(event: any, formGroup: AbstractControl): void {
162+
this.onShowWarningForDependentFields(event, formGroup);
163+
if (event.checked && this.appName === AppName.SAGE300) {
164+
this.form.controls.isDependentImportEnabled.setValue(true);
165+
}
166+
}
167+
157168
onShowWarningForDependentFields(event: any, formGroup: AbstractControl): void {
158169
if (!event.checked && formGroup.value.source_field === MappingSourceField.PROJECT) {
159170
this.showWarningForDependentFields.emit();

0 commit comments

Comments
 (0)