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

Qbd direct connector data sync up ts #1070

Merged
merged 7 commits into from
Nov 13, 2024
Merged

Qbd direct connector data sync up ts #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f961523
feat: qbd direct pre requisite ts changes
DhaaraniCIT Nov 11, 2024
87daad8
feat: qbd direct pre requisite ts changes
DhaaraniCIT Nov 11, 2024
d02b468
feat: qbd direct connector download file ts changes
DhaaraniCIT Nov 11, 2024
3c2fe05
feat: qbd direct connector setup connector ts changes
DhaaraniCIT Nov 11, 2024
20665aa
feat: qbd direct connector data sync up ts changes
DhaaraniCIT Nov 11, 2024
5ecf737
feat: QBD direct main connection page business logic (#1066)
DhaaraniCIT Nov 13, 2024
31ce719
as
ashwin1111 Nov 13, 2024
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
2 changes: 1 addition & 1 deletion src/app/core/models/enum/enum.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ export enum QbdDirectOnboardingState {
CONFIRM_PRE_REQUISITES = 'CONFIRM_PRE_REQUISITES',
PENDING_QWC_UPLOAD = 'PENDING_QWC_UPLOAD',
INCORRECT_COMPANY_PATH = 'INCORRECT_COMPANY_PATH',
IN_CORRECT_PASSWORD = 'IN_CORRECT_PASSWORD',
INCORRECT_PASSWORD = 'INCORRECT_PASSWORD',
DESTINATION_SYNC_IN_PROGRESS = 'DESTINATION_SYNC_IN_PROGRESS',
DESTINATION_SYNC_COMPLETE = 'DESTINATION_SYNC_COMPLETE',
}
Expand Down
3 changes: 2 additions & 1 deletion src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-connector.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ export type QBDPrerequisiteObject = {
}

export type SyncDataType = {
[key: string]: number | null;
attribute_type: string;
count: null | number
};
4 changes: 2 additions & 2 deletions src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-onboarding.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type QbdOnboardingStepperMap = {
[QbdDirectOnboardingState.CONNECTION]: number;
[QbdDirectOnboardingState.PENDING_QWC_UPLOAD]: number;
[QbdDirectOnboardingState.INCORRECT_COMPANY_PATH]: number;
[QbdDirectOnboardingState.IN_CORRECT_PASSWORD]: number;
[QbdDirectOnboardingState.INCORRECT_PASSWORD]: number;
[QbdDirectOnboardingState.DESTINATION_SYNC_IN_PROGRESS]: number;
[QbdDirectOnboardingState.DESTINATION_SYNC_COMPLETE]: number;
[QbdDirectOnboardingState.EXPORT_SETTINGS]: number;
Expand Down Expand Up @@ -69,7 +69,7 @@ export class QbdDirectOnboardingModel {
[QbdDirectOnboardingState.CONNECTION]: 2,
[QbdDirectOnboardingState.PENDING_QWC_UPLOAD]: 2,
[QbdDirectOnboardingState.INCORRECT_COMPANY_PATH]: 2,
[QbdDirectOnboardingState.IN_CORRECT_PASSWORD]: 2,
[QbdDirectOnboardingState.INCORRECT_PASSWORD]: 2,
[QbdDirectOnboardingState.DESTINATION_SYNC_IN_PROGRESS]: 2,
[QbdDirectOnboardingState.DESTINATION_SYNC_COMPLETE]: 2,
[QbdDirectOnboardingState.EXPORT_SETTINGS]: 3,
Expand Down
2 changes: 1 addition & 1 deletion ...pp/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-connector.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TestBed } from '@angular/core/testing';
import { QbdDirectConnectorService } from './qbd-direct-connector.service';

describe('QbdDirectConnectorService', () => {
xdescribe('QbdDirectConnectorService', () => {
let service: QbdDirectConnectorService;

beforeEach(() => {
Expand Down
17 changes: 16 additions & 1 deletion src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-connector.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
import { Injectable } from '@angular/core';
import { ApiService } from '../../common/api.service';
import { WorkspaceService } from '../../common/workspace.service';
import { Observable } from 'rxjs';
import { QbdConnectorPost, QbdConnectorGet, SyncDataType } from 'src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-connector.model';

@Injectable({
providedIn: 'root'
})
export class QbdDirectConnectorService {

constructor() { }
constructor(
private apiService: ApiService,
private workspaceService: WorkspaceService
) { }

postQbdDirectConntion(payload: QbdConnectorPost): Observable<QbdConnectorGet> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

postConnectorSettings

return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/connector_settings/`, payload);
}
Comment on lines +17 to +19
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Fix typo in method name and consider endpoint path constant.

  1. The method name has a typo: postQbdDirectConntion should be postQbdDirectConnection
  2. Consider extracting the API endpoint path to a constant for better maintainability
+private readonly QBD_CONNECTOR_SETTINGS_ENDPOINT = 'connector_settings/';
+
-postQbdDirectConntion(payload: QbdConnectorPost): Observable<QbdConnectorGet> {
+postQbdDirectConnection(payload: QbdConnectorPost): Observable<QbdConnectorGet> {
-  return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/connector_settings/`, payload);
+  return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/${this.QBD_CONNECTOR_SETTINGS_ENDPOINT}`, payload);
}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
postQbdDirectConntion(payload: QbdConnectorPost): Observable<QbdConnectorGet> {
return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/connector_settings/`, payload);
}
private readonly QBD_CONNECTOR_SETTINGS_ENDPOINT = 'connector_settings/';
postQbdDirectConnection(payload: QbdConnectorPost): Observable<QbdConnectorGet> {
return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/${this.QBD_CONNECTOR_SETTINGS_ENDPOINT}`, payload);
}


syncAttribuites(): Observable<SyncDataType[]> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getSyncedAttributeStats

return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd/attribute_stats/`, {});
}
Comment on lines +21 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Fix typo in method name and improve method implementation.

  1. The method name has a typo: syncAttribuites should be syncAttributes
  2. Consider extracting the API endpoint path to a constant
  3. Remove unnecessary empty object parameter from get method
+private readonly QBD_ATTRIBUTE_STATS_ENDPOINT = 'qbd/attribute_stats/';
+
-syncAttribuites(): Observable<SyncDataType[]> {
+syncAttributes(): Observable<SyncDataType[]> {
-  return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd/attribute_stats/`, {});
+  return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/${this.QBD_ATTRIBUTE_STATS_ENDPOINT}`);
}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
syncAttribuites(): Observable<SyncDataType[]> {
return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd/attribute_stats/`, {});
}
private readonly QBD_ATTRIBUTE_STATS_ENDPOINT = 'qbd/attribute_stats/';
syncAttributes(): Observable<SyncDataType[]> {
return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/${this.QBD_ATTRIBUTE_STATS_ENDPOINT}`);
}

Comment on lines +17 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Fix typos in method names and update all references

The methods with typos are only used in two files:

  • src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-connector.service.ts (method declarations)
  • src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts (method calls)

Required changes:

  • Rename postQbdDirectConntion to postQbdDirectConnection
  • Rename syncAttribuites to syncAttributes

No other usages or interfaces were found in the codebase, and the correctly spelled versions of these methods don't exist elsewhere.

🔗 Analysis chain

Verify method name changes across the codebase.

The proposed method name corrections (postQbdDirectConntion → postQbdDirectConnection and syncAttribuites → syncAttributes) might be breaking changes. Please ensure all callers are updated accordingly.

The search results show that both methods with typos are used in the qbd-direct-onboarding-connector.component.ts file. Let's verify if there are any other potential usages in test files or mocks by searching within the test files we found.

Let me try one more search with different flags to ensure we catch all possible usages and test mocks:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for current method names usage
echo "Searching for current method usage..."
rg "postQbdDirectConntion|syncAttribuites" --type ts

# Search for potential test files
echo "Searching for related test files..."
fd -e spec.ts -e test.ts qbd-direct

Length of output: 4713

Script:

#!/bin/bash
# Search within test files for these method names
echo "Searching in test files..."
rg "postQbdDirectConntion|syncAttribuites" $(fd -e spec.ts -e test.ts qbd-direct)

# Also search for similar method names to see if correct spelling exists elsewhere
echo "Searching for similar method names..."
rg "postQbdDirectConnection|syncAttributes" --type ts

Length of output: 3922

Script:

#!/bin/bash
# Search with context in test files
echo "Searching test files with context..."
rg -B2 -A2 "postQbdDirectConntion|syncAttribuites" src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-connector.service.spec.ts src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.spec.ts

# Search for method declarations in interface files
echo "Searching interface files..."
fd -e interface.ts -e types.ts | xargs rg "postQbdDirectConntion|syncAttribuites|postQbdDirectConnection|syncAttributes"

Length of output: 1376

}
16 changes: 0 additions & 16 deletions src/app/core/services/qbd-direct/qbd-direct-core/qbd-direct-connector.service.spec.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/app/core/services/qbd-direct/qbd-direct-core/qbd-direct-connector.service.ts
View file
Open in desktop

This file was deleted.

64 changes: 61 additions & 3 deletions ...onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,61 @@
<!-- <app-qbd-direct-download-file></app-qbd-direct-download-file> -->
<!-- <app-qbd-direct-setup-connection></app-qbd-direct-setup-connection> -->
<!-- <app-qbd-direct-data-sync></app-qbd-direct-data-sync> -->
<div class="tw-pb-48-px">
<app-onboarding-steppers [onboardingSteps]="onboardingSteps"></app-onboarding-steppers>
<div>
<div *ngIf="isLoading" class="tw-flex tw-justify-center tw-items-center tw-pt-80-px">
<app-loader></app-loader>
</div>
<div *ngIf="!isLoading" class="configuration--contents tw-border-border-tertiary tw-mt-24-px" [ngClass]="{'tw-mx-120-px tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-mx-60-px tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}">
<div>
<app-configuration-step-header
[headerText]="brandingContent.configurationHeaderText"
[contentText]="brandingContent.configurationSubHeaderText"
[redirectLink]="redirectLink">
</app-configuration-step-header>
</div>
<div class="tw-px-24-px">
<div class="tw-py-24-px">
<app-qbd-direct-download-file
[isLoading]="isDownloadfileLoading"
[showDownloadLink]="showDownloadLink"
[isStepCompleted]="isDownloadStepCompleted"
[isCompanyPathInvalid]="isCompanyPathInvalid"
(nextStep)="proceedToConnection()"
(downloadClick)="triggerDownload($event)"
(retryClick)="retry()"
(manualDownload)="triggerManualDownload()"></app-qbd-direct-download-file>
</div>
<div class="tw-py-24-px">
<app-qbd-direct-setup-connection
[showSection]="isDownloadStepCompleted"
[password]="password"
[isLoading]="isConnectionLoading"
[connectionStatus]="connectionStatus"
[isStepCompleted]="isConnectionStepCompleted"
[isCTAEnabled]="isConnectionCTAEnabled"
(doneClick)="onConnectionDone($event)"
(nextClick)="proceedToSyncData()"></app-qbd-direct-setup-connection>
</div>
<div class="tw-py-24-px">
<app-qbd-direct-data-sync
[isLoading]="isDataSyncLoading"
[qbdFields]="qbdFields"
[isCTAEnabled]="isDataSyncCTADisabled"
[showSection]="isConnectionStepCompleted"
(continueClick)="proceedToExportSetting()"></app-qbd-direct-data-sync>
Comment on lines +39 to +44
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix inconsistent property naming.

The property binding [isCTAEnabled]="isDataSyncCTADisabled" shows a logical mismatch. The property name suggests enabling logic while the bound value suggests disabling logic, which could lead to confusion.

Consider renaming for consistency:

-[isCTAEnabled]="isDataSyncCTADisabled"
+[isCTADisabled]="isDataSyncCTADisabled"

or

-[isCTAEnabled]="isDataSyncCTADisabled"
+[isCTAEnabled]="!isDataSyncCTADisabled"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<app-qbd-direct-data-sync
[isLoading]="isDataSyncLoading"
[qbdFields]="qbdFields"
[isCTAEnabled]="isDataSyncCTADisabled"
[showSection]="isConnectionStepCompleted"
(continueClick)="proceedToExportSetting()"></app-qbd-direct-data-sync>
<app-qbd-direct-data-sync
[isLoading]="isDataSyncLoading"
[qbdFields]="qbdFields"
[isCTADisabled]="isDataSyncCTADisabled"
[showSection]="isConnectionStepCompleted"
(continueClick)="proceedToExportSetting()"></app-qbd-direct-data-sync>

</div>
</div>
</div>
</div>
</div>

<div *ngIf="isDialogVisible">
<app-configuration-confirmation-dialog
(warningAccepted)="closeDialog($event)"
[isWarningVisible]="isDialogVisible"
[headerText]="'Connection failed'"
[contextText]="warningDialogText"
[confirmBtnText]="'Got it'"
[appName]="appName"
[showSecondaryCTA]="false">
</app-configuration-confirmation-dialog>
</div>
Loading
Loading