From aa579ef22543b76ed62f7ffa503f5650af3ad85c Mon Sep 17 00:00:00 2001 From: Ashwin Thanaraj <37061471+ashwin1111@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:26:49 +0530 Subject: [PATCH] fix conflicts --- .github/workflows/unit-test.yml | 2 +- package-lock.json | 2 +- .../models/common/export-settings.model.ts | 2 +- ...iness-central-export-settings.component.ts | 22 ++++++++----------- .../intacct-export-settings.component.ts | 6 ++--- .../qbo-export-settings.component.ts | 6 ++--- .../sage300-export-settings.component.ts | 12 ++++------ .../xero-export-settings.component.ts | 2 +- ...hboard-export-summary-section.component.ts | 6 +---- 9 files changed, 22 insertions(+), 38 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 776683c00..b7eadb07b 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -13,7 +13,7 @@ jobs: - name: Setup GitHub Action uses: actions/setup-node@v1 with: - node-version: 22.2.0 + node-version: 22.0.0 - name: Install dependencies run: npm install - name: Test diff --git a/package-lock.json b/package-lock.json index ebfa9b718..7d91f4f67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27156,4 +27156,4 @@ "license": "MIT" } } -} +} \ No newline at end of file diff --git a/src/app/core/models/common/export-settings.model.ts b/src/app/core/models/common/export-settings.model.ts index a16b80a48..eb103cfcb 100644 --- a/src/app/core/models/common/export-settings.model.ts +++ b/src/app/core/models/common/export-settings.model.ts @@ -94,7 +94,7 @@ export class ExportSettingModel { } static constructGroupingDateOptions(exportGroupType: ExpenseGroupingFieldOption, dateOptions: SelectFormOption[]) { - if (exportGroupType===ExpenseGroupingFieldOption.EXPENSE_ID) { + if (exportGroupType === ExpenseGroupingFieldOption.EXPENSE_ID) { return ExportSettingModel.filterDateOptions(ExportDateType.LAST_SPENT_AT, dateOptions); } else if (exportGroupType===ExpenseGroupingFieldOption.CLAIM_NUMBER || exportGroupType===ExpenseGroupingFieldOption.REPORT_ID) { return ExportSettingModel.filterDateOptions(ExportDateType.SPENT_AT, dateOptions); diff --git a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts index 87c43b1a0..ee4b31c2a 100644 --- a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts +++ b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts @@ -159,22 +159,18 @@ export class BusinessCentralExportSettingsComponent implements OnInit { private setupCustomWatchers(): void { this.exportSettingForm.controls.reimbursableExportGroup.valueChanges.subscribe((reimbursableExportGroup) => { - if (brandingConfig.brandId==='fyle') { - this.reimbursableExpenseGroupingDateOptions = BusinessCentralExportSettingModel.getReimbursableExpenseGroupingDateOptions(); - this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); - } + this.reimbursableExpenseGroupingDateOptions = BusinessCentralExportSettingModel.getReimbursableExpenseGroupingDateOptions(); + this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); }); this.exportSettingForm.controls.cccExportGroup.valueChanges.subscribe((cccExportGroup) => { - if (brandingConfig.brandId==='fyle') { - this.cccExpenseGroupingDateOptions = BusinessCentralExportSettingModel.getCCCExpenseGroupingDateOptions(); - this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(cccExportGroup, this.cccExpenseGroupingDateOptions); - - // If the selected value is not valid after the export group change, reset the field - const visibleValues = this.getExportDate(this.cccExpenseGroupingDateOptions, 'cccExportGroup').map(option => option.value); - if (!visibleValues.includes(this.exportSettingForm.get('cccExportDate')?.value)) { - this.exportSettingForm.get('cccExportDate')?.reset(); - } + this.cccExpenseGroupingDateOptions = BusinessCentralExportSettingModel.getCCCExpenseGroupingDateOptions(); + this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(cccExportGroup, this.cccExpenseGroupingDateOptions); + + // If the selected value is not valid after the export group change, reset the field + const visibleValues = this.getExportDate(this.cccExpenseGroupingDateOptions, 'cccExportGroup').map(option => option.value); + if (!visibleValues.includes(this.exportSettingForm.get('cccExportDate')?.value)) { + this.exportSettingForm.get('cccExportDate')?.reset(); } }); diff --git a/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts index fedb0ec85..80eb87a6e 100644 --- a/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts +++ b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts @@ -520,10 +520,8 @@ export class IntacctExportSettingsComponent implements OnInit { private setupCustomWatchers(): void { this.exportSettingsForm.controls.reimbursableExportGroup?.valueChanges.subscribe((reimbursableExportGroup) => { - if (brandingConfig.brandId==='fyle') { - this.reimbursableExpenseGroupingDateOptions = IntacctExportSettingModel.getExpenseGroupingDateOptions(); - this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); - } + this.reimbursableExpenseGroupingDateOptions = IntacctExportSettingModel.getExpenseGroupingDateOptions(); + this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); }); this.exportSettingsForm.controls.cccExportGroup?.valueChanges.subscribe((cccExportGroup) => { diff --git a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts index 85755e38e..406e81924 100644 --- a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts +++ b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts @@ -348,10 +348,8 @@ export class QboExportSettingsComponent implements OnInit { private setupCustomDateOptionWatchers(): void { this.exportSettingForm.controls.reimbursableExportGroup?.valueChanges.subscribe((reimbursableExportGroup) => { - if (brandingConfig.brandId==='fyle') { - this.reimbursableExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); - this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); - } + this.reimbursableExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); + this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); }); this.exportSettingForm.controls.creditCardExportType?.valueChanges.subscribe(creditCardExportType => { diff --git a/src/app/integrations/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.ts b/src/app/integrations/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.ts index f4f8101ed..dd721b94d 100644 --- a/src/app/integrations/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.ts +++ b/src/app/integrations/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.ts @@ -119,17 +119,13 @@ export class Sage300ExportSettingsComponent implements OnInit { private setupCustomWatchers(): void { this.exportSettingForm.controls.reimbursableExportGroup?.valueChanges.subscribe((reimbursableExportGroup) => { - if (brandingConfig.brandId==='fyle') { - this.reimbursableExpenseGroupingDateOptions = this.exportSettingService.getReimbursableExpenseGroupingDateOptions(); - this.reimbursableExpenseGroupingDateOptions = CommonExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); - } + this.reimbursableExpenseGroupingDateOptions = this.exportSettingService.getReimbursableExpenseGroupingDateOptions(); + this.reimbursableExpenseGroupingDateOptions = CommonExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); }); this.exportSettingForm.controls.cccExportGroup?.valueChanges.subscribe((cccExportGroup) => { - if (brandingConfig.brandId==='fyle') { - this.cccExpenseGroupingDateOptions = this.exportSettingService.getCCCExpenseGroupingDateOptions(); - this.cccExpenseGroupingDateOptions = CommonExportSettingModel.constructGroupingDateOptions(cccExportGroup, this.cccExpenseGroupingDateOptions); - } + this.cccExpenseGroupingDateOptions = this.exportSettingService.getCCCExpenseGroupingDateOptions(); + this.cccExpenseGroupingDateOptions = CommonExportSettingModel.constructGroupingDateOptions(cccExportGroup, this.cccExpenseGroupingDateOptions); }); } diff --git a/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.ts b/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.ts index 231bc8b55..aa9fcfb8e 100644 --- a/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.ts +++ b/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.ts @@ -110,8 +110,8 @@ export class XeroExportSettingsComponent implements OnInit { private setupCustomWatchers(): void { // Removing not relevant date options + this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(ExpenseGroupingFieldOption.CLAIM_NUMBER, this.reimbursableExpenseGroupingDateOptions); if (brandingConfig.brandId==='fyle') { - this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(ExpenseGroupingFieldOption.CLAIM_NUMBER, this.reimbursableExpenseGroupingDateOptions); this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(ExpenseGroupingFieldOption.EXPENSE_ID, this.cccExpenseGroupingDateOptions); } } diff --git a/src/app/shared/components/dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts b/src/app/shared/components/dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts index e65278942..10e0b7b7b 100644 --- a/src/app/shared/components/dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts +++ b/src/app/shared/components/dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts @@ -75,11 +75,7 @@ export class DashboardExportSummarySectionComponent implements OnInit { } private getAccountingExports(limit: number, offset: number, status: AccountingExportStatus, lastExportedAt?: string | null) { - const dateFilter:SelectedDateFilter = { - startDate: lastExportedAt ? new Date(lastExportedAt) : new Date(), - endDate: new Date() - }; - this.accountingExportService.getAccountingExports(this.accountingExportType, [status], null, limit, offset, lastExportedAt ? dateFilter : null, lastExportedAt, null, this.appName).subscribe(accountingExportResponse => { + this.accountingExportService.getAccountingExports(this.accountingExportType, [status], null, limit, offset, null, lastExportedAt, null, this.appName).subscribe(accountingExportResponse => { const accountingExports: AccountingExportList[] = accountingExportResponse.results.map((accountingExport: AccountingExport) => AccountingExportModel.parseAPIResponseToExportLog(accountingExport, this.org_id) );