feat: move employee settings to export settings

src/app/integrations/qbo/qbo-main/qbo-configuration/qbo-configuration-routing.module.ts

@@ -11,10 +11,6 @@ const routes: Routes = [
     path: '',
     component: QboConfigurationComponent,
     children: [
-      {
-        path: 'employee_settings',
-        component: QboEmployeeSettingsComponent
-      },
       {
         path: 'export_settings',
         component: QboExportSettingsComponent

src/app/integrations/qbo/qbo-main/qbo-configuration/qbo-configuration.component.ts

@@ -12,7 +12,6 @@ export class QboConfigurationComponent implements OnInit {
   readonly brandingContent = brandingContent.configuration;
 
   modules: MenuItem[] = [
-    {label: 'Map Employees', routerLink: '/integrations/qbo/main/configuration/employee_settings'},
     {label: this.brandingContent.exportSetting.stepName, routerLink: '/integrations/qbo/main/configuration/export_settings'},
     {label: this.brandingContent.importSetting.stepName, routerLink: '/integrations/qbo/main/configuration/import_settings'},
     {label: this.brandingContent.advancedSettings.stepName, routerLink: '/integrations/qbo/main/configuration/advanced_settings'}

src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.html

@@ -12,6 +12,28 @@
                 (refreshDimension)="refreshDimensions()">
             </app-configuration-step-header>
         </div>
+        <form [formGroup]="employeeSettingForm">
+            <div class="tw-p-24-px">
+              <app-configuration-select-field
+                [form]="employeeSettingForm"
+                [isFieldMandatory]="true"
+                [formControllerName]="'employeeMapping'"
+                [options]="employeeMappingOptions"
+                [label]="'How are your Employees represented in QuickBooks Online?'"
+                [placeholder]="'Select representation'"
+                [tooltipText]="'Select how you represent your employees in QuickBooks Online'">
+              </app-configuration-select-field>
+
+              <app-configuration-select-field
+                [form]="employeeSettingForm"
+                [formControllerName]="'autoMapEmployee'"
+                [options]="autoMapEmployeeOptions"
+                [label]="'How should Employees in ' + brandingConfig.brandName + ' be matched to Employees/Vendors in QuickBooks Online?'"
+                [placeholder]="'Select matching preference'"
+                [tooltipText]="'Automatically map employees based on a unique parameter'">
+              </app-configuration-select-field>
+            </div>
+          </form>
         <form [formGroup]="exportSettingForm">
             <div class="tw-p-24-px" [ngClass]="{'tw-pt-0': !brandingFeatureConfig.featureFlags.exportSettings.reimbursableExpenses}">
                 <div *ngIf="brandingFeatureConfig.featureFlags.exportSettings.reimbursableExpenses" class="tw-mb-16-px">

src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts

@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { Observable, Subject, debounceTime, filter, forkJoin } from 'rxjs';
 import { brandingConfig, brandingContent, brandingFeatureConfig, brandingKbArticles } from 'src/app/branding/branding-config';
 import { ExportSettingModel, ExportSettingOptionSearch } from 'src/app/core/models/common/export-settings.model';
 import { SelectFormOption } from 'src/app/core/models/common/select-form-option.model';
-import { DefaultDestinationAttribute, PaginatedDestinationAttribute } from 'src/app/core/models/db/destination-attribute.model';
-import { AppName, ConfigurationCta, ConfigurationWarningEvent, EmployeeFieldMapping, ExpenseGroupingFieldOption, QBOCorporateCreditCardExpensesObject, QBOOnboardingState, QBOReimbursableExpensesObject, QboExportSettingDestinationOptionKey, ToastSeverity } from 'src/app/core/models/enum/enum.model';
+import { DefaultDestinationAttribute, DestinationAttribute, PaginatedDestinationAttribute } from 'src/app/core/models/db/destination-attribute.model';
+import { AppName, ConfigurationCta, ConfigurationWarningEvent, EmployeeFieldMapping, ExpenseGroupingFieldOption, FyleField, QBOCorporateCreditCardExpensesObject, QBOOnboardingState, QBOReimbursableExpensesObject, QboExportSettingDestinationOptionKey, ToastSeverity } from 'src/app/core/models/enum/enum.model';
 import { ConfigurationWarningOut } from 'src/app/core/models/misc/configuration-warning.model';
 import { QBOExportSettingGet, QBOExportSettingModel } from 'src/app/core/models/qbo/qbo-configuration/qbo-export-setting.model';
 import { HelperService } from 'src/app/core/services/common/helper.service';
@@ -16,6 +16,10 @@
 import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
 import { QboExportSettingsService } from 'src/app/core/services/qbo/qbo-configuration/qbo-export-settings.service';
 import { QboHelperService } from 'src/app/core/services/qbo/qbo-core/qbo-helper.service';
+// Add to existing imports
+import { EmployeeSettingModel } from 'src/app/core/models/common/employee-settings.model';
+import { QBOEmployeeSettingGet, QBOEmployeeSettingModel } from 'src/app/core/models/qbo/qbo-configuration/qbo-employee-setting.model';
+import { QboEmployeeSettingsService } from 'src/app/core/services/qbo/qbo-configuration/qbo-employee-settings.service';
 
 @Component({
   selector: 'app-qbo-export-settings',
@@ -114,6 +118,14 @@
   readonly brandingContent = brandingContent.configuration.exportSetting;
 
   isMultilineOption: boolean;
+
+  //Employee settings
+  employeeSettingForm: FormGroup;
+  employeeMappingOptions: SelectFormOption[] = EmployeeSettingModel.getEmployeeFieldMappingOptions();
+  autoMapEmployeeOptions: SelectFormOption[] = QBOEmployeeSettingModel.getAutoMapEmployeeOptions();
+  employeeSetting: QBOEmployeeSettingGet;
+  existingEmployeeFieldMapping: EmployeeFieldMapping;
+  liveEntityExample: {[FyleField.EMPLOYEE]: string | undefined, [FyleField.VENDOR]: string | undefined};
 
   constructor(
     private exportSettingService: QboExportSettingsService,
@@ -123,7 +135,8 @@
     private router: Router,
     private toastService: IntegrationsToastService,
     private windowService: WindowService,
-    private workspaceService: WorkspaceService
+    private workspaceService: WorkspaceService,
+    private employeeSettingService: QboEmployeeSettingsService
   ) {
     this.windowReference = this.windowService.nativeWindow;
   }
@@ -133,23 +146,31 @@
     if (data.hasAccepted) {
       this.isSaveInProgress = true;
       const exportSettingPayload = QBOExportSettingModel.constructPayload(this.exportSettingForm);
-      this.exportSettingService.postExportSettings(exportSettingPayload).subscribe((response: QBOExportSettingGet) => {
+      const employeeSettingPayload = QBOEmployeeSettingModel.constructPayload(this.employeeSettingForm);
+      forkJoin([
+        this.employeeSettingService.postEmployeeSettings(employeeSettingPayload),
+        this.exportSettingService.postExportSettings(exportSettingPayload)
+      ]).subscribe(() => {
         this.isSaveInProgress = false;
-        this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Export settings saved successfully');
-
+        this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Settings saved successfully');
         if (this.isOnboarding) {
           this.workspaceService.setOnboardingState(QBOOnboardingState.IMPORT_SETTINGS);
-          this.router.navigate([`/integrations/qbo/onboarding/import_settings`]);
-        } else if (this.isAdvancedSettingAffected()) {
-          this.router.navigate(['/integrations/qbo/main/configuration/advanced_settings']);
+          this.router.navigate(['/integrations/qbo/onboarding/import_settings']);
         }
       }, () => {
         this.isSaveInProgress = false;
-        this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Error saving export settings, please try again later');
+        this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Error saving settings, please try again later');
       });
     }
   }
 
+  private setLiveEntityExample(destinationAttributes: DestinationAttribute[]): void {
+    this.liveEntityExample = {
+      [FyleField.EMPLOYEE]: destinationAttributes.find((attribute: DestinationAttribute) => attribute.attribute_type === FyleField.EMPLOYEE)?.value,
+      [FyleField.VENDOR]: destinationAttributes.find((attribute: DestinationAttribute) => attribute.attribute_type === FyleField.VENDOR)?.value
+    };
+  }
+
   navigateToPreviousStep(): void {
     if (brandingFeatureConfig.featureFlags.mapEmployees) {
       this.router.navigate([`/integrations/qbo/onboarding/employee_settings`]);
@@ -410,12 +431,14 @@
     forkJoin([
       this.exportSettingService.getExportSettings(),
       this.workspaceService.getWorkspaceGeneralSettings(),
-      ...groupedAttributes
-    ]).subscribe(([exportSetting, workspaceGeneralSettings, bankAccounts, cccAccounts, accountsPayables, vendors]) => {
+      this.employeeSettingService.getEmployeeSettings(),
+    this.employeeSettingService.getDistinctQBODestinationAttributes([FyleField.EMPLOYEE, FyleField.VENDOR]),
+      ...groupedAttributes,
+    ]).subscribe(([exportSetting, workspaceGeneralSettings, employeeSettings, destinationAttributes, bankAccounts, cccAccounts, accountsPayables, vendors]) => {
 
       this.exportSettings = exportSetting;
-      this.employeeFieldMapping = workspaceGeneralSettings.employee_field_mapping;
-
+      this.employeeFieldMapping = employeeSettings.workspace_general_settings.employee_field_mapping;
+      this.setLiveEntityExample(destinationAttributes);
       this.bankAccounts = bankAccounts.results.map((option) => QBOExportSettingModel.formatGeneralMappingPayload(option));
       this.cccAccounts = cccAccounts.results.map((option) => QBOExportSettingModel.formatGeneralMappingPayload(option));
       this.accountsPayables = accountsPayables.results.map((option) => QBOExportSettingModel.formatGeneralMappingPayload(option));
@@ -429,7 +452,11 @@
 
       this.addMissingOptions();
       this.exportSettingForm = QBOExportSettingModel.mapAPIResponseToFormGroup(this.exportSettings, this.employeeFieldMapping);
-
+      this.employeeSettingForm = new FormGroup({
+        employeeMapping: new FormControl(this.existingEmployeeFieldMapping, Validators.required),
+        autoMapEmployee: new FormControl(employeeSettings.workspace_general_settings?.auto_map_employees),
+        searchOption: new FormControl('')
+      });
       if (!this.brandingFeatureConfig.featureFlags.exportSettings.reimbursableExpenses) {
         this.exportSettingForm.controls.creditCardExpense.patchValue(true);
       }