From 5057a0fc79d4a91e2e6ca466a7240ecc57b718b7 Mon Sep 17 00:00:00 2001 From: Dhaarani <55541808+DhaaraniCIT@users.noreply.github.com> Date: Thu, 16 May 2024 15:07:49 +0530 Subject: [PATCH] QA fixes (#800) * QA fixes --- src/app/branding/fyle-contents-config.ts | 2 +- .../netsuite-connector.model.ts | 6 ++--- .../netsuite-main/netsuite-main.component.ts | 2 +- ...netsuite-onboarding-connector.component.ts | 2 +- ...netsuite-onboarding-landing.component.html | 2 +- .../netsuite-advanced-settings.component.html | 4 ++-- .../netsuite-connector.component.html | 1 - .../netsuite-connector.component.scss | 0 .../netsuite-connector.component.spec.ts | 23 ------------------- .../netsuite-connector.component.ts | 15 ------------ ...suite-custom-segment-dialog.component.html | 6 ++--- ...etsuite-custom-segment-dialog.component.ts | 4 ++-- .../integrations/netsuite/netsuite.module.ts | 4 +--- .../netsuite-connector.component.ts | 6 +++-- src/app/shared/pipes/search.pipe.spec.ts | 2 +- 15 files changed, 20 insertions(+), 59 deletions(-) delete mode 100644 src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.html delete mode 100644 src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.scss delete mode 100644 src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.spec.ts delete mode 100644 src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.ts diff --git a/src/app/branding/fyle-contents-config.ts b/src/app/branding/fyle-contents-config.ts index bc40dd98a..50ef95226 100644 --- a/src/app/branding/fyle-contents-config.ts +++ b/src/app/branding/fyle-contents-config.ts @@ -55,7 +55,7 @@ export const fyleContents = { notes: 'NOTE: To export billable expenses from Fyle, import Customers from NetSuite as Projects in Fyle.', toggleToastMessage: 'You have already mapped a tracking category from NetSuite to the Project field in '+ brandingConfig.brandName +'. Change the configured mapping to a new field to be able to import Customers in the Project field.', importVendorsAsMerchantsLabel: 'Import Vendors from NetSuite', - importNetsuiteEmployeesLabel: 'Import Netsuite Employee as Employee in ' + brandingConfig.brandName, + importNetsuiteEmployeesLabel: 'Import NetSuite Employee as Employee in ' + brandingConfig.brandName, importNetsuiteEmployeesSubLabel: 'Imported NetSuite Employee will be available as Employee in ' + brandingConfig.brandName+ '.', customSegmentHeader: 'Add Custom Segment/List/Record', importProjectsLabel: 'Import Projects from NetSuite', diff --git a/src/app/core/models/netsuite/netsuite-configuration/netsuite-connector.model.ts b/src/app/core/models/netsuite/netsuite-configuration/netsuite-connector.model.ts index 006bb03cd..1e6e74b01 100644 --- a/src/app/core/models/netsuite/netsuite-configuration/netsuite-connector.model.ts +++ b/src/app/core/models/netsuite/netsuite-configuration/netsuite-connector.model.ts @@ -30,9 +30,9 @@ export class NetsuiteConnectorModel { static constructPayload(form: FormGroup): NetsuiteConnectorPost { return { - ns_account_id: form.value.accountId, - ns_token_id: form.value.tokenId, - ns_token_secret: form.value.tokenSecret + ns_account_id: form.controls.accountId.value, + ns_token_id: form.controls.tokenId.value, + ns_token_secret: form.controls.tokenSecret.value }; } } diff --git a/src/app/integrations/netsuite/netsuite-main/netsuite-main.component.ts b/src/app/integrations/netsuite/netsuite-main/netsuite-main.component.ts index e2463ae81..ab1c9a0b8 100644 --- a/src/app/integrations/netsuite/netsuite-main/netsuite-main.component.ts +++ b/src/app/integrations/netsuite/netsuite-main/netsuite-main.component.ts @@ -40,7 +40,7 @@ export class NetsuiteMainComponent implements OnInit { this.netsuiteHelperService.refreshNetsuiteDimensions().subscribe(); this.netsuiteHelperService.refreshFyleDimensions().subscribe(); this.accountingExportService.importExpensesFromFyle('v1').subscribe(); - this.toastServeice.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from Netsuite'); + this.toastServeice.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from NetSuite'); } private setupPage() { diff --git a/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-connector/netsuite-onboarding-connector.component.ts b/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-connector/netsuite-onboarding-connector.component.ts index 7839a77a5..ba30fb3da 100644 --- a/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-connector/netsuite-onboarding-connector.component.ts +++ b/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-connector/netsuite-onboarding-connector.component.ts @@ -14,7 +14,7 @@ export class NetsuiteOnboardingConnectorComponent implements OnInit { isNetsuiteConnected: boolean = false; - onboardingSteps: OnboardingStepper[] = new NetsuiteOnboardingModel().getOnboardingSteps('Connect to Netsuite', this.workspaceService.getOnboardingState()); + onboardingSteps: OnboardingStepper[] = new NetsuiteOnboardingModel().getOnboardingSteps('Connect to NetSuite', this.workspaceService.getOnboardingState()); constructor( private workspaceService: WorkspaceService diff --git a/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-landing/netsuite-onboarding-landing.component.html b/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-landing/netsuite-onboarding-landing.component.html index a79443a14..fea3c09dc 100644 --- a/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-landing/netsuite-onboarding-landing.component.html +++ b/src/app/integrations/netsuite/netsuite-onboarding/netsuite-onboarding-landing/netsuite-onboarding-landing.component.html @@ -3,6 +3,6 @@
- +
diff --git a/src/app/integrations/netsuite/netsuite-shared/netsuite-advanced-settings/netsuite-advanced-settings.component.html b/src/app/integrations/netsuite/netsuite-shared/netsuite-advanced-settings/netsuite-advanced-settings.component.html index 73eaedef2..3b982221c 100644 --- a/src/app/integrations/netsuite/netsuite-shared/netsuite-advanced-settings/netsuite-advanced-settings.component.html +++ b/src/app/integrations/netsuite/netsuite-shared/netsuite-advanced-settings/netsuite-advanced-settings.component.html @@ -46,8 +46,8 @@ -
- + netsuite-connector works!

diff --git a/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.scss b/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.spec.ts b/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.spec.ts deleted file mode 100644 index 5b23b70b1..000000000 --- a/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NetsuiteConnectorComponent } from './netsuite-connector.component'; - -describe('NetsuiteConnectorComponent', () => { - let component: NetsuiteConnectorComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ NetsuiteConnectorComponent ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(NetsuiteConnectorComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.ts b/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.ts deleted file mode 100644 index be82e2890..000000000 --- a/src/app/integrations/netsuite/netsuite-shared/netsuite-connector/netsuite-connector.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-netsuite-connector', - templateUrl: './netsuite-connector.component.html', - styleUrls: ['./netsuite-connector.component.scss'] -}) -export class NetsuiteConnectorComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.html b/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.html index 92f3578dd..2a8494d67 100644 --- a/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.html +++ b/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.html @@ -40,7 +40,7 @@
+ [infoText]="'Follow the steps as shown below to access the necessary details on your NetSuite account.'">
+ [infoText]="'Follow the steps as shown below to access the necessary details on your NetSuite account.'">
@@ -76,7 +76,7 @@
+ [infoText]="'Follow the steps as shown below to access the necessary details on your NetSuite account.'">
diff --git a/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.ts b/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.ts index ee6b2775b..6213c0d24 100644 --- a/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.ts +++ b/src/app/integrations/netsuite/netsuite-shared/netsuite-import-settings/netsuite-custom-segment-dialog/netsuite-custom-segment-dialog.component.ts @@ -76,13 +76,13 @@ export class NetsuiteCustomSegmentDialogComponent implements OnInit { getInternalIDLabel(): string { if (brandingConfig.brandId === 'co') { - return 'Enter ' + new SentenceCasePipe().transform(new SnakeCaseToSpaceCasePipe().transform(this.form.controls.customFieldType.value)) + ' internal ID'; + return new SentenceCasePipe().transform(new SnakeCaseToSpaceCasePipe().transform('Enter ' + this.form.controls.customFieldType.value)) + ' internal ID'; } return 'Enter ' + new TitleCasePipe().transform(new SnakeCaseToSpaceCasePipe().transform(this.form.controls.customFieldType.value)) + ' Internal ID'; } getTransactionIdLabel(): string { - return this.brandingConfig.brandId === 'co' ? new SnakeCaseToSpaceCasePipe().transform('Enter Transaction Line Field ID') : 'Enter Transaction Line Field ID'; + return this.brandingConfig.brandId === 'co' ? new SentenceCasePipe().transform('Enter Transaction Line Field') + ' ID' : 'Enter Transaction Line Field ID'; } setImagesForCustomSegment(): string { diff --git a/src/app/integrations/netsuite/netsuite.module.ts b/src/app/integrations/netsuite/netsuite.module.ts index 37f33ddf4..123abb2d4 100644 --- a/src/app/integrations/netsuite/netsuite.module.ts +++ b/src/app/integrations/netsuite/netsuite.module.ts @@ -3,14 +3,12 @@ import { CommonModule } from '@angular/common'; import { NetsuiteRoutingModule } from './netsuite-routing.module'; import { NetsuiteComponent } from './netsuite.component'; -import { NetsuiteConnectorComponent } from './netsuite-shared/netsuite-connector/netsuite-connector.component'; import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ declarations: [ - NetsuiteComponent, - NetsuiteConnectorComponent + NetsuiteComponent ], imports: [ CommonModule, diff --git a/src/app/shared/components/netsuite/core/netsuite-connector/netsuite-connector.component.ts b/src/app/shared/components/netsuite/core/netsuite-connector/netsuite-connector.component.ts index 4ab391476..eaabc271b 100644 --- a/src/app/shared/components/netsuite/core/netsuite-connector/netsuite-connector.component.ts +++ b/src/app/shared/components/netsuite/core/netsuite-connector/netsuite-connector.component.ts @@ -36,6 +36,8 @@ export class NetsuiteConnectorComponent implements OnInit { readonly brandingConfig = brandingConfig; + netsuiteCredential: NetsuiteConnectorGet | null = null; + constructor( private router: Router, private formBuilder: FormBuilder, @@ -54,7 +56,6 @@ export class NetsuiteConnectorComponent implements OnInit { save() { const connectorPayload = NetsuiteConnectorModel.constructPayload(this.connectNetsuiteForm); - this.isLoading = true; this.connectorService.connectNetsuite(connectorPayload).subscribe((response) => { this.mappingsService.refreshNetsuiteDimensions(['subsidiaries']).subscribe(() => { @@ -64,7 +65,7 @@ export class NetsuiteConnectorComponent implements OnInit { }); }, () => { this.setupConnectionStatus.emit(false); - this.clearField(); + this.connectNetsuiteForm = NetsuiteConnectorModel.mapAPIResponseToFormGroup(this.netsuiteCredential); this.isLoading = false; this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Error while connecting, please try again later.'); }); @@ -74,6 +75,7 @@ export class NetsuiteConnectorComponent implements OnInit { this.isLoading = true; this.isOnboarding = this.router.url.includes('onboarding'); this.connectorService.getNetsuiteCredentials().subscribe((netsuiteCredential: NetsuiteConnectorGet) => { + this.netsuiteCredential = netsuiteCredential; this.connectNetsuiteForm = NetsuiteConnectorModel.mapAPIResponseToFormGroup(netsuiteCredential); this.setupConnectionStatus.emit(true); this.isLoading = false; diff --git a/src/app/shared/pipes/search.pipe.spec.ts b/src/app/shared/pipes/search.pipe.spec.ts index 78fc355be..5d8c64799 100644 --- a/src/app/shared/pipes/search.pipe.spec.ts +++ b/src/app/shared/pipes/search.pipe.spec.ts @@ -27,7 +27,7 @@ describe('SearchPipe', () => { it('SearchPipe Transform function check 3', () => { const names = [{value: 'FyleIntegrations'}, {value: 'Fyle'}, {value: 'Integrations'}, {value: 'QBO'}, {value: 'fyle-integration'}]; - const text = "Netsuite"; + const text = "NetSuite"; const result = [{ id: null, value: 'No result found' }]; const pipe = new SearchPipe(); expect(pipe.transform(names, text)).toEqual(result);