Fix team testing bugs - QBO (#454)

* Fix team testing bugs - QBO

* few more fixes

Author: ashwin1111

src/app/auth/redirect/redirect.component.ts

@@ -27,7 +27,7 @@ export class RedirectComponent implements OnInit {
         const url = `http://localhost:4200/oauth/travelperk?code=${this.route.snapshot.queryParams.code}&state=${orgId}`;
         this.windowService.redirect(url);
       } else if (this.route.snapshot.queryParams?.state === 'qbo_local_redirect' || this.route.snapshot.queryParams?.state === 'business_central_local_redirect') {
-        const url = `http://localhost:4200/integrations/oauth_callback?code=${this.route.snapshot.queryParams.code}&realmId=${this.route.snapshot.queryParams.realmId}`;
+        const url = `http://localhost:4200/oauth/default?code=${this.route.snapshot.queryParams.code}&realmId=${this.route.snapshot.queryParams.realmId}`;
         this.windowService.redirect(url);
       }
     } else {

src/app/core/models/common/export-settings.model.ts

@@ -15,9 +15,9 @@ export class ExportSettingModel {
     static getExportGroup(exportGroups: string[] | null | undefined): string {
         if (exportGroups) {
             const exportGroup = exportGroups.find((exportGroup) => {
-                return exportGroup === ExpenseGroupingFieldOption.EXPENSE_ID || exportGroup === ExpenseGroupingFieldOption.CLAIM_NUMBER || exportGroup === ExpenseGroupingFieldOption.SETTLEMENT_ID;
+                return exportGroup === ExpenseGroupingFieldOption.EXPENSE_ID || exportGroup === ExpenseGroupingFieldOption.REPORT_ID || exportGroup === ExpenseGroupingFieldOption.CLAIM_NUMBER || exportGroup === ExpenseGroupingFieldOption.SETTLEMENT_ID;
             });
-            return exportGroup ? exportGroup : ExpenseGroupingFieldOption.CLAIM_NUMBER;
+            return exportGroup && exportGroup !== ExpenseGroupingFieldOption.REPORT_ID ? exportGroup : ExpenseGroupingFieldOption.CLAIM_NUMBER;
         }
         return '';
     }

src/app/core/models/db/accounting-export.model.ts

@@ -226,11 +226,13 @@ export class AccountingExportModel {
 
 export class SkippedAccountingExportModel {
   static getfilteredSkippedAccountingExports(query: string, group: SkipExportList): boolean {
+    const employeeName = group.employee ? group.employee[0] : '';
     const employeeID = group.employee ? group.employee[1] : '';
     const expenseType = group.expenseType ? group.expenseType : '';
     const referenceNumber = group.claim_number ? group.claim_number : '';
 
     return (
+      employeeName.toLowerCase().includes(query) ||
       employeeID.toLowerCase().includes(query) ||
       expenseType.toLowerCase().includes(query) ||
       referenceNumber.toLowerCase().includes(query)

src/app/core/models/enum/enum.model.ts

@@ -249,6 +249,7 @@ export enum FyleField {
 
 export enum ExpenseGroupingFieldOption {
   CLAIM_NUMBER = 'claim_number',
+  REPORT_ID = 'report_id',
   SETTLEMENT_ID = 'settlement_id',
   EXPENSE_ID = 'expense_id',
   EXPENSE = 'EXPENSE',

src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-complete-export-log/business-central-complete-export-log.component.ts

@@ -131,6 +131,8 @@ export class BusinessCentralCompleteExportLogComponent implements OnInit {
         this.trackDateFilter('existing', this.selectedDateFilter);
         this.getAccountingExports(paginator.limit, paginator.offset);
       } else {
+        this.dateOptions = AccountingExportModel.getDateOptions();
+        this.exportLogForm.controls.start.patchValue([]);
         this.selectedDateFilter = null;
         this.getAccountingExports(paginator.limit, paginator.offset);
       }

src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-skipped-export-log/business-central-skipped-export-log.component.ts

@@ -109,6 +109,8 @@ export class BusinessCentralSkippedExportLogComponent implements OnInit {
         this.trackDateFilter('existing', this.selectedDateFilter);
         this.getSkippedExpenses(paginator.limit, paginator.offset);
       } else {
+        this.dateOptions = AccountingExportModel.getDateOptions();
+        this.skipExportLogForm.controls.start.patchValue([]);
         this.selectedDateFilter = null;
         this.getSkippedExpenses(paginator.limit, paginator.offset);
       }

src/app/integrations/integrations-routing.module.ts

@@ -43,10 +43,6 @@ const routes: Routes = [
       {
         path: 'business_central',
         loadChildren: () => import('./business-central/business-central.module').then(m => m.BusinessCentralModule)
-      },
-      {
-        path: 'oauth_callback',
-        loadChildren: () => import('./oauth-callback/oauth-callback.module').then(m => m.OauthCallbackModule)
       }
     ]
   }

src/app/integrations/oauth-callback/oauth-callback-routing.module.ts

@@ -120,6 +120,8 @@ export class QboCompleteExportLogComponent implements OnInit {
 
         this.getAccountingExports(paginator.limit, paginator.offset);
       } else {
+        this.dateOptions = AccountingExportModel.getDateOptions();
+        this.exportLogForm.controls.start.patchValue([]);
         this.selectedDateFilter = null;
         this.getAccountingExports(paginator.limit, paginator.offset);
       }

src/app/integrations/oauth-callback/oauth-callback.component.ts

@@ -110,6 +110,8 @@ export class QboSkippedExportLogComponent implements OnInit {
 
         this.getSkippedExpenses(paginator.limit, paginator.offset);
       } else {
+        this.dateOptions = AccountingExportModel.getDateOptions();
+        this.skipExportLogForm.controls.start.patchValue([]);
         this.selectedDateFilter = null;
         this.getSkippedExpenses(paginator.limit, paginator.offset);
       }

src/app/integrations/oauth-callback/oauth-callback.module.ts

@@ -30,6 +30,7 @@ export class QboMainComponent implements OnInit {
   ) { }
 
   refreshDimensions() {
+    this.qboHelperService.refreshQBODimensions().subscribe();
     this.qboHelperService.refreshFyleDimensions().subscribe();
     this.accountingExportService.importExpensesFromFyle('v1').subscribe();
   }

src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-complete-export-log/qbo-complete-export-log.component.ts

@@ -158,17 +158,23 @@ export class QboOnboardingConnectorComponent implements OnInit, OnDestroy {
     });
   }
 
+  private handlePostQBOConnection(qboCredential: QBOCredential): void {
+    this.workspaceService.setOnboardingState(QBOOnboardingState.MAP_EMPLOYEES);
+    this.qboConnectionInProgress = false;
+    this.qboCompanyName = qboCredential.company_name;
+    this.isQboConnected = true;
+    this.qboTokenExpired = false;
+    this.showOrHideDisconnectQBO();
+  }
+
   private postQboCredentials(code: string, realmId: string): void {
     const payload: QBOConnectorPost = QBOConnectorModel.constructPayload(code, realmId);
 
     this.qboConnectorService.connectQBO(payload).subscribe((qboCredential: QBOCredential) => {
       this.qboHelperService.refreshQBODimensions().subscribe(() => {
-        this.workspaceService.setOnboardingState(QBOOnboardingState.MAP_EMPLOYEES);
-        this.qboConnectionInProgress = false;
-        this.qboCompanyName = qboCredential.company_name;
-        this.isQboConnected = true;
-        this.qboTokenExpired = false;
-        this.showOrHideDisconnectQBO();
+        this.handlePostQBOConnection(qboCredential);
+      }, () => {
+        this.handlePostQBOConnection(qboCredential);
       });
     }, (error) => {
       const errorMessage = 'message' in error.error ? error.error.message : 'Failed to connect to QuickBooks Online. Please try again';

src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-skipped-export-log/qbo-skipped-export-log.component.ts

@@ -160,7 +160,7 @@ <h4 class="tw-mb-12-px">Preview of the Description Field</h4>
             <app-configuration-step-footer
                 [ctaText] = "!isSaveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING"
                 [isButtonDisabled]="!advancedSettingForm.valid"
-                [showBackButton]="true"
+                [showBackButton]="isOnboarding ? true : false"
                 (save)="save()"
                 (navigateToPreviousStep)="navigateToPreviousStep()"></app-configuration-step-footer>
         </div>

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

@@ -43,7 +43,7 @@
                 <app-configuration-step-footer
                     [ctaText]="!isSaveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING"
                     [isButtonDisabled]="!employeeSettingForm.valid"
-                    [showBackButton]="true"
+                    [showBackButton]="isOnboarding ? true : false"
                     (save)="save()"
                     (navigateToPreviousStep)="navigateToPreviousStep()">
                 </app-configuration-step-footer>

src/app/integrations/qbo/qbo-onboarding/qbo-onboarding-connector/qbo-onboarding-connector.component.ts

@@ -29,9 +29,10 @@
                                 [isFieldMandatory]="true"
                                 [mandatoryErrorListName]="'export module'"
                                 [label]="'How should the expenses be exported?'"
+                                [subLabel]="'Choose the type of transaction in QuickBooks Online to export your ' + brandingConfig.brandName +' expenses'"
                                 [options]="reimbursableExportTypes"
                                 [iconPath]="'expense'"
-                                [placeholder]="'Choose the type of transaction in QuickBooks Online to export your ' + brandingConfig.brandName +' expenses'"
+                                [placeholder]="'Select expense export type'"
                                 [formControllerName]="'reimbursableExportType'"
                                 [appName]="appName"
                                 [exportTypeIconPathArray]="previewImagePaths">
@@ -144,6 +145,7 @@
                             [isFieldMandatory]="true"
                             [mandatoryErrorListName]="'export module'"
                             [label]="'How should the expenses be exported?'"
+                            [subLabel]="'Choose the type of transaction in QuickBooks Online to export your ' + brandingConfig.brandName +' expenses'"
                             [options]="creditCardExportTypes"
                             [iconPath]="'expense'"
                             [placeholder]="'Select expense export type'"
@@ -272,7 +274,7 @@
                 <app-configuration-step-footer
                     [ctaText]="!isSaveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING"
                     [isButtonDisabled]="!exportSettingForm.valid"
-                    [showBackButton]="true"
+                    [showBackButton]="isOnboarding ? true : false"
                     (save)="save()"
                     (navigateToPreviousStep)="navigateToPreviousStep()">
                 </app-configuration-step-footer>

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

@@ -228,7 +228,7 @@ export class QboExportSettingsComponent implements OnInit {
   }
 
   private setupCustomWatchers(): void {
-    if (this.exportSettingForm.value.creditCardExportType) {
+    if (this.exportSettingForm.value.creditCardExportType && [QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE, QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE].includes(this.exportSettingForm.value.creditCardExportType)) {
       this.updateCCCExpenseGroupingDateOptions(this.exportSettingForm.value.creditCardExportType);
     }
 

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

@@ -95,7 +95,7 @@ <h5 class="lg:tw-w-3/5 md:tw-w-1/2 tw-text-slightly-normal-text-color tw-text-14
                 <app-configuration-step-footer
                     [ctaText] = "!isSaveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING"
                     [isButtonDisabled]="!importSettingForm.valid"
-                    [showBackButton]="true"
+                    [showBackButton]="isOnboarding ? true : false"
                     (save)="save()"
                     (navigateToPreviousStep)="navigateToPreviousStep()"></app-configuration-step-footer>
             </div>

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

@@ -127,6 +127,8 @@ export class Sage300CompleteExportLogComponent implements OnInit {
         this.trackDateFilter('existing', this.selectedDateFilter);
         this.getAccountingExports(paginator.limit, paginator.offset);
       } else {
+        this.dateOptions = AccountingExportModel.getDateOptions();
+        this.exportLogForm.controls.start.patchValue([]);
         this.selectedDateFilter = null;
         this.getAccountingExports(paginator.limit, paginator.offset);
       }

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

@@ -113,6 +113,8 @@ export class Sage300SkippedExportLogComponent implements OnInit {
 
         this.trackDateFilter('existing', this.selectedDateFilter);
         this.getSkippedExpenses(paginator.limit, paginator.offset);
+        this.dateOptions = AccountingExportModel.getDateOptions();
+        this.skipExportLogForm.controls.start.patchValue([]);
       } else {
         this.selectedDateFilter = null;
         this.getSkippedExpenses(paginator.limit, paginator.offset);

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

@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { OauthCallbackComponent } from './oauth-callback.component';
+import { OauthDefaultComponent } from './oauth-default.component';
 
-describe('OauthCallbackComponent', () => {
-  let component: OauthCallbackComponent;
-  let fixture: ComponentFixture<OauthCallbackComponent>;
+describe('OauthDefaultComponent', () => {
+  let component: OauthDefaultComponent;
+  let fixture: ComponentFixture<OauthDefaultComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ OauthCallbackComponent ]
+      declarations: [ OauthDefaultComponent ]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(OauthCallbackComponent);
+    fixture = TestBed.createComponent(OauthDefaultComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-complete-export-log/sage300-complete-export-log.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-oauth-default',
+  templateUrl: './oauth-default.component.html',
+  styleUrls: ['./oauth-default.component.scss']
+})
+export class OauthDefaultComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-skipped-export-log/sage300-skipped-export-log.component.ts

@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { OauthComponent } from './oauth.component';
 import { OauthTravelperkComponent } from './oauth-travelperk/oauth-travelperk.component';
+import { OauthDefaultComponent } from './oauth-default/oauth-default.component';
 
 const routes: Routes = [
   {
@@ -11,6 +12,10 @@ const routes: Routes = [
       {
         path: 'travelperk',
         component: OauthTravelperkComponent
+      },
+      {
+        path: 'default',
+        component: OauthDefaultComponent
       }
     ]
   }

src/app/integrations/oauth-callback/oauth-callback.component.html src/app/oauth/oauth-default/oauth-default.component.html

@@ -5,12 +5,14 @@ import { OauthRoutingModule } from './oauth-routing.module';
 import { OauthComponent } from './oauth.component';
 import { OauthTravelperkComponent } from './oauth-travelperk/oauth-travelperk.component';
 import { SharedModule } from '../shared/shared.module';
+import { OauthDefaultComponent } from './oauth-default/oauth-default.component';
 
 
 @NgModule({
   declarations: [
     OauthComponent,
-    OauthTravelperkComponent
+    OauthTravelperkComponent,
+    OauthDefaultComponent
   ],
   imports: [
     CommonModule,

src/app/integrations/oauth-callback/oauth-callback.component.scss src/app/oauth/oauth-default/oauth-default.component.scss

@@ -7,9 +7,9 @@
 
             <div>
                 <h5 class="tw-text-slightly-normal-text-color tw-text-14-px !tw-font-500">{{ label | snakeCaseToSpaceCase}}<app-mandatory-field *ngIf="isFieldMandatory"></app-mandatory-field></h5>
-                <h5 *ngIf="formControllerName !== 'reimbursableExportType' && formControllerName!=='cccExportType' && formControllerName !== 'creditCardExportType'" class="!tw-text-faded-text-color tw-text-14-px tw-pt-8-px !tw-font-400 !tw-leading-4" [innerHTML]="subLabel"></h5>
-                <h5 *ngIf="formControllerName === 'reimbursableExportType' || formControllerName === 'cccExportType' || formControllerName === 'creditCardExportType' && appName !== AppName.SAGE300" class="!tw-text-faded-text-color tw-text-14-px tw-pt-8-px !tw-font-400 !tw-leading-4">
-                    Choose the type of transaction record that you would like to create in {{ appName }} while exporting expenses from {{brandingConfig.brandName}}. <span *ngIf="exportTypeIconPath">Click<a (click)="showExportTable()" class="tw-cursor-pointer tw-text-hyperlink-color"> here</a> for more details.</span>
+                <h5 *ngIf="subLabel || (formControllerName !== 'reimbursableExportType' && formControllerName!=='cccExportType' && formControllerName !== 'creditCardExportType')" class="!tw-text-faded-text-color tw-text-14-px tw-pt-8-px !tw-font-400 !tw-leading-4" [innerHTML]="subLabel"></h5>
+                <h5 *ngIf="(formControllerName === 'reimbursableExportType' || formControllerName === 'cccExportType' || formControllerName === 'creditCardExportType') && appName !== AppName.SAGE300 && appName !== AppName.QBO" class="!tw-text-faded-text-color tw-text-14-px tw-pt-8-px !tw-font-400 !tw-leading-4">
+                    Choose the type of transaction record that you would like to create in {{ appName }} while exporting expenses from {{brandingConfig.brandName}}. <span *ngIf="exportTypeIconPath">Click<a (click)="showExportTable()" class="tw-cursor-pointer tw-text-hyperlink-color"> here</a> for more detailsss.</span>
                 </h5>
             </div>
         </div>

src/app/integrations/oauth-callback/oauth-callback.component.spec.ts src/app/oauth/oauth-default/oauth-default.component.spec.ts

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { AbstractControl, FormGroup } from '@angular/forms';
 import { AccountingExportModel } from 'src/app/core/models/db/accounting-export.model';
-import { DateFilter } from 'src/app/core/models/qbd/misc/date-filter.model';
+import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model';
 import { ExportLogService } from 'src/app/core/services/common/export-log.service';
 
 @Component({
@@ -53,7 +53,7 @@ export class ExportLogFilterComponent implements OnInit {
     this.dateOptions[3].dateRange = this.exportLogForm.value.start[0].toLocaleDateString() + '-' + this.exportLogForm.value.start[1].toLocaleDateString();
     this.dateOptions[3].startDate = this.exportLogForm.value.start[0];
     this.dateOptions[3].endDate = this.exportLogForm.value.start[1];
-    this.presentDate = this.dateOptions[3].dateRange;
+    this.presentDate = new Date().toLocaleDateString();
     this.exportLogForm.controls.dateRange.patchValue(this.dateOptions[3]);
   }