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

Jump to bottom

Onboarding landing construction #642

Merged
merged 13 commits into from
Mar 19, 2024
Merged

Onboarding landing construction #642

merged 13 commits into from
Mar 19, 2024

Conversation

DhaaraniCIT
Copy link
Contributor

No description provided.

@coderabbitai coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 8, 2024

Important

Auto Review Skipped

Auto reviews are limited to the following labels: review. Please add one of these labels to enable auto reviews.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

Fyle added 2 commits March 8, 2024 13:03
@DhaaraniCIT DhaaraniCIT requested a review from ashwin1111 March 8, 2024 07:52
Merge branch 'master' into xero-onboarding-landing
ca89d77 
Merge branch 'master' into xero-onboarding-landing
ashwin1111
ashwin1111 reviewed Mar 8, 2024
View reviewed changes
src/app/branding/branding-config.ts Outdated
@@ -90,7 +90,8 @@ const kbArticles: KbArticle = {
INTACCT: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle`,
TRAVELPERK: `${brandingConfig.helpArticleDomain}/en/articles/7549535-how-are-travelperk-invoices-created-as-expenses-in-fyle`,
SAGE300: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle`,
BUSINESS_CENTRAL: `${brandingConfig.helpArticleDomain}/en/articles/8911018-how-to-configure-the-fyle-dynamics-365-business-central-integration`
BUSINESS_CENTRAL: `${brandingConfig.helpArticleDomain}/en/articles/8911018-how-to-configure-the-fyle-dynamics-365-business-central-integration`,
XERO: `${brandingConfig.helpArticleDomain}/en/articles/8911018-how-to-configure-the-fyle-dynamics-365-business-central-integration`
Copy link
Contributor

Choose a reason for hiding this comment

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

use right urls

src/app/branding/branding-config.ts Outdated
Comment on lines 136 to 142
LANDING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration`,
CONNECTOR: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0`,
EMPLOYEE_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_d70f1d54cc`,
EXPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_dca1353686`,
IMPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_b8a2df129f`,
ADVANCED_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_18c28de6c7`,
SKIP_EXPORT: `${brandingConfig.helpArticleDomain}/en/articles/7044785-how-to-skip-exporting-specific-expenses-from-fyle-to-quickbooks-online`
Copy link
Contributor

Choose a reason for hiding this comment

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

use right urls

src/app/branding/branding-config.ts
@@ -140,7 +151,8 @@ const kbArticles: KbArticle = {
INTACCT: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle`,
TRAVELPERK: `${brandingConfig.helpArticleDomain}/en/articles/7549535-how-are-travelperk-invoices-created-as-expenses-in-fyle`,
SAGE300: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle`,
BUSINESS_CENTRAL: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle`
BUSINESS_CENTRAL: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle`,
XERO: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle`
Copy link
Contributor

Choose a reason for hiding this comment

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

same

src/app/branding/branding-config.ts Outdated
Comment on lines 196 to 202
LANDING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration`,
CONNECTOR: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0`,
EMPLOYEE_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_d70f1d54cc`,
EXPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_dca1353686`,
IMPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_b8a2df129f`,
ADVANCED_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6208620-how-to-set-up-the-fyle-quickbooks-online-integration-v2-0#h_18c28de6c7`,
SKIP_EXPORT: `${brandingConfig.helpArticleDomain}/en/articles/7044785-how-to-skip-exporting-specific-expenses-from-fyle-to-quickbooks-online`
Copy link
Contributor

Choose a reason for hiding this comment

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

same

src/app/branding/branding-config.ts Outdated
@@ -195,7 +217,8 @@ const demoVideoLinks: DemoVideo = {
QBO: 'https://www.youtube.com/embed/b63lS2DG5j4',
// TODO: Update link for MS Dynamics
BUSINESS_CENTRAL: 'https://www.youtube.com/embed/2oYdc8KcQnk',
TRAVELPERK: 'https://www.youtube.com/embed/2oYdc8KcQnk'
TRAVELPERK: 'https://www.youtube.com/embed/2oYdc8KcQnk',
XERO: 'https://www.youtube.com/embed/2oYdc8KcQnk'
Copy link
Contributor

Choose a reason for hiding this comment

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

use xero url

src/app/branding/branding-config.ts Outdated
@@ -206,7 +229,8 @@ const demoVideoLinks: DemoVideo = {
QBO: 'https://www.youtube.com/embed/b63lS2DG5j4',
// TODO: Update link for MS Dynamics
BUSINESS_CENTRAL: 'https://www.youtube.com/embed/2oYdc8KcQnk',
TRAVELPERK: 'https://www.youtube.com/embed/2oYdc8KcQnk'
TRAVELPERK: 'https://www.youtube.com/embed/2oYdc8KcQnk',
XERO: 'https://www.youtube.com/embed/2oYdc8KcQnk'
Copy link
Contributor

Choose a reason for hiding this comment

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

same

...grations/xero/xero-onboarding/xero-onboarding-landing/xero-onboarding-landing.component.html Outdated
(warningAccepted)="acceptWarning($event)"
[isWarningVisible]="isIncorrectXeroConnectedDialogVisible"
[headerText]="'Incorrect account selected'"
[contextText]="'You had previously set up the integration with a different QuickBooks Online account. Please choose the same to restore the settings'"
Copy link
Contributor

Choose a reason for hiding this comment

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

Xero account, not qbo

...tegrations/xero/xero-onboarding/xero-onboarding-landing/xero-onboarding-landing.component.ts Outdated
private checkProgressAndRedirect(): void {
const onboardingState: XeroOnboardingState = this.workspaceService.getOnboardingState();
if (onboardingState !== XeroOnboardingState.COMPLETE) {
this.router.navigate(['integrations/xero/onboarding/connector']);
Copy link
Contributor

Choose a reason for hiding this comment

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

before redirecting to connector page, we should do a POST call to xero/tenants/

Copy link
Contributor

Choose a reason for hiding this comment

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

this is not fixed yet

src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html Outdated
@@ -40,7 +40,7 @@
<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)" pButton type="button" class="p-button-raised" (click)="connect()">
<button *ngIf="!isIntegrationConnected && (appName === AppName.QBD || appName === AppName.NETSUITE || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL || appName === AppName.XERO)" pButton type="button" class="p-button-raised" (click)="connect()">
Copy link
Contributor

Choose a reason for hiding this comment

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

we should use custom button present in xero-app-2 here instead of Fyle button. The blue color one.

@DhaaraniCIT DhaaraniCIT requested a review from ashwin1111 March 12, 2024 11:55
@ashwin1111 ashwin1111 removed their request for review March 12, 2024 14:42
@DhaaraniCIT DhaaraniCIT requested a review from ashwin1111 March 15, 2024 09:51
@ashwin1111 ashwin1111 removed their request for review March 15, 2024 12:13
DhaaraniCIT and others added 2 commits March 18, 2024 12:53
@DhaaraniCIT
Xero tenant connection (#646)
7587402 
xero connector page construction
PR comments fix
f978c30
@DhaaraniCIT DhaaraniCIT requested a review from ashwin1111 March 18, 2024 07:41
Merge branch 'master' into xero-onboarding-landing
17602dc 
Merge branch 'master' into xero-onboarding-landing
ashwin1111
ashwin1111 reviewed Mar 18, 2024
View reviewed changes
...tegrations/xero/xero-onboarding/xero-onboarding-landing/xero-onboarding-landing.component.ts Outdated
@@ -72,6 +72,7 @@ export class XeroOnboardingLandingComponent implements OnInit, OnDestroy {
private checkProgressAndRedirect(): void {
const onboardingState: XeroOnboardingState = this.workspaceService.getOnboardingState();
if (onboardingState !== XeroOnboardingState.COMPLETE) {
this.xeroConnectorService.postXeroTenants().subscribe();
Copy link
Contributor

Choose a reason for hiding this comment

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

@DhaaraniCIT everything after this line do it inside subscribe block

@DhaaraniCIT DhaaraniCIT requested a review from ashwin1111 March 18, 2024 08:00
Fyle and others added 4 commits March 18, 2024 15:03
Merge branch 'master' into xero-onboarding-landing
4d08703 
Merge branch 'master' into xero-onboarding-landing
Merge branch 'master' into xero-onboarding-landing
e6318ef 
Merge branch 'master' into xero-onboarding-landing
@DhaaraniCIT
xero configuration setting (#673)
0114be4 
xero configuration setting
@DhaaraniCIT
clone settings construction (#679)
cbc0da2 
clone settings construction
@DhaaraniCIT DhaaraniCIT merged commit 0801d11 into master Mar 19, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ashwin1111 ashwin1111 ashwin1111 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DhaaraniCIT @ashwin1111