Merge branch 'Fyle-8679027wa' of https://github.com/fylein/fyle-mobil…

…e-app into Fyle-8679027wa

src/app/core/guards/beta-page-feature-flag.guard.spec.ts

@@ -0,0 +1,77 @@
+import { ActivatedRoute, Router } from '@angular/router';
+import { OrgSettingsService } from '../services/org-settings.service';
+import { BetaPageFeatureFlagGuard } from './beta-page-feature-flag.guard';
+import { TestBed } from '@angular/core/testing';
+import { Observable, of } from 'rxjs';
+import { routerStateSnapshotData } from '../mock-data/router-state-snapshot.data';
+
+describe('BetaPageFeatureFlagGuard', () => {
+  let guard: BetaPageFeatureFlagGuard;
+  let orgSettingsService: jasmine.SpyObj<OrgSettingsService>;
+  let router: jasmine.SpyObj<Router>;
+  let activatedRoute: jasmine.SpyObj<ActivatedRoute>;
+
+  beforeEach(() => {
+    const orgSettingsServiceSpy = jasmine.createSpyObj('OrgSettingsService', ['isBetaPageEnabledForPath']);
+    const routerSpy = jasmine.createSpyObj('Router', ['navigate']);
+
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: OrgSettingsService,
+          useValue: orgSettingsServiceSpy,
+        },
+        {
+          provide: Router,
+          useValue: routerSpy,
+        },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              routeConfig: {
+                path: 'my_view_report',
+              },
+              data: {
+                url: '/enterprise/my_view_report',
+                root: null,
+              },
+            },
+          },
+        },
+      ],
+    });
+    guard = TestBed.inject(BetaPageFeatureFlagGuard);
+    orgSettingsService = TestBed.inject(OrgSettingsService) as jasmine.SpyObj<OrgSettingsService>;
+    activatedRoute = TestBed.inject(ActivatedRoute) as jasmine.SpyObj<ActivatedRoute>;
+    router = TestBed.inject(Router) as jasmine.SpyObj<Router>;
+  });
+
+  it('should be created', () => {
+    expect(guard).toBeTruthy();
+  });
+
+  describe('canActivate(): ', () => {
+    it('Should navigate to the beta page if the feature flag is enabled', (done) => {
+      orgSettingsService.isBetaPageEnabledForPath.and.returnValue(of(true));
+      const canActivate = guard.canActivate(activatedRoute.snapshot, routerStateSnapshotData) as Observable<boolean>;
+      canActivate.subscribe((res) => {
+        expect(orgSettingsService.isBetaPageEnabledForPath).toHaveBeenCalledTimes(1);
+        expect(res).toBeFalse();
+        expect(router.navigate).toHaveBeenCalledWith(['/', 'enterprise', 'my_view_report_beta', {}]);
+        done();
+      });
+    });
+
+    it('Should navigate to the correct page if the feature flag is disabled', (done) => {
+      orgSettingsService.isBetaPageEnabledForPath.and.returnValue(of(false));
+      const canActivate = guard.canActivate(activatedRoute.snapshot, routerStateSnapshotData) as Observable<boolean>;
+      canActivate.subscribe((res) => {
+        expect(orgSettingsService.isBetaPageEnabledForPath).toHaveBeenCalledTimes(1);
+        expect(res).toBeTrue();
+        expect(router.navigate).not.toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+});

src/app/core/guards/beta-page-feature-flag.guard.ts

@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Observable, map, of } from 'rxjs';
+import { OrgSettingsService } from '../services/org-settings.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class BetaPageFeatureFlagGuard implements CanActivate {
+  constructor(private orgSettingsService: OrgSettingsService, private router: Router) {}
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    const currentPath = route.routeConfig && route.routeConfig.path;
+
+    if (currentPath) {
+      return this.orgSettingsService.isBetaPageEnabledForPath(currentPath).pipe(
+        map((isBetaPageEnabled) => {
+          if (isBetaPageEnabled) {
+            this.router.navigate(['/', 'enterprise', `${currentPath}_beta`, { ...route.params }]);
+            return false;
+          }
+          return true;
+        })
+      );
+    } else {
+      return of(true);
+    }
+  }
+}

src/app/core/mock-data/platform/v1/expense.data.ts

@@ -428,6 +428,11 @@ export const mileageExpenseWithoutDistance: Expense = {
   category: mileageCategory,
 };
 
+export const perDiemExpense: Expense = {
+  ...expenseData,
+  category: perDiemCategory,
+};
+
 export const perDiemExpenseWithSingleNumDays: Expense = {
   ...expenseData,
   category: perDiemCategory,

src/app/core/models/org-settings.model.ts

@@ -354,6 +354,7 @@ export interface OrgSettingsResponse {
   enable_advances?: boolean;
   enable_org_creation?: boolean;
   enable_auto_report?: boolean;
+  mobile_app_view_report_beta_enabled?: boolean;
 
   mileage_details?: MileageDetails;
   policy_settings?: PolicySettings;
@@ -551,4 +552,5 @@ export interface OrgSettings {
   mastercard_enrollment_settings?: CommonOrgSettings;
   company_expenses_beta_settings?: CommonOrgSettings;
   simplified_report_closure_settings?: CommonOrgSettings;
+  mobile_app_view_report_beta_enabled?: boolean;
 }

src/app/core/services/deep-link.service.ts

@@ -119,7 +119,7 @@ export class DeepLinkService {
 
   getExpenseRoute(etxn: UnflattenedTransaction): string[] {
     const category = etxn.tx.org_category?.toLowerCase();
-    const canEditTxn = ['DRAFT', 'DRAFT_INQUIRY', 'COMPLETE', 'APPROVER_PENDING'].includes(etxn.tx.state);
+    const canEditTxn = ['DRAFT', 'COMPLETE', 'APPROVER_PENDING'].includes(etxn.tx.state);
 
     let route: string[] = [];
     if (canEditTxn) {

src/app/core/services/org-settings.service.ts

@@ -25,7 +25,9 @@ export class OrgSettingsService {
     cacheBusterObserver: orgSettingsCacheBuster$,
   })
   get(): Observable<OrgSettings> {
-    return this.apiService.get('/org/settings').pipe(map((incoming) => this.processIncoming(incoming)));
+    return this.apiService
+      .get('/org/settings')
+      .pipe(map((incoming: OrgSettingsResponse) => this.processIncoming(incoming)));
   }
 
   @CacheBuster({
@@ -36,6 +38,15 @@ export class OrgSettingsService {
     return this.apiService.post('/org/settings', data);
   }
 
+  isBetaPageEnabledForPath(currentPath: string): Observable<boolean> {
+    const pathSettingsFlagMap = {
+      my_view_report: 'mobile_app_view_report_beta_enabled',
+      view_team_report: 'mobile_app_view_report_beta_enabled',
+    };
+    const featureFlag = pathSettingsFlagMap[currentPath];
+    return this.get().pipe(map((orgSettings: OrgSettings) => orgSettings[featureFlag]));
+  }
+
   getIncomingAccountingObject(incomingAccountExport: AccountingExportSettings): IncomingAccountObject {
     const accounting: IncomingAccountObject = {
       enabled: false,
@@ -393,6 +404,7 @@ export class OrgSettingsService {
         allowed: incoming?.simplified_report_closure_settings?.allowed,
         enabled: incoming?.simplified_report_closure_settings?.enabled,
       },
+      mobile_app_view_report_beta_enabled: incoming.mobile_app_view_report_beta_enabled,
     };
 
     Object.keys(orgSettings).forEach((settingsType) => {

src/app/core/services/platform/v1/shared/expenses.service.spec.ts

@@ -164,11 +164,14 @@ describe('ExpensesService', () => {
         key: 'ccc',
       },
     ];
-    const expensePaymentMode = { name: 'Reimbursable', key: 'reimbursable' };
+    const expensePaymentMode: { name: string; key: 'reimbursable' | 'nonReimbursable' | 'advance' | 'ccc' } = {
+      name: 'Reimbursable',
+      key: 'reimbursable',
+    };
     // @ts-ignore
     expect(service.getPaymentModeForExpense(expenseData, paymentModeList)).toEqual(expensePaymentMode);
     expect(service.isExpenseInPaymentMode).toHaveBeenCalledOnceWith(
-      !expenseData.is_reimbursable,
+      expenseData.is_reimbursable,
       expenseData.source_account.type,
       expensePaymentMode.key
     );
@@ -268,38 +271,38 @@ describe('ExpensesService', () => {
 
   describe('isExpenseInPaymentMode():', () => {
     it('should return isExpenseInPaymentMode with reimbursable payment mode', () => {
-      const expenseSkipReimbursement = false;
+      const isExpenseReimbursable = true;
       const expensePaymentMode = 'reimbursable';
       const expenseSourceAccountType = AccountType.PERSONAL_CASH_ACCOUNT;
       expect(
-        service.isExpenseInPaymentMode(expenseSkipReimbursement, expenseSourceAccountType, expensePaymentMode)
+        service.isExpenseInPaymentMode(isExpenseReimbursable, expenseSourceAccountType, expensePaymentMode)
       ).toBeTrue();
     });
 
     it('should return isExpenseInPaymentMode with non-reimbursable payment mode', () => {
-      const expenseSkipReimbursement = true;
+      const isExpenseReimbursable = false;
       const expensePaymentMode = 'nonReimbursable';
       const expenseSourceAccountType = AccountType.PERSONAL_CASH_ACCOUNT;
       expect(
-        service.isExpenseInPaymentMode(expenseSkipReimbursement, expenseSourceAccountType, expensePaymentMode)
+        service.isExpenseInPaymentMode(isExpenseReimbursable, expenseSourceAccountType, expensePaymentMode)
       ).toBeTrue();
     });
 
     it('should return isExpenseInPaymentMode with advance payment mode', () => {
-      const expenseSkipReimbursement = false;
+      const isExpenseReimbursable = true;
       const expensePaymentMode = 'advance';
       const expenseSourceAccountType = AccountType.PERSONAL_ADVANCE_ACCOUNT;
       expect(
-        service.isExpenseInPaymentMode(expenseSkipReimbursement, expenseSourceAccountType, expensePaymentMode)
+        service.isExpenseInPaymentMode(isExpenseReimbursable, expenseSourceAccountType, expensePaymentMode)
       ).toBeTrue();
     });
 
     it('should return isExpenseInPaymentMode with advance payment mode', () => {
-      const expenseSkipReimbursement = false;
+      const isExpenseReimbursable = true;
       const expensePaymentMode = 'ccc';
       const expenseSourceAccountType = AccountType.PERSONAL_CORPORATE_CREDIT_CARD_ACCOUNT;
       expect(
-        service.isExpenseInPaymentMode(expenseSkipReimbursement, expenseSourceAccountType, expensePaymentMode)
+        service.isExpenseInPaymentMode(isExpenseReimbursable, expenseSourceAccountType, expensePaymentMode)
       ).toBeTrue();
     });
   });

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

@@ -948,12 +948,12 @@ describe('ReportService', () => {
       const params = 'draft';
 
       const expectedRes = {
-        state: ['DRAFT', 'DRAFT_INQUIRY'],
+        state: ['DRAFT'],
       };
 
       const result = reportService.getUserReportParams(params);
       expect(result).toEqual(expectedRes);
-      expect(expectedRes.state.length).toEqual(2);
+      expect(expectedRes.state.length).toEqual(1);
     });
 
     it('generate parameters as per state | pending', () => {
@@ -1022,7 +1022,6 @@ describe('ReportService', () => {
       const expectedRes = {
         state: [
           'DRAFT',
-          'DRAFT_INQUIRY',
           'COMPLETE',
           'APPROVED',
           'APPROVER_PENDING',
@@ -1036,7 +1035,7 @@ describe('ReportService', () => {
 
       const result = reportService.getUserReportParams(params);
       expect(result).toEqual(expectedRes);
-      expect(expectedRes.state.length).toEqual(10);
+      expect(expectedRes.state.length).toEqual(9);
     });
   });
 

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

@@ -33,6 +33,7 @@ import { SpenderPlatformV1ApiService } from './spender-platform-v1-api.service';
 import { StorageService } from './storage.service';
 import { TransactionService } from './transaction.service';
 import { UserEventService } from './user-event.service';
+import { Expense } from '../models/expense.model';
 
 const reportsCacheBuster$ = new Subject<void>();
 
@@ -292,7 +293,7 @@ export class ReportService {
   getUserReportParams(state: keyof ReportStateMap): Record<'state', string[]> {
     const stateMap: ReportStateMap = {
       draft: {
-        state: ['DRAFT', 'DRAFT_INQUIRY'],
+        state: ['DRAFT'],
       },
       pending: {
         state: ['APPROVER_PENDING'],
@@ -315,7 +316,6 @@ export class ReportService {
       all: {
         state: [
           'DRAFT',
-          'DRAFT_INQUIRY',
           'COMPLETE',
           'APPROVED',
           'APPROVER_PENDING',
@@ -624,6 +624,22 @@ export class ReportService {
     );
   }
 
+  getReportETxnc(rptId: string, orgUserId: string): Observable<Expense[]> {
+    const data: {
+      params: {
+        approver_id?: string;
+      };
+    } = {
+      params: {},
+    };
+
+    if (orgUserId) {
+      data.params.approver_id = orgUserId;
+    }
+
+    return this.apiService.get('/erpts/' + rptId + '/etxns', data);
+  }
+
   approverUpdateReportPurpose(erpt: ExtendedReport): Observable<PlatformReport> {
     const params: { data: Pick<PlatformReport, 'id' | 'source' | 'purpose'> } = {
       data: {