fix: QBD direct bug fixes #1101
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,10 +36,10 @@ export class DashboardService { | |
| return this.apiService.post(url, {}); | ||
| } | ||
|
|
||
| getExportErrors(version?: string | 'v1'): Observable<any> { | ||
| if (version === 'v1') { | ||
| return this.apiService.get(`/v2/workspaces/${this.workspaceId}/errors/`, {is_resolved: false}); | ||
| } else if (version === AppName.QBD_DIRECT) { | ||
| return this.apiService.get(`/workspaces/${this.workspaceId}/export_logs/errors/`, {is_resolved: false}); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,7 +52,7 @@ export class QbdDirectDashboardComponent implements OnInit { | |
| [AccountingErrorType.CATEGORY_MAPPING]: null | ||
| }; | ||
|
|
||
| getExportErrors$: Observable<ErrorResponse> = this.dashboardService.getExportErrors(AppName.QBD_DIRECT); | ||
|
|
||
| getAccountingExportSummary$: Observable<AccountingExportSummary> = this.accountingExportService.getAccountingExportSummary(AppName.QBD_DIRECT); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,5 +8,6 @@ | |
| [appName]="AppName.QBD_DIRECT" | ||
| [isCategoryMappingGeneric]="sourceField === FyleField.CATEGORY ? true : false" | ||
| [displayName]="displayName" | ||
| [detailAccountType] = "detailAccountType" | ||
| [isMultiLineOption]="sourceField === FyleField.CATEGORY && brandingConfig.brandId !== 'co' ? true : false"> | ||
| </app-generic-mapping-v2> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,6 +52,8 @@ export class QbdDirectBaseMappingComponent implements OnInit { | |
|
|
||
| chartOfAccounts: string[]; | ||
|
|
||
| detailAccountType: string[] | undefined; | ||
|
|
||
| constructor( | ||
| private route: ActivatedRoute, | ||
| private mappingService: MappingService, | ||
|
|
@@ -72,6 +74,7 @@ export class QbdDirectBaseMappingComponent implements OnInit { | |
| } | ||
|
|
||
| destinationOptionsWatcher(detailAccountType?: string[]): void { | ||
| this.detailAccountType = detailAccountType; | ||
| this.mappingService.getPaginatedDestinationAttributes(this.destinationField, undefined, this.displayName, '', detailAccountType).subscribe((responses) => { | ||
| this.destinationOptions = responses.results as QbdDirectDestinationAttribute[]; | ||
| this.isLoading = false; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <div> | ||
| <div> | ||
| <app-landing-page-header [buttonText]="'Start'" [iconPath]="'assets/logos/qbo.png'" [appName]="'QuickBooks Desktop '" [appDescription]="brandingContent.contentText" [isConnectionInProgress]="isQbdConnectionInProgress" [isLoading]="false" [isIntegrationConnected]="false" [redirectLink]="redirectLink" (connectIntegration)="connectQbdDirect()" [logoStyleClasses]="'tw-p-16-px'"></app-landing-page-header> | ||
|
There was a problem hiding this comment. 💡 Codebase verification Based on the search results, I can now generate the final response: Remove trailing space from QuickBooks Desktop string The trailing space in
The proper fix would be to:
🔗 Analysis chainVerify the impact of appName change The appName has been changed to 'QuickBooks Desktop ' to match the new condition checks. However:
🏁 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Search for other instances of QuickBooks Desktop string to ensure consistency
rg -l "QuickBooks Desktop" | while read -r file; do
echo "=== $file ==="
rg "QuickBooks Desktop" "$file"
done
Length of output: 25142 |
||
| </div> | ||
| <div> | ||
| <app-landing-page-body [headlineText]="brandingContent.guideHeaderText" [headerText]="'A quick guide to help you set up your Fyle-QuickBooks Desktop integration.'" [embedVideo]="embedVideoLink" [embedImage]="'assets/co/coQBOLanding.svg'" [svgPath]="'assets/flow-charts/' + brandingConfig.brandId +'-qbd-direct-flow-chart.svg'" [appName]="appName"></app-landing-page-body> | ||
| </div> | ||
| </div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,11 +64,11 @@ | |
| (searchOptionsDropdown)="searchOptionsDropdown($event)" | ||
| [optionLabel]="'value'" | ||
| [isFieldMandatory]="true" | ||
|
|
||
| [mandatoryErrorListName]="'a default credit account'" | ||
| [label]="brandingContent.reimbursable.defaultReimbursableAccountPayableLabel + (exportSettingsForm.get('reimbursableExportType')?.value | snakeCaseToSpaceCase | titlecase)" | ||
| [subLabel]="brandingContent.reimbursable.defaultReimbursableAccountPayableSubLabel + (exportSettingsForm.get('reimbursableExportType')?.value | snakeCaseToSpaceCase | titlecase) + ' ,while debit lines will reflect the category chosen by the employee for each respective expense'" | ||
| [iconPath]="'list'" | ||
|
|
||
| [placeholder]="'Select default account'" | ||
| [isMultiLineOption]="true" | ||
| [formControllerName]="'defaultReimbursableAccountsPayableAccountName'"> | ||
| </app-configuration-select-field> | ||
|
|
@@ -203,11 +203,11 @@ | |
| (searchOptionsDropdown)="searchOptionsDropdown($event)" | ||
| [optionLabel]="'value'" | ||
| [isFieldMandatory]="true" | ||
|
|
||
| [mandatoryErrorListName]="'a default credit account'" | ||
| [label]="brandingContent.corporateCard.defaultCCCAccountPayableLabel + (exportSettingsForm.get('creditCardExportType')?.value | snakeCaseToSpaceCase | titlecase)" | ||
| [subLabel]="brandingContent.corporateCard.defaultCCCAccountPayableSubLabel + (exportSettingsForm.get('creditCardExportType')?.value | snakeCaseToSpaceCase | titlecase) + ' ,while debit lines will reflect the category chosen by the employee for each respective expense'" | ||
| [iconPath]="'list'" | ||
|
|
||
| [placeholder]="'Select default account'" | ||
| [isMultiLineOption]="true" | ||
| [formControllerName]="'defaultCCCAccountsPayableAccountName'"> | ||
| </app-configuration-select-field> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -78,7 +78,7 @@ <h5 class="!tw-text-text-muted tw-text-14-px tw-pt-10-px !tw-font-400 !tw-leadin | |
| <h4 class="tw-text-14-px !tw-font-500 tw-text-text-secondary tw-w-600-px">{{ error.error_title | snakeCaseToSpaceCase | titlecase }}</h4> | ||
| <div class="flex-wrapper"> | ||
| <h5 class="!tw-text-text-muted tw-text-12-px tw-pt-10-px !tw-font-400 !tw-leading-4 tw-w-600-px tw-flex tw-items-center tw-justify-start"> | ||
| <p>{{ error.error_detail }} | ||
| <a *ngIf="error.article_link && brandingFeatureConfig.allowIntacctHelperDoc" class=" tw-pr-4-px tw-text-link-primary tw-w-fit tw-cursor-pointer tw-inline-flex tw-items-center" | ||
| (click)="windowService.openInNewTab(error.article_link)"> | ||
| {{ helper.sentenseCaseConversion('Read More') }} | ||
|
|
@@ -135,6 +135,6 @@ <h3 class="dialog-sub-header"> | |
| <p class="tw-text-text-primary tw-text-20-px tw-line-height-20">{{ brandingConfig.brandId === 'co' ? (errorType | snakeCaseToSpaceCase | sentenceCase) : (errorType | snakeCaseToSpaceCase | titlecase) }} {{brandingContentCommon.errors}}</p> | ||
| <p class="dialog-sub-header">Resolve the following mapping errors to export your failed expenses successfully to {{appName}}</p> | ||
| </p-header> | ||
| <app-generic-mapping-table *ngIf="isMappingResolveVisible && !isLoading" [employeeFieldMapping]="employeeFieldMapping" [isLoading]="isLoading" [appName]="appName" [isDashboardMappingResolve]="true" [destinationField]="destinationField" [filteredMappings]="filteredMappings" [sourceField]="sourceField" [destinationOptions]="destinationOptions" [displayName]="displayName" [isMultiLineOption]="isMultiLineOption" [detailAccountType]="detailAccountType"></app-generic-mapping-table> | ||
| </p-dialog> | ||
| </div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,6 +102,8 @@ export class DashboardErrorSectionComponent implements OnInit { | |
|
|
||
| isMultiLineOption: boolean; | ||
|
|
||
| detailAccountType: string[] | undefined; | ||
|
|
||
| constructor( | ||
| private dashboardService: DashboardService, | ||
| private mappingService: MappingService, | ||
|
|
@@ -145,10 +147,12 @@ export class DashboardErrorSectionComponent implements OnInit { | |
| this.mappingService.getGroupedDestinationAttributes([this.destinationField], 'v2').subscribe(groupedDestinationResponse => { | ||
| if (this.sourceField === 'EMPLOYEE') { | ||
| this.destinationOptions = this.destinationField === FyleField.EMPLOYEE ? groupedDestinationResponse.EMPLOYEE : groupedDestinationResponse.VENDOR; | ||
| this.detailAccountType = undefined; | ||
| } else if (this.sourceField === 'CATEGORY') { | ||
| if (this.destinationField === 'EXPENSE_TYPE') { | ||
| this.destinationOptions = groupedDestinationResponse.EXPENSE_TYPE; | ||
| } else { | ||
| this.detailAccountType = this.chartOfAccounts; | ||
| this.destinationOptions = this.appName !== AppName.QBD_DIRECT ? groupedDestinationResponse.ACCOUNT : this.destinationOptionsWatcher( this.chartOfAccounts, groupedDestinationResponse.ACCOUNT as QbdDirectDestinationAttribute[]); | ||
| } | ||
| } | ||
|
|
@@ -210,8 +214,9 @@ export class DashboardErrorSectionComponent implements OnInit { | |
| } | ||
|
|
||
| handleResolvedMappingStat(): void { | ||
| const errorVersion = this.appName === AppName.QBD_DIRECT ? this.appName : this.errorsVersion; | ||
| this.dashboardService.getExportErrors(errorVersion).subscribe((errors) => { | ||
| const argument = errorVersion === 'v1' ? errors : (errors as ErrorResponse).results; | ||
|
Comment on lines
+219
to
+221
There was a problem hiding this comment. Add error handling for export errors retrieval. The service call to - this.dashboardService.getExportErrors(errorVersion).subscribe((errors) => {
+ this.dashboardService.getExportErrors(errorVersion).subscribe({
+ next: (errors) => {
const argument = errorVersion === 'v1' ? errors : (errors as ErrorResponse).results;
const newError: AccountingGroupedErrors = this.formatErrors(argument);
+ },
+ error: (error) => {
+ console.error('Failed to fetch export errors:', error);
+ // Consider showing an error message to the user
+ }
+ });
|
||
| const newError: AccountingGroupedErrors = this.formatErrors(argument); | ||
|
|
||
| if (this.errors.CATEGORY_MAPPING.length !== newError.CATEGORY_MAPPING.length) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,9 +40,9 @@ | |
| <button *ngIf="isIntegrationConnected && (appName === AppName.BAMBOO_HR || appName === AppName.TRAVELPERK)" pButton type="button" class="p-button danger-outline" (click)="disconnect()"> | ||
| {{ isConnectionInProgress ? 'Disconnecting' : 'Disconnect' }} | ||
| </button> | ||
| <button *ngIf="!isIntegrationConnected && (appName === AppName.QBD || appName === AppName.NETSUITE || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL || appName.includes('QuickBooks Desktop '))" pButton type="button" class="p-button-raised" (click)="connect()"> | ||
| {{buttonText}} | ||
| <app-svg-icon *ngIf="(appName === AppName.QBD || appName.includes('QuickBooks Desktop ')) && brandingFeatureConfig.isIconsInsideButtonAllowed" [svgSource]="'arrow-tail-right-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-pl-10-px tw-pt-2-px !tw-text-12-px'"></app-svg-icon> | ||
| <app-loader class="tw-ml-10-px" *ngIf="isConnectionInProgress" [styleClass]="'spinner-16-white tw-top-2-px'"></app-loader> | ||
| </button> | ||
| <iframe *ngIf="iframeSourceUrl && (appName === AppName.TRAVELPERK)" scrolling="no" [src]="iframeSourceUrl" class="tw-mt-40-px tw-w-270-px tw-h-84-px"></iframe> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -90,7 +90,7 @@ export class AppLandingPageHeaderComponent implements OnInit { | |
| } | ||
|
|
||
| connect(): void { | ||
| if (this.appName === AppName.TRAVELPERK || this.appName === AppName.BUSINESS_CENTRAL || this.appName === AppName.BAMBOO_HR || this.appName === AppName.XERO || this.appName.includes('QuickBooks Desktop ')) { | ||
| this.initiateOAuth(); | ||
| return; | ||
| } else if (this.postConnectionRoute === 'qbd/onboarding/export_settings') { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,6 +46,8 @@ export class GenericMappingTableComponent implements OnInit { | |
|
|
||
| @Input() isMultiLineOption: boolean = false; | ||
|
|
||
| @Input() detailAccountType: string[] | undefined; | ||
|
|
||
| private searchSubject = new Subject<string>(); | ||
|
|
||
| searchQuery: string; | ||
|
|
@@ -132,7 +134,7 @@ export class GenericMappingTableComponent implements OnInit { | |
| const existingOptions = this.destinationOptions.concat(); | ||
| const newOptions: DestinationAttribute[] = []; | ||
|
|
||
| this.mappingService.getPaginatedDestinationAttributes(this.destinationField, event.searchTerm, this.displayName, this.appName, this.detailAccountType).subscribe((response) => { | ||
| response.results.forEach((option) => { | ||
| // If option is not already present in the list, add it | ||
| if (!this.optionsMap[option.id.toString()]) { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix form control name to match type definition
The form control name uses the misspelled version
autoCreateReimbursableEnititywhile accessing a correctly spelled property from the API response.Apply this fix:
📝 Committable suggestion