Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Successful export dialog view #1160

Merged
merged 4 commits into from
Jan 22, 2025
Merged

fix: Successful export dialog view #1160

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd89729
fix: Successful export dialog view
ashwin1111 Jan 22, 2025
22bffc5
cleanup
ashwin1111 Jan 22, 2025
2eb9f3c
node version
ashwin1111 Jan 22, 2025
87ecfb9
Merge branch 'master' into fix-successful-dialog-view
ashwin1111 Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13,982 changes: 2,977 additions & 11,005 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/app/core/models/common/export-settings.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
22 changes: 9 additions & 13 deletions ...ral-shared/business-central-export-settings/business-central-export-settings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
});

Expand Down
6 changes: 2 additions & 4 deletions ...tions/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
6 changes: 2 additions & 4 deletions src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
12 changes: 4 additions & 8 deletions ...tions/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
6 changes: 1 addition & 5 deletions .../dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
Expand Down
Loading