test: Add tests for Corporate Card task

src/app/core/services/tasks.service.spec.ts

@@ -40,7 +40,7 @@ import {
   sentBackReportTaskSingularSample,
   verifyMobileNumberTask2,
 } from '../mock-data/task.data';
-import { mastercardRTFCard } from '../mock-data/platform-corporate-card.data';
+import { mastercardRTFCard, statementUploadedCard, visaRTFCard } from '../mock-data/platform-corporate-card.data';
 import { OrgSettingsService } from './org-settings.service';
 import { ExpensesService } from './platform/v1/spender/expenses.service';
 import { expenseDuplicateSets } from '../mock-data/platform/v1/expense-duplicate-sets.data';
@@ -66,7 +66,6 @@ import {
   expectedSentBackResponse,
   expectedSentBackResponseSingularReport,
 } from '../mock-data/report-stats.data';
-import { expectedReportsSinglePage } from '../mock-data/platform-report.data';
 import { OrgService } from './org.service';
 import { orgData1 } from '../mock-data/org.data';
 import { UtilityService } from './utility.service';
@@ -421,6 +420,30 @@ describe('TasksService', () => {
       });
   });
 
+  describe('getAddCorporateCardTask(): ', () => {
+    it('should return add corporate card task when no cards are enrolled', (done) => {
+      orgSettingsService.get.and.returnValue(of(orgSettingsRes));
+      corporateCreditCardExpenseService.getCorporateCards.and.returnValue(of([statementUploadedCard]));
+      const addCcSpy = spyOn(tasksService, 'mapAddCorporateCardTask');
+
+      tasksService.getAddCorporateCardTask().subscribe((tasks) => {
+        expect(corporateCreditCardExpenseService.getCorporateCards).toHaveBeenCalled();
+        expect(tasksService.mapAddCorporateCardTask).toHaveBeenCalled();
+        expect(addCcSpy).toHaveBeenCalledOnceWith();
+        done();
+      });
+    });
+
+    it('should return undefined when there are enrolled cards', (done) => {
+      corporateCreditCardExpenseService.getCorporateCards.and.returnValue(of([mastercardRTFCard, visaRTFCard]));
+      tasksService.getAddCorporateCardTask().subscribe((tasks) => {
+        expect(corporateCreditCardExpenseService.getCorporateCards).toHaveBeenCalled();
+        expect(tasks).toEqual([]);
+        done();
+      });
+    });
+  });
+
   it('should be able to fetch advancesTaskCount', (done) => {
     tasksService.advancesTaskCount$.next(10);
     tasksService
@@ -780,6 +803,7 @@ describe('TasksService', () => {
     corporateCreditCardExpenseService.getCorporateCards.and.returnValue(of([mastercardRTFCard]));
     orgSettingsService.get.and.returnValue(of(orgSettingsRes));
     employeesService.getCommuteDetails.and.returnValue(of(commuteDetailsResponseData));
+    corporateCreditCardExpenseService.getCorporateCards.and.returnValue(of([mastercardRTFCard]));
   }
 
   it('should be able to fetch tasks with no filters', (done) => {

src/app/core/services/tasks.service.ts

@@ -532,11 +532,18 @@ export class TasksService {
   }
 
   getAddCorporateCardTask(): Observable<DashboardTask[]> {
-    return this.corporateCreditCardExpenseService.getCorporateCards().pipe(
-      map((cards) => {
+    return forkJoin([this.orgSettingsService.get(), this.corporateCreditCardExpenseService.getCorporateCards()]).pipe(
+      map(([orgSettings, cards]) => {
+        const isRtfEnabled =
+          (orgSettings.visa_enrollment_settings.allowed && orgSettings.visa_enrollment_settings.enabled) ||
+          (orgSettings.mastercard_enrollment_settings.allowed && orgSettings.mastercard_enrollment_settings.enabled);
+        const isCCCEnabled =
+          orgSettings.corporate_credit_card_settings.allowed && orgSettings.corporate_credit_card_settings.enabled;
         const rtfCards = cards.filter((card) => card.is_visa_enrolled || card.is_mastercard_enrolled);
-        if (rtfCards.length === 0) {
+        if (isRtfEnabled && isCCCEnabled && rtfCards.length === 0) {
           return this.mapAddCorporateCardTask();
+        } else {
+          return [] as DashboardTask[];
         }
       })
     );

src/app/fyle/dashboard/card-stats/card-stats.component.spec.ts

@@ -191,7 +191,7 @@
       expect(spentCardsComponentInstance.cardDetails).toEqual(cardDetails);
       expect(spentCardsComponentInstance.homeCurrency).toEqual('USD');
       expect(spentCardsComponentInstance.currencySymbol).toEqual('$');
       expect(spentCardsComponentInstance.showAddCardSlide).toEqual(true);
 
       expect(corporateCreditCardExpenseService.getCorporateCards).toHaveBeenCalledTimes(1);
       expect(corporateCreditCardExpenseService.getPlatformCorporateCardDetails).toHaveBeenCalledOnceWith(
@@ -233,7 +233,7 @@
         expect(addCardComponent).toBeTruthy();
 
         const addCardComponentInstance = addCardComponent.componentInstance as MockAddCardComponent;
         expect(addCardComponentInstance.showZeroStateMessage).toEqual(true);
       });
 
       it('should not be visible if RTF enrollment is disabled', fakeAsync(() => {
@@ -342,7 +342,6 @@
 
     it('should open the add corporate card modal on addCardClick event', fakeAsync(() => {
       // Returning empty object, because we don't want to trigger the success flow, we are just testing if the popover opens or not
-      addCardPopoverSpy.onDidDismiss.and.resolveTo({});
       component.isVirtualCardsEnabled$ = of({ enabled: false });
       fixture.detectChanges();
 

src/app/fyle/dashboard/tasks/tasks-1.component.spec.ts

@@ -41,6 +41,8 @@ import {
   taskCtaData8,
   taskCtaData9,
 } from 'src/app/core/mock-data/task-cta.data';
+import { OrgSettingsService } from 'src/app/core/services/org-settings.service';
+import { orgSettingsPendingRestrictions } from 'src/app/core/mock-data/org-settings.data';
 
 export function TestCases1(getTestBed) {
   return describe('test case set 1', () => {
@@ -60,6 +62,7 @@ export function TestCases1(getTestBed) {
     let router: jasmine.SpyObj<Router>;
     let activatedRoute: jasmine.SpyObj<ActivatedRoute>;
     let networkService: jasmine.SpyObj<NetworkService>;
+    let orgSettingsService: jasmine.SpyObj<OrgSettingsService>;
 
     beforeEach(waitForAsync(() => {
       const TestBed = getTestBed();
@@ -79,13 +82,18 @@ export function TestCases1(getTestBed) {
       router = TestBed.inject(Router) as jasmine.SpyObj<Router>;
       activatedRoute = TestBed.inject(ActivatedRoute) as jasmine.SpyObj<ActivatedRoute>;
       networkService = TestBed.inject(NetworkService) as jasmine.SpyObj<NetworkService>;
+      orgSettingsService = TestBed.inject(OrgSettingsService) as jasmine.SpyObj<OrgSettingsService>;
     }));
 
     it('should create', () => {
       expect(component).toBeTruthy();
     });
 
     it('ngOnInit(): should call setupNetworkWatcher once', () => {
+      orgSettingsService.get.and.returnValue(of(orgSettingsPendingRestrictions));
+      component.isVisaRTFEnabled$ = of(true);
+      component.isMastercardRTFEnabled$ = of(true);
+      component.isYodleeEnabled$ = of(true);
       spyOn(component, 'setupNetworkWatcher');
       fixture.detectChanges();
 

src/app/fyle/dashboard/tasks/tasks-2.component.spec.ts

@@ -1,5 +1,5 @@
 import { ComponentFixture, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
-import { ModalController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
 
 import { TasksComponent } from './tasks.component';
 import { TasksService } from 'src/app/core/services/tasks.service';
@@ -48,6 +48,12 @@ import { apiEouRes } from 'src/app/core/mock-data/extended-org-user.data';
 import { OrgService } from 'src/app/core/services/org.service';
 import { orgData1 } from 'src/app/core/mock-data/org.data';
 import { FyOptInComponent } from 'src/app/shared/components/fy-opt-in/fy-opt-in.component';
+import { Component, Input } from '@angular/core';
+import { AddCorporateCardComponent } from '../../manage-corporate-cards/add-corporate-card/add-corporate-card.component';
+import { By } from '@angular/platform-browser';
+import { OrgUserSettingsService } from 'src/app/core/services/org-user-settings.service';
+import { CorporateCreditCardExpenseService } from 'src/app/core/services/corporate-credit-card-expense.service';
+import { OrgSettingsService } from 'src/app/core/services/org-settings.service';
 
 export function TestCases2(getTestBed) {
   return describe('test case set 2', () => {
@@ -71,6 +77,10 @@ export function TestCases2(getTestBed) {
     let spenderReportsService: jasmine.SpyObj<SpenderReportsService>;
     let approverReportsService: jasmine.SpyObj<ApproverReportsService>;
     let orgService: jasmine.SpyObj<OrgService>;
+    let popoverController: jasmine.SpyObj<PopoverController>;
+    let orgUserSettingsService: jasmine.SpyObj<OrgUserSettingsService>;
+    let corporateCreditCardExpenseService: jasmine.SpyObj<CorporateCreditCardExpenseService>;
+    let orgSettingsService: jasmine.SpyObj<OrgSettingsService>;
 
     beforeEach(waitForAsync(() => {
       const TestBed = getTestBed();
@@ -94,6 +104,14 @@ export function TestCases2(getTestBed) {
       spenderReportsService = TestBed.inject(SpenderReportsService) as jasmine.SpyObj<SpenderReportsService>;
       approverReportsService = TestBed.inject(ApproverReportsService) as jasmine.SpyObj<ApproverReportsService>;
       orgService = TestBed.inject(OrgService) as jasmine.SpyObj<OrgService>;
+      popoverController = TestBed.inject(PopoverController) as jasmine.SpyObj<PopoverController>;
+      orgUserSettingsService = TestBed.inject(OrgUserSettingsService) as jasmine.SpyObj<OrgUserSettingsService>;
+      corporateCreditCardExpenseService = TestBed.inject(
+        CorporateCreditCardExpenseService
+      ) as jasmine.SpyObj<CorporateCreditCardExpenseService>;
+      let addCardPopoverSpy: jasmine.SpyObj<HTMLIonPopoverElement>;
+      popoverController.create.and.returnValues(Promise.resolve(addCardPopoverSpy));
+      orgSettingsService = TestBed.inject(OrgSettingsService) as jasmine.SpyObj<OrgSettingsService>;
     }));
 
     describe('init():', () => {
@@ -182,6 +200,37 @@ export function TestCases2(getTestBed) {
       });
     });
 
+    it('onAddCorporateCardClick(): should open card popover', fakeAsync(() => {
+      // Mock the observables
+      component.isVisaRTFEnabled$ = of(true);
+      component.isMastercardRTFEnabled$ = of(true);
+      component.isYodleeEnabled$ = of(true);
+
+      // Mock the PopoverController
+      const addCardPopoverSpy = jasmine.createSpyObj('HTMLIonPopoverElement', ['present', 'onDidDismiss']);
+      addCardPopoverSpy.present.and.resolveTo();
+      addCardPopoverSpy.onDidDismiss.and.resolveTo({});
+
+      popoverController.create.and.resolveTo(addCardPopoverSpy);
+
+      // Call the method
+      component.onAddCorporateCardClick();
+      tick();
+
+      // Assert popover creation
+      expect(popoverController.create).toHaveBeenCalledOnceWith({
+        component: AddCorporateCardComponent,
+        cssClass: 'fy-dialog-popover',
+        componentProps: {
+          isVisaRTFEnabled: true,
+          isMastercardRTFEnabled: true,
+          isYodleeEnabled: true,
+        },
+      });
+
+      expect(addCardPopoverSpy.present).toHaveBeenCalledTimes(1);
+    }));
+
     it('onMobileNumberVerificationTaskClick(): should open opt in modal', fakeAsync(() => {
       authService.getEou.and.resolveTo(apiEouRes);
       const optInModalSpy = jasmine.createSpyObj('optInModal', ['present', 'onWillDismiss']);

src/app/fyle/dashboard/tasks/tasks.component.setup.spec.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { IonicModule, ModalController } from '@ionic/angular';
+import { IonicModule, ModalController, PopoverController } from '@ionic/angular';
 
 import { TasksComponent } from './tasks.component';
 import { TasksService } from 'src/app/core/services/tasks.service';
@@ -24,6 +24,8 @@ import { OrgSettingsService } from 'src/app/core/services/org-settings.service';
 import { SpenderReportsService } from 'src/app/core/services/platform/v1/spender/reports.service';
 import { ApproverReportsService } from 'src/app/core/services/platform/v1/approver/reports.service';
 import { OrgService } from 'src/app/core/services/org.service';
+import { OrgUserSettingsService } from 'src/app/core/services/org-user-settings.service';
+import { CorporateCreditCardExpenseService } from 'src/app/core/services/corporate-credit-card-expense.service';
 
 describe('TasksComponent', () => {
   const getTestBed = () => {
@@ -65,6 +67,10 @@ describe('TasksComponent', () => {
       'getAllReportsByParams',
     ]);
     const approverReportsServiceSpy = jasmine.createSpyObj('ApproverReportsService', ['getAllReportsByParams']);
+    const orgUserSettingsServiceSpy = jasmine.createSpyObj('OrgUserSettingsService', ['get']);
+    const corporateCreditCardExpenseServiceSpy = jasmine.createSpyObj('CorporateCreditCardExpenseService', [
+      'getCorporateCards',
+    ]);
     const matSnackBarSpy = jasmine.createSpyObj('MatSnackBar', ['openFromComponent']);
     const snackbarPropertiesSpy = jasmine.createSpyObj('SnackbarPropertiesService', ['setSnackbarProperties']);
     const orgServiceSpy = jasmine.createSpyObj('OrgService', ['getPrimaryOrg', 'getCurrentOrg']);
@@ -77,8 +83,10 @@ describe('TasksComponent', () => {
         },
       },
     };
+    const popoverControllerSpy = jasmine.createSpyObj('PopoverController', ['create', 'onDidDismiss']);
     const networkServiceSpy = jasmine.createSpyObj('NetworkService', ['connectivityWatcher', 'isOnline']);
 
+    const addCardPopoverSpy = jasmine.createSpyObj('HTMLIonPopoverElement', ['present', 'onDidDismiss']);
     TestBed.configureTestingModule({
       declarations: [TasksComponent],
       imports: [IonicModule.forRoot(), RouterTestingModule],
@@ -102,6 +110,9 @@ describe('TasksComponent', () => {
         { provide: SpenderReportsService, useValue: spenderReportsServiceSpy },
         { provide: ApproverReportsService, useValue: approverReportsServiceSpy },
         { provide: OrgService, useValue: orgServiceSpy },
+        { provide: PopoverController, useValue: popoverControllerSpy },
+        { provide: OrgUserSettingsService, useValue: orgUserSettingsServiceSpy },
+        { provide: CorporateCreditCardExpenseService, useValue: corporateCreditCardExpenseServiceSpy },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();

src/app/fyle/dashboard/tasks/tasks.component.ts

@@ -400,11 +400,8 @@ export class TasksComponent implements OnInit {
     });
   }
 
-  onTaskClicked(taskCta: TaskCta, task: DashboardTask): void {
-    this.trackingService.tasksClicked({
-      Asset: 'Mobile',
-      header: task.header,
-    });
+  // eslint-disable-next-line complexity
+  loadTasksMap(taskCta: TaskCta, task: DashboardTask): void {
     switch (taskCta.event) {
       case TASKEVENT.expensesAddToReport:
         this.onExpensesToReportTaskClick();
@@ -441,6 +438,14 @@ export class TasksComponent implements OnInit {
     }
   }
 
+  onTaskClicked(taskCta: TaskCta, task: DashboardTask): void {
+    this.trackingService.tasksClicked({
+      Asset: 'Mobile',
+      header: task.header,
+    });
+    this.loadTasksMap(taskCta, task);
+  }
+
   onMobileNumberVerificationTaskClick(): void {
     this.trackingService.clickedOnTask({
       type: 'Opt in',