Merge branch master into angular-18-version-update

Author: DhaaraniCIT

package-lock.json

@@ -39,7 +39,6 @@
     "@types/node": "^16.11.7",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
-    "latest": "^0.2.0",
     "n": "^9.2.3",
     "ng-svg-icon-sprite": "^1.14.0",
     "primeicons": "^7.0.0",

package.json

@@ -42,6 +42,8 @@ export enum InAppIntegration {
   QBD_DIRECT = 'QuickBooks Connector'
 }
 
+export type IntegrationAppKey = keyof typeof InAppIntegration;
+
 export enum ToastSeverity {
   SUCCESS = 'success',
   ERROR = 'error',
@@ -900,7 +902,8 @@ export enum SizeOption {
 export enum ThemeOption {
   BRAND = 'brand',
   LIGHT = 'light',
-  DARK = 'dark'
+  DARK = 'dark',
+  SUCCESS = 'success'
 }
 
 export enum QBDPreRequisiteState {

src/app/core/models/enum/enum.model.ts

@@ -1,5 +1,16 @@
 import { AccountingIntegrationApp, AppUrl, ClickEvent, InAppIntegration, IntegrationView } from "../enum/enum.model";
 
+export type Integration = {
+    id: number;
+    org_id: string;
+    org_name: string;
+    tpa_id: string;
+    tpa_name: string;
+    type: string;
+    is_active: boolean;
+    is_beta: boolean;
+}
+
 export type IntegrationsView = {
     [IntegrationView.ACCOUNTING]: boolean,
     [IntegrationView.ALL]: boolean,

src/app/core/models/integrations/integrations.model.ts

@@ -5,4 +5,5 @@ export interface QBDWorkspace extends Workspace {
   reimbursable_last_synced_at: Date | null;
   ccc_last_synced_at: Date | null;
   onboarding_state: QBDOnboardingState;
+  migrated_to_qbd_direct: boolean;
 }

src/app/core/models/qbd/db/qbd-workspace.model.ts

@@ -71,10 +71,6 @@ export class QBOOnboardingModel {
           this.onboardingSteps[index - 1].completed = true;
         }
 
-        if (!brandingFeatureConfig.featureFlags.mapEmployees) {
-          this.onboardingSteps.splice(1, 1);
-        }
-
         return this.onboardingSteps;
     }
 }

src/app/core/models/qbo/qbo-configuration/qbo-onboarding.model.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { IntegrationsService } from './integrations.service';
+
+xdescribe('IntegrationsService', () => {
+  let service: IntegrationsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(IntegrationsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/core/services/common/integrations.service.spec.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { AppUrl } from '../../models/enum/enum.model';
+import { ApiService } from './api.service';
+import { HelperService } from './helper.service';
+import { Observable } from 'rxjs';
+import { Integration } from '../../models/integrations/integrations.model';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class IntegrationsService {
+  constructor(
+    private apiService: ApiService,
+    private helper: HelperService
+  ) {
+  }
+
+  getIntegrations(): Observable<Integration[]> {
+    this.helper.setBaseApiURL(AppUrl.INTEGRATION);
+    return this.apiService.get(`/integrations/`, {});
+  }
+}

src/app/core/services/common/integrations.service.ts

@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { IntegrationsComponent } from './integrations.component';
 import { LandingComponent } from './landing/landing.component';
+import { LandingV2Component } from './landing-v2/landing-v2.component';
 
 const routes: Routes = [
   {
@@ -12,6 +13,10 @@ const routes: Routes = [
         path: 'landing',
         component: LandingComponent
       },
+      {
+        path: 'landing_v2',
+        component: LandingV2Component
+      },
       {
         path: 'bamboo_hr',
         loadChildren: () => import('./bamboo-hr/bamboo-hr.module').then(m => m.BambooHrModule)

src/app/integrations/integrations-routing.module.ts

@@ -10,6 +10,7 @@ import { SharedModule } from '../shared/shared.module';
 import { Sage300Component } from './sage300/sage300.component';
 import { XeroComponent } from './xero/xero.component';
 import { TravelperkComponent } from './travelperk/travelperk.component';
+import { LandingV2Component } from './landing-v2/landing-v2.component';
 
 @NgModule({
   declarations: [
@@ -18,7 +19,8 @@ import { TravelperkComponent } from './travelperk/travelperk.component';
     QbdComponent,
     Sage300Component,
     XeroComponent,
-    TravelperkComponent
+    TravelperkComponent,
+    LandingV2Component
   ],
   imports: [
     CommonModule,