Skip to content

Commit 68fe516

Browse files
authored
ms gaurd fix (#528)
ms gaurd fix
1 parent 1861efe commit 68fe516

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/app/integrations/business-central/business-central-onboarding/business-central-onboarding-landing/business-central-onboarding-landing.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class BusinessCentralOnboardingLandingComponent implements OnInit, OnDest
6767
this.businessCentralHelperService.refreshBusinessCentralDimensions(true).subscribe(() => {
6868
this.businessCentralConnectionInProgress = false;
6969
this.isIntegrationConnected = true;
70-
this.checkProgressAndRedirect(code);
70+
this.checkProgressAndRedirect();
7171
});
7272
}, (error) => {
7373
const errorMessage = 'message' in error.error ? error.error.message : 'Failed to connect to Dynamic 365 Business Central. Please try again';
@@ -80,12 +80,12 @@ export class BusinessCentralOnboardingLandingComponent implements OnInit, OnDest
8080
});
8181
}
8282

83-
private checkProgressAndRedirect(code: string): void {
83+
private checkProgressAndRedirect(): void {
8484
const onboardingState: BusinessCentralOnboardingState = this.workspaceService.getOnboardingState();
8585
if (onboardingState !== BusinessCentralOnboardingState.COMPLETE) {
8686
this.router.navigate(['integrations/business_central/onboarding/connector']);
8787
} else {
88-
this.postBusinessCentralCredentials(code);
88+
this.router.navigate(['integrations/business_central/main/dashboard']);
8989
}
9090
}
9191

src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
<app-svg-icon *ngIf="!isConnectionInProgress && 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>
3636
<app-loader class="tw-ml-10-px" *ngIf="isConnectionInProgress" [styleClass]="'spinner-16-white tw-top-2-px'"></app-loader>
3737
</button>
38-
<button *ngIf="isIntegrationConnected" pButton type="button" class="!tw-text-alert-toast remove-bg disconnect !tw-bg-white" (click)="disconnect()">
38+
<button *ngIf="isIntegrationConnected && (appName === AppName.BAMBOO_HR || appName === AppName.TRAVELPERK)" pButton type="button" class="!tw-text-alert-toast remove-bg disconnect !tw-bg-white" (click)="disconnect()">
3939
{{ isConnectionInProgress ? 'Disconnecting' : 'Disconnect' }}
4040
</button>
41-
<button *ngIf="(appName === AppName.QBD || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL)" pButton type="button" class="p-button-raised" (click)="connect()">
41+
<button *ngIf="!isIntegrationConnected && (appName === AppName.QBD || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL)" pButton type="button" class="p-button-raised" (click)="connect()">
4242
{{buttonText}}
4343
<app-svg-icon *ngIf="appName === AppName.QBD && 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>
4444
</button>

0 commit comments

Comments
 (0)