-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
feat: qbd connector setup UI changes #1060
Merged
ashwin1111
merged 8 commits into
qbd-direct-onboarding-download-file-UI
from
qbd-direct-step-connector-UI
Nov 13, 2024
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
5c0c1a2
feat: qbd connector setup UI changes
DhaaraniCIT 00f448d
Merge branch qbd-direct-onboarding-download-file-UI into qbd-direct-s…
DhaaraniCIT 9f6f6e9
Merge branch qbd-direct-onboarding-download-file-UI into qbd-direct-s…
DhaaraniCIT 1d64674
feat: Qbd direct connection data sync UI changes (#1061)
DhaaraniCIT 66ecb61
svg update
DhaaraniCIT b79c940
feat: qbd direct pre requisite ts changes (#1062)
DhaaraniCIT 857eea7
as
ashwin1111 d4c7494
Qbd direct connector data sync up ts (#1070)
DhaaraniCIT File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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
2 changes: 1 addition & 1 deletion
2
...pp/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-connector.service.spec.ts
This file contains 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
17 changes: 16 additions & 1 deletion
17
src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-connector.service.ts
This file contains 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,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> { | ||
return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/connector_settings/`, payload); | ||
} | ||
|
||
syncAttribuites(): Observable<SyncDataType[]> { | ||
return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd/attribute_stats/`, {}); | ||
} | ||
} |
16 changes: 0 additions & 16 deletions
16
src/app/core/services/qbd-direct/qbd-direct-core/qbd-direct-connector.service.spec.ts
This file was deleted.
Oops, something went wrong.
9 changes: 0 additions & 9 deletions
9
src/app/core/services/qbd-direct/qbd-direct-core/qbd-direct-connector.service.ts
This file was deleted.
Oops, something went wrong.
62 changes: 61 additions & 1 deletion
62
...onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.html
This file contains 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 +1,61 @@ | ||
<app-qbd-direct-download-file></app-qbd-direct-download-file> | ||
<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> | ||
</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> |
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.
🛠️ Refactor suggestion
Fix inconsistent naming in enum value.
The enum value
IN_CORRECT_PASSWORD
uses inconsistent word separation compared toINCORRECT_COMPANY_PATH
. Both represent incorrect states but use different patterns.Apply this diff to maintain consistent naming:
📝 Committable suggestion