From a63aa8f90c785571595c855bdcb175570a770714 Mon Sep 17 00:00:00 2001 From: Arjun Date: Wed, 4 Oct 2023 11:00:44 +0530 Subject: [PATCH 01/14] feat: Mileage/ Per Diem expenses creation to depend on category (#2461) * initial changes for dashboard * done * fix failing tests * pr comment fi * added categories service spy to tests * minor * remove unwanted changes * minor * remove fdescribe * test: Mileage/ Per Diem expenses to depend on category (#2468) * coverage * test description update * fix tests * fix * more tests --- .../mock-data/action-sheet-options.data.ts | 42 +++++++++++++++++ .../mock-data/allowed-expense-types.data.ts | 4 ++ src/app/core/mock-data/org-category.data.ts | 28 +++++++++++ .../core/services/categories.service.spec.ts | 17 +++++++ src/app/core/services/categories.service.ts | 13 +++++ src/app/fyle/dashboard/dashboard.page.html | 13 +++-- src/app/fyle/dashboard/dashboard.page.scss | 7 +++ src/app/fyle/dashboard/dashboard.page.spec.ts | 45 +++++++++++++++--- src/app/fyle/dashboard/dashboard.page.ts | 27 ++++++++--- .../fyle/my-expenses/my-expenses.page.html | 15 ++++-- .../fyle/my-expenses/my-expenses.page.scss | 7 +++ .../fyle/my-expenses/my-expenses.page.spec.ts | 47 ++++++++++++++++--- src/app/fyle/my-expenses/my-expenses.page.ts | 36 ++++++++++---- 13 files changed, 265 insertions(+), 36 deletions(-) create mode 100644 src/app/core/mock-data/allowed-expense-types.data.ts diff --git a/src/app/core/mock-data/action-sheet-options.data.ts b/src/app/core/mock-data/action-sheet-options.data.ts index f8b0d47f42..59c080b37f 100644 --- a/src/app/core/mock-data/action-sheet-options.data.ts +++ b/src/app/core/mock-data/action-sheet-options.data.ts @@ -46,3 +46,45 @@ export const expectedActionSheetButtonRes = [ handler: undefined, }, ]; + +export const expectedActionSheetButtonsWithMileage = [ + { + text: 'Capture Receipt', + icon: 'assets/svg/fy-camera.svg', + cssClass: 'capture-receipt', + handler: undefined, + }, + { + text: 'Add Manually', + icon: 'assets/svg/fy-expense.svg', + cssClass: 'capture-receipt', + handler: undefined, + }, + { + text: 'Add Mileage', + icon: 'assets/svg/fy-mileage.svg', + cssClass: 'capture-receipt', + handler: undefined, + }, +]; + +export const expectedActionSheetButtonsWithPerDiem = [ + { + text: 'Capture Receipt', + icon: 'assets/svg/fy-camera.svg', + cssClass: 'capture-receipt', + handler: undefined, + }, + { + text: 'Add Manually', + icon: 'assets/svg/fy-expense.svg', + cssClass: 'capture-receipt', + handler: undefined, + }, + { + text: 'Add Per Diem', + icon: 'assets/svg/fy-calendar.svg', + cssClass: 'capture-receipt', + handler: undefined, + }, +]; diff --git a/src/app/core/mock-data/allowed-expense-types.data.ts b/src/app/core/mock-data/allowed-expense-types.data.ts new file mode 100644 index 0000000000..dd41359380 --- /dev/null +++ b/src/app/core/mock-data/allowed-expense-types.data.ts @@ -0,0 +1,4 @@ +export const allowedExpenseTypes: Record = { + mileage: true, + perDiem: true, +}; diff --git a/src/app/core/mock-data/org-category.data.ts b/src/app/core/mock-data/org-category.data.ts index 9e69cfa385..1c42ded879 100644 --- a/src/app/core/mock-data/org-category.data.ts +++ b/src/app/core/mock-data/org-category.data.ts @@ -1,3 +1,4 @@ +import { PlatformCategory } from '../models/platform/platform-category.model'; import { OrgCategory } from '../models/v1/org-category.model'; export const orgCategoryData: OrgCategory = { @@ -13,6 +14,33 @@ export const orgCategoryData: OrgCategory = { updated_at: new Date('2022-05-05T17:45:42.092507+00:00'), }; +export const mileagePerDiemPlatformCategoryData: PlatformCategory[] = [ + { + code: null, + created_at: new Date('2018-01-31T23:50:27.235056+00:00'), + display_name: 'Mileage', + is_enabled: true, + system_category: 'Mileage', + id: 16566, + name: 'Mileage', + org_id: 'orNVthTo2Zyo', + sub_category: 'Mileage', + updated_at: new Date('2022-05-05T17:45:42.092507+00:00'), + }, + { + code: null, + created_at: new Date('2018-01-31T23:50:27.235056+00:00'), + display_name: 'Per Diem', + is_enabled: true, + system_category: 'Per Diem', + id: 16566, + name: 'Per Diem', + org_id: 'orNVthTo2Zyo', + sub_category: 'Per Diem', + updated_at: new Date('2022-05-05T17:45:42.092507+00:00'), + }, +]; + export const transformedOrgCategories: OrgCategory[] = [ { code: '93', diff --git a/src/app/core/services/categories.service.spec.ts b/src/app/core/services/categories.service.spec.ts index 080c14899a..cf2350a90d 100644 --- a/src/app/core/services/categories.service.spec.ts +++ b/src/app/core/services/categories.service.spec.ts @@ -96,6 +96,23 @@ describe('CategoriesService', () => { }); }); + it('getMileageOrPerDiemCategories(): should get platform categories with Mileage and Per Diem as system category', (done) => { + spenderPlatformV1ApiService.get.and.returnValue(of(platformApiCategoryRes)); + + const apiParam = { + params: { + is_enabled: 'eq.true', + system_category: 'in.(Mileage, Per Diem)', + }, + }; + + categoriesService.getMileageOrPerDiemCategories().subscribe((res) => { + expect(res).toEqual(platformApiCategoryRes.data); + expect(spenderPlatformV1ApiService.get).toHaveBeenCalledOnceWith('/categories', apiParam); + done(); + }); + }); + it('getCategories(): should get categories from the api', (done) => { spenderPlatformV1ApiService.get.and.returnValue(of(platformApiAllCategories)); spyOn(categoriesService, 'transformFrom').and.returnValue(transformedOrgCategories); diff --git a/src/app/core/services/categories.service.ts b/src/app/core/services/categories.service.ts index da91966656..0df6eecec6 100644 --- a/src/app/core/services/categories.service.ts +++ b/src/app/core/services/categories.service.ts @@ -78,6 +78,19 @@ export class CategoriesService { ); } + @Cacheable() + getMileageOrPerDiemCategories(): Observable { + const data = { + params: { + is_enabled: 'eq.true', + system_category: 'in.(Mileage, Per Diem)', + }, + }; + return this.spenderPlatformV1ApiService + .get>('/categories', data) + .pipe(map((res) => res.data)); + } + transformFrom(platformCategory: PlatformCategory[]): OrgCategory[] { const oldCategory = platformCategory.map((category) => ({ code: category.code, diff --git a/src/app/fyle/dashboard/dashboard.page.html b/src/app/fyle/dashboard/dashboard.page.html index 1fae44bfd6..fba456ebbc 100644 --- a/src/app/fyle/dashboard/dashboard.page.html +++ b/src/app/fyle/dashboard/dashboard.page.html @@ -30,9 +30,16 @@ Home -
- -
+ +
+ +
+ + +
+ +
+ diff --git a/src/app/fyle/dashboard/dashboard.page.scss b/src/app/fyle/dashboard/dashboard.page.scss index 9a1a4c3134..f3ea25047a 100644 --- a/src/app/fyle/dashboard/dashboard.page.scss +++ b/src/app/fyle/dashboard/dashboard.page.scss @@ -60,5 +60,12 @@ &--action-shortcut { padding-right: 12px; padding-top: 2px; + + &--skeleton-icon { + margin-right: 12px; + width: 24px; + height: 24px; + border-radius: 5px; + } } } diff --git a/src/app/fyle/dashboard/dashboard.page.spec.ts b/src/app/fyle/dashboard/dashboard.page.spec.ts index 9c0cefaa32..3bdaab90e1 100644 --- a/src/app/fyle/dashboard/dashboard.page.spec.ts +++ b/src/app/fyle/dashboard/dashboard.page.spec.ts @@ -17,9 +17,16 @@ import { Subject, Subscription, of } from 'rxjs'; import { orgSettingsRes } from 'src/app/core/mock-data/org-settings.data'; import { orgUserSettingsData } from 'src/app/core/mock-data/org-user-settings.data'; import { BackButtonActionPriority } from 'src/app/core/models/back-button-action-priority.enum'; -import { cloneDeep } from 'lodash'; -import { expectedActionSheetButtonRes } from 'src/app/core/mock-data/action-sheet-options.data'; +import { clone, cloneDeep } from 'lodash'; +import { + expectedActionSheetButtonRes, + expectedActionSheetButtonsWithMileage, + expectedActionSheetButtonsWithPerDiem, +} from 'src/app/core/mock-data/action-sheet-options.data'; import { creditTxnFilterPill } from 'src/app/core/mock-data/filter-pills.data'; +import { allowedExpenseTypes } from 'src/app/core/mock-data/allowed-expense-types.data'; +import { CategoriesService } from 'src/app/core/services/categories.service'; +import { mileagePerDiemPlatformCategoryData } from 'src/app/core/mock-data/org-category.data'; describe('DashboardPage', () => { let component: DashboardPage; @@ -34,6 +41,7 @@ describe('DashboardPage', () => { let smartlookService: jasmine.SpyObj; let orgSettingsService: jasmine.SpyObj; let orgUserSettingsService: jasmine.SpyObj; + let categoriesService: jasmine.SpyObj; let backButtonService: jasmine.SpyObj; let platform: Platform; let navController: jasmine.SpyObj; @@ -53,6 +61,7 @@ describe('DashboardPage', () => { let smartlookServiceSpy = jasmine.createSpyObj('SmartlookService', ['init']); let orgSettingsServiceSpy = jasmine.createSpyObj('OrgSettingsService', ['get']); let orgUserSettingsServiceSpy = jasmine.createSpyObj('OrgUserSettingsService', ['get']); + const categoriesServiceSpy = jasmine.createSpyObj('CategoriesService', ['getMileageOrPerDiemCategories']); let backButtonServiceSpy = jasmine.createSpyObj('BackButtonService', ['showAppCloseAlert']); let navControllerSpy = jasmine.createSpyObj('NavController', ['back']); @@ -69,6 +78,7 @@ describe('DashboardPage', () => { { provide: SmartlookService, useValue: smartlookServiceSpy }, { provide: OrgSettingsService, useValue: orgSettingsServiceSpy }, { provide: OrgUserSettingsService, useValue: orgUserSettingsServiceSpy }, + { provide: CategoriesService, useValue: categoriesServiceSpy }, { provide: BackButtonService, useValue: backButtonServiceSpy }, { provide: NavController, useValue: navControllerSpy }, Platform, @@ -98,6 +108,7 @@ describe('DashboardPage', () => { smartlookService = TestBed.inject(SmartlookService) as jasmine.SpyObj; orgSettingsService = TestBed.inject(OrgSettingsService) as jasmine.SpyObj; orgUserSettingsService = TestBed.inject(OrgUserSettingsService) as jasmine.SpyObj; + categoriesService = TestBed.inject(CategoriesService) as jasmine.SpyObj; backButtonService = TestBed.inject(BackButtonService) as jasmine.SpyObj; platform = TestBed.inject(Platform); navController = TestBed.inject(NavController) as jasmine.SpyObj; @@ -171,6 +182,7 @@ describe('DashboardPage', () => { spyOn(component, 'registerBackButtonAction'); orgSettingsService.get.and.returnValue(of(orgSettingsRes)); orgUserSettingsService.get.and.returnValue(of(orgUserSettingsData)); + categoriesService.getMileageOrPerDiemCategories.and.returnValue(of(mileagePerDiemPlatformCategoryData)); currencyService.getHomeCurrency.and.returnValue(of('USD')); spyOn(component, 'setupActionSheet'); const statsComponentSpy = jasmine.createSpyObj('StatsComponent', ['init']); @@ -228,7 +240,7 @@ describe('DashboardPage', () => { it('should call setupActionSheet once with orgSettings data', () => { component.ionViewWillEnter(); - expect(component.setupActionSheet).toHaveBeenCalledOnceWith(orgSettingsRes); + expect(component.setupActionSheet).toHaveBeenCalledOnceWith(orgSettingsRes, allowedExpenseTypes); }); it('should call init method of statsComponent and tasksComponent', () => { @@ -416,13 +428,32 @@ describe('DashboardPage', () => { }); }); - it('setupActionSheet(): should setup actionSheetButtons', () => { + describe('setupActionSheet()', () => { const mockOrgSettings = cloneDeep(orgSettingsRes); - spyOn(component, 'actionSheetButtonsHandler'); mockOrgSettings.per_diem.enabled = true; mockOrgSettings.mileage.enabled = true; - component.setupActionSheet(mockOrgSettings); - expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonRes); + + it('should setup actionSheetButtons', () => { + spyOn(component, 'actionSheetButtonsHandler'); + component.setupActionSheet(orgSettingsRes, allowedExpenseTypes); + expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonRes); + }); + + it('should update actionSheetButtons without mileage', () => { + spyOn(component, 'actionSheetButtonsHandler'); + const mockAllowedExpenseTypes = clone(allowedExpenseTypes); + mockAllowedExpenseTypes.mileage = false; + component.setupActionSheet(orgSettingsRes, mockAllowedExpenseTypes); + expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonsWithPerDiem); + }); + + it('should update actionSheetButtons without Per Diem', () => { + spyOn(component, 'actionSheetButtonsHandler'); + const mockAllowedExpenseTypes = clone(allowedExpenseTypes); + mockAllowedExpenseTypes.perDiem = false; + component.setupActionSheet(orgSettingsRes, mockAllowedExpenseTypes); + expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonsWithMileage); + }); }); it('openAddExpenseActionSheet(): should open actionSheetController and track event', fakeAsync(() => { diff --git a/src/app/fyle/dashboard/dashboard.page.ts b/src/app/fyle/dashboard/dashboard.page.ts index 6cc8f2e094..2d8540f3b0 100644 --- a/src/app/fyle/dashboard/dashboard.page.ts +++ b/src/app/fyle/dashboard/dashboard.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, ViewChild } from '@angular/core'; -import { concat, Observable, of, Subject, Subscription } from 'rxjs'; +import { concat, forkJoin, Observable, of, Subject, Subscription } from 'rxjs'; import { shareReplay, switchMap, takeUntil } from 'rxjs/operators'; import { ActionSheetButton, ActionSheetController, NavController, Platform } from '@ionic/angular'; import { NetworkService } from '../../core/services/network.service'; @@ -19,6 +19,8 @@ import { BackButtonService } from 'src/app/core/services/back-button.service'; import { OrgSettings } from 'src/app/core/models/org-settings.model'; import { FilterPill } from 'src/app/shared/components/fy-filter-pills/filter-pill.interface'; import { CardStatsComponent } from './card-stats/card-stats.component'; +import { PlatformCategory } from 'src/app/core/models/platform/platform-category.model'; +import { CategoriesService } from 'src/app/core/services/categories.service'; enum DashboardState { home, @@ -41,6 +43,8 @@ export class DashboardPage { orgSettings$: Observable; + specialCategories$: Observable; + homeCurrency$: Observable; isConnected$: Observable; @@ -66,6 +70,7 @@ export class DashboardPage { private smartlookService: SmartlookService, private orgUserSettingsService: OrgUserSettingsService, private orgSettingsService: OrgSettingsService, + private categoriesService: CategoriesService, private platform: Platform, private backButtonService: BackButtonService, private navController: NavController @@ -116,10 +121,18 @@ export class DashboardPage { this.orgUserSettings$ = this.orgUserSettingsService.get().pipe(shareReplay(1)); this.orgSettings$ = this.orgSettingsService.get().pipe(shareReplay(1)); + this.specialCategories$ = this.categoriesService.getMileageOrPerDiemCategories().pipe(shareReplay(1)); this.homeCurrency$ = this.currencyService.getHomeCurrency().pipe(shareReplay(1)); - this.orgSettings$.subscribe((orgSettings) => { - this.setupActionSheet(orgSettings); + forkJoin({ + orgSettings: this.orgSettings$, + specialCategories: this.specialCategories$, + }).subscribe(({ orgSettings, specialCategories }) => { + const allowedExpenseTypes = { + mileage: specialCategories.some((category) => category.system_category === 'Mileage'), + perDiem: specialCategories.some((category) => category.system_category === 'Per Diem'), + }; + this.setupActionSheet(orgSettings, allowedExpenseTypes); }); this.statsComponent.init(); @@ -229,10 +242,10 @@ export class DashboardPage { }; } - setupActionSheet(orgSettings: OrgSettings): void { + setupActionSheet(orgSettings: OrgSettings, allowedExpenseTypes: Record): void { const that = this; - const mileageEnabled = orgSettings.mileage.enabled; - const isPerDiemEnabled = orgSettings.per_diem.enabled; + const mileageEnabled = orgSettings.mileage.enabled && allowedExpenseTypes.mileage; + const isPerDiemEnabled = orgSettings.per_diem.enabled && allowedExpenseTypes.perDiem; that.actionSheetButtons = [ { text: 'Capture Receipt', @@ -249,7 +262,7 @@ export class DashboardPage { ]; if (mileageEnabled) { - this.actionSheetButtons.push({ + that.actionSheetButtons.push({ text: 'Add Mileage', icon: 'assets/svg/fy-mileage.svg', cssClass: 'capture-receipt', diff --git a/src/app/fyle/my-expenses/my-expenses.page.html b/src/app/fyle/my-expenses/my-expenses.page.html index c9ba3c0ad1..04e2d89f44 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.html +++ b/src/app/fyle/my-expenses/my-expenses.page.html @@ -19,9 +19,18 @@ - - - + + + + + + + +
+ +
+ + diff --git a/src/app/fyle/my-expenses/my-expenses.page.scss b/src/app/fyle/my-expenses/my-expenses.page.scss index 9219913334..48399ec77e 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.scss +++ b/src/app/fyle/my-expenses/my-expenses.page.scss @@ -10,6 +10,13 @@ --padding-end: 8px !important; } + &--header-btn--skeleton-loader { + margin: 12px 8px; + border-radius: 5px; + width: 24px; + height: 24px; + } + &--filter-pills { position: fixed; width: 100%; diff --git a/src/app/fyle/my-expenses/my-expenses.page.spec.ts b/src/app/fyle/my-expenses/my-expenses.page.spec.ts index fe8dabbc06..d345546c67 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.spec.ts +++ b/src/app/fyle/my-expenses/my-expenses.page.spec.ts @@ -66,8 +66,12 @@ import { ExpenseFilters } from './expense-filters.model'; import { txnData2, txnList } from 'src/app/core/mock-data/transaction.data'; import { unformattedTxnData } from 'src/app/core/mock-data/unformatted-transaction.data'; import { expenseFiltersData1, expenseFiltersData2 } from 'src/app/core/mock-data/expense-filters.data'; -import { expectedActionSheetButtonRes } from 'src/app/core/mock-data/action-sheet-options.data'; -import { cloneDeep } from 'lodash'; +import { + expectedActionSheetButtonRes, + expectedActionSheetButtonsWithMileage, + expectedActionSheetButtonsWithPerDiem, +} from 'src/app/core/mock-data/action-sheet-options.data'; +import { clone, cloneDeep } from 'lodash'; import { apiAuthRes } from 'src/app/core/mock-data/auth-reponse.data'; import { LoaderService } from 'src/app/core/services/loader.service'; import { PopupService } from 'src/app/core/services/popup.service'; @@ -104,6 +108,9 @@ import { FyDeleteDialogComponent } from 'src/app/shared/components/fy-delete-dia import { getElementRef } from 'src/app/core/dom-helpers'; import { transactionDatum1, transactionDatum3 } from 'src/app/core/mock-data/stats-response.data'; import { uniqueCardsParam } from 'src/app/core/mock-data/unique-cards.data'; +import { allowedExpenseTypes } from 'src/app/core/mock-data/allowed-expense-types.data'; +import { CategoriesService } from 'src/app/core/services/categories.service'; +import { mileagePerDiemPlatformCategoryData } from 'src/app/core/mock-data/org-category.data'; describe('MyExpensesPage', () => { let component: MyExpensesPage; @@ -128,6 +135,7 @@ describe('MyExpensesPage', () => { let storageService: jasmine.SpyObj; let corporateCreditCardService: jasmine.SpyObj; let orgUserSettingsService: jasmine.SpyObj; + let categoriesService: jasmine.SpyObj; let platformHandlerService: jasmine.SpyObj; let trackingService: jasmine.SpyObj; let modalController: jasmine.SpyObj; @@ -176,6 +184,7 @@ describe('MyExpensesPage', () => { 'deleteBulk', ]); const orgSettingsServiceSpy = jasmine.createSpyObj('OrgSettingsService', ['get']); + const categoriesServiceSpy = jasmine.createSpyObj('CategoriesService', ['getMileageOrPerDiemCategories']); const navControllerSpy = jasmine.createSpyObj('NavController', ['back']); const networkServiceSpy = jasmine.createSpyObj('NetworkService', ['isOnline', 'connectivityWatcher']); const activatedRouteSpy = { @@ -326,6 +335,10 @@ describe('MyExpensesPage', () => { provide: SnackbarPropertiesService, useValue: snackbarPropertiesSpy, }, + { + provide: CategoriesService, + useValue: categoriesServiceSpy, + }, ReportState, MaskNumber, ], @@ -344,6 +357,7 @@ describe('MyExpensesPage', () => { reportService = TestBed.inject(ReportService) as jasmine.SpyObj; tasksService = TestBed.inject(TasksService) as jasmine.SpyObj; orgSettingsService = TestBed.inject(OrgSettingsService) as jasmine.SpyObj; + categoriesService = TestBed.inject(CategoriesService) as jasmine.SpyObj; apiV2Service = TestBed.inject(ApiV2Service) as jasmine.SpyObj; transactionService = TestBed.inject(TransactionService) as jasmine.SpyObj; networkService = TestBed.inject(NetworkService) as jasmine.SpyObj; @@ -390,6 +404,7 @@ describe('MyExpensesPage', () => { platformHandlerService.registerBackButtonAction.and.returnValue(backButtonSubscription); orgUserSettingsService.get.and.returnValue(of(orgUserSettingsData)); orgSettingsService.get.and.returnValue(of(orgSettingsRes)); + categoriesService.getMileageOrPerDiemCategories.and.returnValue(of(mileagePerDiemPlatformCategoryData)); corporateCreditCardService.getAssignedCards.and.returnValue(of(expectedAssignedCCCStats)); spyOn(component, 'getCardDetail').and.returnValue(expectedUniqueCardStats); spyOn(component, 'syncOutboxExpenses'); @@ -549,7 +564,7 @@ describe('MyExpensesPage', () => { component.ionViewWillEnter(); tick(500); - expect(component.setupActionSheet).toHaveBeenCalledOnceWith(orgSettingsRes); + expect(component.setupActionSheet).toHaveBeenCalledOnceWith(orgSettingsRes, allowedExpenseTypes); })); it('should update cardNumbers by calling getCardDetail', fakeAsync(() => { @@ -1100,10 +1115,28 @@ describe('MyExpensesPage', () => { }); }); }); - it('setupActionSheet(): should update actionSheetButtons', () => { - spyOn(component, 'actionSheetButtonsHandler'); - component.setupActionSheet(orgSettingsRes); - expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonRes); + describe('setupActionSheet()', () => { + it('should update actionSheetButtons', () => { + spyOn(component, 'actionSheetButtonsHandler'); + component.setupActionSheet(orgSettingsRes, allowedExpenseTypes); + expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonRes); + }); + + it('should update actionSheetButtons without mileage', () => { + spyOn(component, 'actionSheetButtonsHandler'); + const mockAllowedExpenseTypes = clone(allowedExpenseTypes); + mockAllowedExpenseTypes.mileage = false; + component.setupActionSheet(orgSettingsRes, mockAllowedExpenseTypes); + expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonsWithPerDiem); + }); + + it('should update actionSheetButtons without Per Diem', () => { + spyOn(component, 'actionSheetButtonsHandler'); + const mockAllowedExpenseTypes = clone(allowedExpenseTypes); + mockAllowedExpenseTypes.perDiem = false; + component.setupActionSheet(orgSettingsRes, mockAllowedExpenseTypes); + expect(component.actionSheetButtons).toEqual(expectedActionSheetButtonsWithMileage); + }); }); describe('actionSheetButtonsHandler():', () => { diff --git a/src/app/fyle/my-expenses/my-expenses.page.ts b/src/app/fyle/my-expenses/my-expenses.page.ts index 40ba68f199..8eb53f3d9d 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.ts +++ b/src/app/fyle/my-expenses/my-expenses.page.ts @@ -76,6 +76,8 @@ import { UniqueCardStats } from 'src/app/core/models/unique-cards-stats.model'; import { FilterQueryParams } from 'src/app/core/models/filter-query-params.model'; import { SelectedFilters } from 'src/app/shared/components/fy-filters/selected-filters.interface'; import { UniqueCards } from 'src/app/core/models/unique-cards.model'; +import { CategoriesService } from 'src/app/core/services/categories.service'; +import { PlatformCategory } from 'src/app/core/models/platform/platform-category.model'; @Component({ selector: 'app-my-expenses', @@ -115,6 +117,10 @@ export class MyExpensesPage implements OnInit { isPerDiemEnabled$: Observable; + orgSettings$: Observable; + + specialCategories$: Observable; + pendingTransactions: Partial[] = []; selectionMode = false; @@ -208,6 +214,7 @@ export class MyExpensesPage implements OnInit { private currencyService: CurrencyService, private orgUserSettingsService: OrgUserSettingsService, private platformHandlerService: PlatformHandlerService, + private categoriesService: CategoriesService, private navController: NavController ) {} @@ -337,10 +344,10 @@ export class MyExpensesPage implements OnInit { }; } - setupActionSheet(orgSettings: OrgSettings): void { + setupActionSheet(orgSettings: OrgSettings, allowedExpenseTypes: Record): void { const that = this; - const mileageEnabled = orgSettings.mileage.enabled; - const isPerDiemEnabled = orgSettings.per_diem.enabled; + const mileageEnabled = orgSettings.mileage.enabled && allowedExpenseTypes.mileage; + const isPerDiemEnabled = orgSettings.per_diem.enabled && allowedExpenseTypes.perDiem; that.actionSheetButtons = [ { text: 'Capture Receipt', @@ -357,7 +364,7 @@ export class MyExpensesPage implements OnInit { ]; if (mileageEnabled) { - this.actionSheetButtons.push({ + that.actionSheetButtons.push({ text: 'Add Mileage', icon: 'assets/svg/fy-mileage.svg', cssClass: 'capture-receipt', @@ -428,14 +435,25 @@ export class MyExpensesPage implements OnInit { map((orgUserSettings) => orgUserSettings?.bulk_fyle_settings?.enabled) ); - const getOrgSettingsService$ = this.orgSettingsService.get().pipe(shareReplay(1)); + this.orgSettings$ = this.orgSettingsService.get().pipe(shareReplay(1)); + this.specialCategories$ = this.categoriesService.getMileageOrPerDiemCategories().pipe(shareReplay(1)); - this.isMileageEnabled$ = getOrgSettingsService$.pipe(map((orgSettings) => orgSettings?.mileage?.enabled)); - this.isPerDiemEnabled$ = getOrgSettingsService$.pipe(map((orgSettings) => orgSettings?.per_diem?.enabled)); + this.isMileageEnabled$ = this.orgSettings$.pipe(map((orgSettings) => orgSettings?.mileage?.enabled)); + this.isPerDiemEnabled$ = this.orgSettings$.pipe(map((orgSettings) => orgSettings?.per_diem?.enabled)); - getOrgSettingsService$.subscribe((orgSettings) => { + this.orgSettings$.subscribe((orgSettings) => { this.isNewReportsFlowEnabled = orgSettings?.simplified_report_closure_settings?.enabled || false; - this.setupActionSheet(orgSettings); + }); + + forkJoin({ + orgSettings: this.orgSettings$, + specialCategories: this.specialCategories$, + }).subscribe(({ orgSettings, specialCategories }) => { + const allowedExpenseTypes = { + mileage: specialCategories.some((category) => category.system_category === 'Mileage'), + perDiem: specialCategories.some((category) => category.system_category === 'Per Diem'), + }; + this.setupActionSheet(orgSettings, allowedExpenseTypes); }); forkJoin({ From d50f3f723fff0efb7edcb45e4ba98014340156a1 Mon Sep 17 00:00:00 2001 From: Shishira M S <31820553+shishirams222@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:04:36 +0530 Subject: [PATCH 02/14] FYLE-category-autofill-fix: updated condition for category autofill (#2459) --- src/app/core/mock-data/unflattened-expense.data.ts | 2 +- .../fyle/add-edit-expense/add-edit-expense-3.spec.ts | 2 +- .../fyle/add-edit-expense/add-edit-expense.page.ts | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/core/mock-data/unflattened-expense.data.ts b/src/app/core/mock-data/unflattened-expense.data.ts index e2f6ac018c..718ab60a66 100644 --- a/src/app/core/mock-data/unflattened-expense.data.ts +++ b/src/app/core/mock-data/unflattened-expense.data.ts @@ -554,7 +554,7 @@ export const draftUnflattendedTxn3 = { tx: { ...unflattenedExpData.tx, id: 'txCYDX0peUw5', - source: 'MOBILE', + source: 'WEBAPP_BULK', state: 'DRAFT', org_category_id: null, fyle_category: 'UNSPECIFIED', diff --git a/src/app/fyle/add-edit-expense/add-edit-expense-3.spec.ts b/src/app/fyle/add-edit-expense/add-edit-expense-3.spec.ts index 8067eb631f..8bd55c7d7e 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense-3.spec.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense-3.spec.ts @@ -368,7 +368,7 @@ export function TestCases3(getTestBed) { } }); - it('should get auto fill category for DRAFT expense', () => { + it('should get auto fill category for DRAFT expense added via webapp bulk upload or bulk instafyle', () => { const result = component.getAutofillCategory({ isAutofillsEnabled: true, recentValue: recentlyUsedRes, diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts index 2e9075f3cc..bab4ce4627 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts @@ -1927,13 +1927,18 @@ export class AddEditExpensePage implements OnInit { const isCategoryEmpty = !etxn.tx.org_category_id || etxn.tx.fyle_category?.toLowerCase() === 'unspecified'; /* - * Autofill should be applied iff: + * Autofill should be applied if: * - Autofilled is allowed and enabled for the user * - The user has some recently used categories present + * - isTxnEligibleForCategoryAutofill: * - The transaction category is empty or 'unspecified' - * - The user is on creating a new expense or editing a DRAFT expense + * - The user is on creating a new expense or editing a DRAFT expense that was created from bulk upload or bulk instafyle */ - if (doRecentOrgCategoryIdsExist && isCategoryEmpty && (!etxn.tx.id || etxn.tx.state === 'DRAFT')) { + const isNewExpense = !etxn.tx.id; + const canAutofillCategoryDuringEdit = + etxn.tx.state === 'DRAFT' && ['WEBAPP_BULK', 'MOBILE_DASHCAM_BULK'].includes(etxn.tx.source); + const isTxnEligibleForCategoryAutofill = isCategoryEmpty && (isNewExpense || canAutofillCategoryDuringEdit); + if (doRecentOrgCategoryIdsExist && isTxnEligibleForCategoryAutofill) { const autoFillCategory = recentCategories?.length && recentCategories[0]; if (autoFillCategory) { From 09e8d7cb85d8b36e5bf315244008dacc6f5c5f19 Mon Sep 17 00:00:00 2001 From: Omkar Joshi <65808188+OmkarJ13@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:07:56 +0530 Subject: [PATCH 03/14] feat: Remove unified card enrollment flow LD flag (#2473) --- .../card-stats/card-stats.component.spec.ts | 17 ++++------------ .../card-stats/card-stats.component.ts | 20 +++---------------- src/app/fyle/my-profile/my-profile.page.html | 4 +--- .../fyle/my-profile/my-profile.page.spec.ts | 9 --------- src/app/fyle/my-profile/my-profile.page.ts | 13 +----------- 5 files changed, 9 insertions(+), 54 deletions(-) diff --git a/src/app/fyle/dashboard/card-stats/card-stats.component.spec.ts b/src/app/fyle/dashboard/card-stats/card-stats.component.spec.ts index c3cf024360..0b2e489545 100644 --- a/src/app/fyle/dashboard/card-stats/card-stats.component.spec.ts +++ b/src/app/fyle/dashboard/card-stats/card-stats.component.spec.ts @@ -23,7 +23,6 @@ import { By } from '@angular/platform-browser'; import { cardDetailsRes } from 'src/app/core/mock-data/platform-corporate-card-detail-data'; import { AddCorporateCardComponent } from '../../manage-corporate-cards/add-corporate-card/add-corporate-card.component'; import { CardAddedComponent } from '../../manage-corporate-cards/card-added/card-added.component'; -import { LaunchDarklyService } from 'src/app/core/services/launch-darkly.service'; @Component({ selector: 'app-spent-cards', @@ -62,7 +61,6 @@ describe('CardStatsComponent', () => { let orgUserSettingsService: jasmine.SpyObj; let corporateCreditCardExpenseService: jasmine.SpyObj; let popoverController: jasmine.SpyObj; - let launchDarklyService: jasmine.SpyObj; beforeEach(waitForAsync(() => { const currencyServiceSpy = jasmine.createSpyObj('CurrencyService', ['getHomeCurrency']); @@ -76,7 +74,6 @@ describe('CardStatsComponent', () => { 'clearCache', ]); const popoverControllerSpy = jasmine.createSpyObj('PopoverController', ['create']); - const launchDarklyServiceSpy = jasmine.createSpyObj('LaunchDarklyService', ['getVariation']); TestBed.configureTestingModule({ declarations: [CardStatsComponent, MockSpentCardsComponent, MockAddCardComponent], @@ -110,10 +107,6 @@ describe('CardStatsComponent', () => { provide: PopoverController, useValue: popoverControllerSpy, }, - { - provide: LaunchDarklyService, - useValue: launchDarklyServiceSpy, - }, ], }).compileComponents(); @@ -126,10 +119,9 @@ describe('CardStatsComponent', () => { networkService = TestBed.inject(NetworkService) as jasmine.SpyObj; orgUserSettingsService = TestBed.inject(OrgUserSettingsService) as jasmine.SpyObj; corporateCreditCardExpenseService = TestBed.inject( - CorporateCreditCardExpenseService, + CorporateCreditCardExpenseService ) as jasmine.SpyObj; popoverController = TestBed.inject(PopoverController) as jasmine.SpyObj; - launchDarklyService = TestBed.inject(LaunchDarklyService) as jasmine.SpyObj; // Default return values currencyService.getHomeCurrency.and.returnValue(of('USD')); @@ -140,7 +132,6 @@ describe('CardStatsComponent', () => { corporateCreditCardExpenseService.getPlatformCorporateCardDetails.and.returnValue(cardDetails); networkService.isOnline.and.returnValue(of(true)); corporateCreditCardExpenseService.clearCache.and.returnValue(of(null)); - launchDarklyService.getVariation.and.returnValue(of(true)); spyOn(component.loadCardDetails$, 'next').and.callThrough(); @@ -192,7 +183,7 @@ describe('CardStatsComponent', () => { expect(corporateCreditCardExpenseService.getCorporateCards).toHaveBeenCalledTimes(1); expect(corporateCreditCardExpenseService.getPlatformCorporateCardDetails).toHaveBeenCalledOnceWith( cards, - cardStats.cardDetails, + cardStats.cardDetails ); }); @@ -245,7 +236,7 @@ describe('CardStatsComponent', () => { popoverController.create.and.returnValues( Promise.resolve(addCardPopoverSpy), - Promise.resolve(cardAddedPopoverSpy), + Promise.resolve(cardAddedPopoverSpy) ); corporateCreditCardExpenseService.getCorporateCards.and.returnValue(of([])); @@ -310,7 +301,7 @@ describe('CardStatsComponent', () => { popoverController.create.and.returnValues( Promise.resolve(addCardPopoverSpy), - Promise.resolve(cardAddedPopoverSpy), + Promise.resolve(cardAddedPopoverSpy) ); component.ngOnInit(); diff --git a/src/app/fyle/dashboard/card-stats/card-stats.component.ts b/src/app/fyle/dashboard/card-stats/card-stats.component.ts index 869edac23d..f3c038a776 100644 --- a/src/app/fyle/dashboard/card-stats/card-stats.component.ts +++ b/src/app/fyle/dashboard/card-stats/card-stats.component.ts @@ -12,7 +12,6 @@ import { AddCorporateCardComponent } from '../../manage-corporate-cards/add-corp import { OverlayResponse } from 'src/app/core/models/overlay-response.modal'; import { CardAddedComponent } from '../../manage-corporate-cards/card-added/card-added.component'; import { NetworkService } from 'src/app/core/services/network.service'; -import { LaunchDarklyService } from 'src/app/core/services/launch-darkly.service'; @Component({ selector: 'app-card-stats', @@ -47,8 +46,7 @@ export class CardStatsComponent implements OnInit { private networkService: NetworkService, private orgUserSettingsService: OrgUserSettingsService, private corporateCreditCardExpenseService: CorporateCreditCardExpenseService, - private popoverController: PopoverController, - private launchDarklyService: LaunchDarklyService + private popoverController: PopoverController ) {} ngOnInit(): void { @@ -98,20 +96,8 @@ export class CardStatsComponent implements OnInit { ) ); - const isUnifiedCardEnrollmentFlowEnabled$ = this.launchDarklyService.getVariation( - 'unified_card_enrollment_flow_enabled', - false - ); - - this.canAddCorporateCards$ = forkJoin([ - isUnifiedCardEnrollmentFlowEnabled$, - this.isVisaRTFEnabled$, - this.isMastercardRTFEnabled$, - ]).pipe( - map( - ([isUnifiedCardEnrollmentFlowEnabled, isVisaRTFEnabled, isMastercardRTFEnabled]) => - isUnifiedCardEnrollmentFlowEnabled && (isVisaRTFEnabled || isMastercardRTFEnabled) - ) + this.canAddCorporateCards$ = forkJoin([this.isVisaRTFEnabled$, this.isMastercardRTFEnabled$]).pipe( + map(([isVisaRTFEnabled, isMastercardRTFEnabled]) => isVisaRTFEnabled || isMastercardRTFEnabled) ); this.cardDetails$ = this.loadCardDetails$.pipe( diff --git a/src/app/fyle/my-profile/my-profile.page.html b/src/app/fyle/my-profile/my-profile.page.html index 343e04d9df..90edf33ba1 100644 --- a/src/app/fyle/my-profile/my-profile.page.html +++ b/src/app/fyle/my-profile/my-profile.page.html @@ -46,9 +46,7 @@ > - +
Corporate Cards
Manage Corporate Cards
diff --git a/src/app/fyle/my-profile/my-profile.page.spec.ts b/src/app/fyle/my-profile/my-profile.page.spec.ts index a4f8ceede1..c5a5f982b9 100644 --- a/src/app/fyle/my-profile/my-profile.page.spec.ts +++ b/src/app/fyle/my-profile/my-profile.page.spec.ts @@ -31,7 +31,6 @@ import { MyProfilePage } from './my-profile.page'; import { UpdateMobileNumberComponent } from './update-mobile-number/update-mobile-number.component'; import { VerifyNumberPopoverComponent } from './verify-number-popover/verify-number-popover.component'; import { orgData1 } from 'src/app/core/mock-data/org.data'; -import { LaunchDarklyService } from 'src/app/core/services/launch-darkly.service'; describe('MyProfilePage', () => { let component: MyProfilePage; @@ -52,7 +51,6 @@ describe('MyProfilePage', () => { let matSnackBar: jasmine.SpyObj; let snackbarProperties: jasmine.SpyObj; let activatedRoute: jasmine.SpyObj; - let launchDarklyService: jasmine.SpyObj; beforeEach(waitForAsync(() => { const authServiceSpy = jasmine.createSpyObj('AuthService', ['getEou', 'logout', 'refreshEou']); @@ -76,7 +74,6 @@ describe('MyProfilePage', () => { const popoverControllerSpy = jasmine.createSpyObj('PopoverController', ['create']); const matSnackBarSpy = jasmine.createSpyObj('MatSnackBar', ['openFromComponent']); const snackbarPropertiesSpy = jasmine.createSpyObj('SnackbarPropertiesService', ['setSnackbarProperties']); - const launchDarklyServiceSpy = jasmine.createSpyObj('LaunchDarklyService', ['getVariation']); TestBed.configureTestingModule({ declarations: [MyProfilePage], @@ -156,10 +153,6 @@ describe('MyProfilePage', () => { provide: SnackbarPropertiesService, useValue: snackbarPropertiesSpy, }, - { - provide: LaunchDarklyService, - useValue: launchDarklyServiceSpy, - }, ], }).compileComponents(); @@ -183,9 +176,7 @@ describe('MyProfilePage', () => { matSnackBar = TestBed.inject(MatSnackBar) as jasmine.SpyObj; snackbarProperties = TestBed.inject(SnackbarPropertiesService) as jasmine.SpyObj; activatedRoute = TestBed.inject(ActivatedRoute) as jasmine.SpyObj; - launchDarklyService = TestBed.inject(LaunchDarklyService) as jasmine.SpyObj; - launchDarklyService.getVariation.and.returnValue(of(true)); component.loadEou$ = new BehaviorSubject(null); component.eou$ = of(apiEouRes); diff --git a/src/app/fyle/my-profile/my-profile.page.ts b/src/app/fyle/my-profile/my-profile.page.ts index 41064721d5..863b17bc83 100644 --- a/src/app/fyle/my-profile/my-profile.page.ts +++ b/src/app/fyle/my-profile/my-profile.page.ts @@ -32,7 +32,6 @@ import { OverlayResponse } from 'src/app/core/models/overlay-response.modal'; import { EventData } from 'src/app/core/models/event-data.model'; import { PreferenceSetting } from 'src/app/core/models/preference-setting.model'; import { CopyCardDetails } from 'src/app/core/models/copy-card-details.model'; -import { LaunchDarklyService } from 'src/app/core/services/launch-darkly.service'; @Component({ selector: 'app-my-profile', @@ -74,10 +73,6 @@ export class MyProfilePage { isMastercardRTFEnabled: boolean; - isYodleeEnabled: boolean; - - isUnifiedCardEnrollmentFlowEnabled: boolean; - constructor( private authService: AuthService, private orgUserSettingsService: OrgUserSettingsService, @@ -94,8 +89,7 @@ export class MyProfilePage { private popoverController: PopoverController, private matSnackBar: MatSnackBar, private snackbarProperties: SnackbarPropertiesService, - private activatedRoute: ActivatedRoute, - private launchDarklyService: LaunchDarklyService + private activatedRoute: ActivatedRoute ) {} setupNetworkWatcher(): void { @@ -187,10 +181,6 @@ export class MyProfilePage { forkJoin({ orgUserSettings: orgUserSettings$, orgSettings: orgSettings$, - isUnifiedCardEnrollmentFlowEnabled: this.launchDarklyService.getVariation( - 'unified_card_enrollment_flow_enabled', - false - ), }) ), finalize(() => from(this.loaderService.hideLoader())) @@ -198,7 +188,6 @@ export class MyProfilePage { .subscribe(async (res) => { this.orgUserSettings = res.orgUserSettings; this.orgSettings = res.orgSettings; - this.isUnifiedCardEnrollmentFlowEnabled = res.isUnifiedCardEnrollmentFlowEnabled; this.setCCCFlags(); this.setPreferenceSettings(); From de1a71f8b2c6fd191bc3726a8a4d9469c5d1ecb9 Mon Sep 17 00:00:00 2001 From: Suyash Patil <127177049+suyashpatil78@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:31:14 +0530 Subject: [PATCH 04/14] test: 40% coverage of add-edit-adv-request pagee (#2467) * fix: lint issues in add edit adv request page * test: 12% coverage of add-edit-advance-request page * minor * test: 26% coverage of add edit adv request page * test: 40% coverage of add-edit-adv-request pagee * test: 58% coverage add-edit-adv-request page (#2476) * test: 45% coverage of add edit adv request * 58% coverage of page * minor * test: 70% coverage of add-edit-adv-req page (#2479) * test: 67% coverage of page * 70% coverage of page * minor * minor * test: 87% coverage of add-edit-adv-request page (#2481) * test: 87% coverage of add-edit-adv-request page * test: 98.45% coverage of add-edit-adv-request page (#2482) * test: 97% coverage * 98% coverage * pr fix * pr comments --- ...dd-edit-advance-request-form-value.data.ts | 6 + ...dvance-request-custom-field-values.data.ts | 40 ++ .../advance-requests-custom-fields.data.ts | 45 ++ .../core/mock-data/advance-requests.data.ts | 18 + src/app/core/mock-data/file-object.data.ts | 49 ++ src/app/core/mock-data/file.data.ts | 18 + .../core/mock-data/modal-controller.data.ts | 57 ++ .../unflattened-advance-request.data.ts | 74 +++ .../advance-request-delete-params.model.ts | 14 + .../add-edit-advance-request-1.page.spec.ts | 163 +++++- .../add-edit-advance-request-2.page.spec.ts | 489 ++++++++++++++++++ ...dd-edit-advance-request.page.setup.spec.ts | 15 +- .../add-edit-advance-request.page.ts | 57 +- 13 files changed, 1005 insertions(+), 40 deletions(-) create mode 100644 src/app/core/mock-data/advance-request-custom-field-values.data.ts create mode 100644 src/app/core/mock-data/unflattened-advance-request.data.ts create mode 100644 src/app/core/models/advance-request-delete-params.model.ts create mode 100644 src/app/fyle/add-edit-advance-request/add-edit-advance-request-2.page.spec.ts diff --git a/src/app/core/mock-data/add-edit-advance-request-form-value.data.ts b/src/app/core/mock-data/add-edit-advance-request-form-value.data.ts index ca16115f04..73c0f1b26a 100644 --- a/src/app/core/mock-data/add-edit-advance-request-form-value.data.ts +++ b/src/app/core/mock-data/add-edit-advance-request-form-value.data.ts @@ -1,4 +1,5 @@ import { AddEditAdvanceRequestFormValue } from '../models/add-edit-advance-request-form-value.model'; +import { recentlyUsedProjectRes } from './recently-used.data'; export const addEditAdvanceRequestFormValueData: AddEditAdvanceRequestFormValue = { currencyObj: { @@ -20,3 +21,8 @@ export const addEditAdvanceRequestFormValueData2: AddEditAdvanceRequestFormValue project: null, customFieldValues: [], }; + +export const addEditAdvanceRequestFormValueData3: AddEditAdvanceRequestFormValue = { + ...addEditAdvanceRequestFormValueData, + project: recentlyUsedProjectRes[0], +}; diff --git a/src/app/core/mock-data/advance-request-custom-field-values.data.ts b/src/app/core/mock-data/advance-request-custom-field-values.data.ts new file mode 100644 index 0000000000..5f117f659d --- /dev/null +++ b/src/app/core/mock-data/advance-request-custom-field-values.data.ts @@ -0,0 +1,40 @@ +import { AdvanceRequestCustomFieldValues } from '../models/advance-request-custom-field-values.model'; + +export const advanceRequestCustomFieldValuesData: AdvanceRequestCustomFieldValues[] = [ + { + id: 1302, + name: 'Phase', + value: 'Phase 1', + type: 'SELECT', + }, + { + id: 1305, + name: 'BILLABLE', + value: true, + type: 'BOOLEAN', + }, + { + id: 1304, + name: 'Arrival Date', + value: '2 Jan 2023', + type: 'DATE', + }, +]; + +export const advanceRequestCustomFieldValuesData2: AdvanceRequestCustomFieldValues[] = [ + { + id: 1302, + name: 'Phase', + value: 'Phase 1', + }, + { + id: 1304, + name: 'Arrival Date', + value: '2023-1-2', + }, + { + id: 1305, + name: 'BILLABLE', + value: true, + }, +]; diff --git a/src/app/core/mock-data/advance-requests-custom-fields.data.ts b/src/app/core/mock-data/advance-requests-custom-fields.data.ts index e052438c57..df6750db53 100644 --- a/src/app/core/mock-data/advance-requests-custom-fields.data.ts +++ b/src/app/core/mock-data/advance-requests-custom-fields.data.ts @@ -43,3 +43,48 @@ export const advanceRequestCustomFieldData: AdvanceRequestsCustomFields[] = [ placeholder: '123', }, ]; + +export const advanceRequestCustomFieldData2: AdvanceRequestsCustomFields[] = [ + { + id: 150, + org_id: 'orNVthTo2Zyo', + created_at: new Date('2022-10-30T23:07:03.385Z'), + updated_at: new Date('2022-10-30T23:07:03.385Z'), + type: 'BOOLEAN', + name: 'checking', + options: ['option1', 'option2'], + mandatory: false, + active: true, + added_by: 'ouX8dwsbLCLv', + last_updated_by: 'ouX8dwsbLCLv', + placeholder: null, + }, + { + id: 142, + org_id: 'orNVthTo2Zyo', + created_at: new Date('2022-11-04T02:14:37.292Z'), + updated_at: new Date('2022-11-04T02:14:37.292Z'), + type: 'BOOLEAN', + name: 'Okay?', + options: null, + mandatory: false, + active: true, + added_by: 'ouX8dwsbLCLv', + last_updated_by: 'ouX8dwsbLCLv', + placeholder: null, + }, + { + id: 144, + org_id: 'orNVthTo2Zyo', + created_at: new Date('2022-11-04T02:14:37.292Z'), + updated_at: new Date('2022-11-04T02:14:37.292Z'), + type: 'BOOLEAN', + name: 'Okay?', + options: null, + mandatory: false, + active: true, + added_by: 'ouX8dwsbLCLv', + last_updated_by: 'ouX8dwsbLCLv', + placeholder: null, + }, +]; diff --git a/src/app/core/mock-data/advance-requests.data.ts b/src/app/core/mock-data/advance-requests.data.ts index 7ffb1b9aa3..657c569950 100644 --- a/src/app/core/mock-data/advance-requests.data.ts +++ b/src/app/core/mock-data/advance-requests.data.ts @@ -379,3 +379,21 @@ export const checkPolicyAdvReqParam: AdvanceRequests = { is_sent_back: null, is_pulled_back: true, }; + +export const advanceRequests2: Partial = { + ...advanceRequests, + currency: 'USD', + amount: 130, + purpose: 'Test purpose', + project_id: 168826, + notes: 'Test notes', + source: 'MOBILE', + custom_field_values: null, +}; + +export const advanceRequests3: Partial = { + org_user_id: 'ouX8dwsbLCLv', + currency: 'GNF', + source: 'MOBILE', + created_at: new Date(), +}; diff --git a/src/app/core/mock-data/file-object.data.ts b/src/app/core/mock-data/file-object.data.ts index c99fc9c83f..8655f0fd8f 100644 --- a/src/app/core/mock-data/file-object.data.ts +++ b/src/app/core/mock-data/file-object.data.ts @@ -310,3 +310,52 @@ export const expectedFileData1 = [ thumbnail: 'thumbnail', }, ]; + +export const advanceRequestFileUrlData: FileObject[] = [ + { + ...fileObjectAdv1, + }, + { + ...fileObject7[0], + type: 'jpeg', + id: null, + }, +]; + +export const expectedFileData2: FileObject[] = [ + { + type: 'pdf', + url: '2023-02-08/orNVthTo2Zyo/receipts/fi6PQ6z4w6ET.000.pdf', + thumbnail: '2023-02-08/orNVthTo2Zyo/receipts/fi6PQ6z4w6ET.000.pdf', + }, +]; + +export const advanceRequestFileUrlData2: FileObject[] = [ + { + ...fileObjectAdv1, + id: null, + }, + { + ...fileObject7[0], + type: 'image', + id: null, + }, +]; + +export const fileObject9: FileObject[] = [ + { + id: 'fiV1gXpyCcbU', + org_user_id: 'ouX8dwsbLCLv', + created_at: new Date('2023-03-06T07:51:05.614Z'), + name: '000.jpeg', + s3url: '2023-03-06/orNVthTo2Zyo/receipts/fiV1gXpyCcbU.000.jpeg', + transaction_id: 'tx1vdITUXIzf', + invoice_id: null, + advance_request_id: null, + purpose: 'ORIGINAL', + password: null, + receipt_coordinates: null, + email_meta_data: null, + fyle_sub_url: '/api/files/fiV1gXpyCcbU/download', + }, +]; diff --git a/src/app/core/mock-data/file.data.ts b/src/app/core/mock-data/file.data.ts index 05fced21b7..0aad6c231e 100644 --- a/src/app/core/mock-data/file.data.ts +++ b/src/app/core/mock-data/file.data.ts @@ -35,3 +35,21 @@ export const fileData2: File[] = [ fyle_sub_url: '/api/files/fiK7c69UDJNb/download', }, ]; + +export const fileData3: File[] = [ + { + id: 'fiV1gXpyCcbU', + org_user_id: 'ouX8dwsbLCLv', + created_at: new Date('2023-03-06T07:51:05.614Z'), + name: '000.jpeg', + s3url: '2023-03-06/orNVthTo2Zyo/receipts/fiV1gXpyCcbU.000.jpeg', + transaction_id: 'tx1vdITUXIzf', + invoice_id: null, + advance_request_id: null, + purpose: 'ORIGINAL', + password: null, + receipt_coordinates: null, + email_meta_data: null, + fyle_sub_url: '/api/files/fiV1gXpyCcbU/download', + }, +]; diff --git a/src/app/core/mock-data/modal-controller.data.ts b/src/app/core/mock-data/modal-controller.data.ts index dde0e6dddd..a9b57276d1 100644 --- a/src/app/core/mock-data/modal-controller.data.ts +++ b/src/app/core/mock-data/modal-controller.data.ts @@ -15,6 +15,10 @@ import { reportOptionsData } from './report-options.data'; import { expectedErpt } from './report-unflattened.data'; import { FyInputPopoverComponent } from 'src/app/shared/components/fy-input-popover/fy-input-popover.component'; import { PolicyViolationDialogComponent } from 'src/app/fyle/add-edit-advance-request/policy-violation-dialog/policy-violation-dialog.component'; +import { CaptureReceiptComponent } from 'src/app/shared/components/capture-receipt/capture-receipt.component'; +import { FyViewAttachmentComponent } from 'src/app/shared/components/fy-view-attachment/fy-view-attachment.component'; +import { advanceRequestFileUrlData2 } from './file-object.data'; +import { ViewCommentComponent } from 'src/app/shared/components/comments-history/view-comment/view-comment.component'; export const modalControllerParams = { component: FyFiltersComponent, @@ -387,3 +391,56 @@ export const advanceRequestPolicyViolationParams = { breakpoints: [0, 1], handle: false, }; + +export const popoverControllerParams4 = { + component: PopupAlertComponent, + componentProps: { + title: 'Review', + message: + 'This action will save a draft advance request and will not be submitted to your approvers directly. You need to explicitly submit a draft advance request.', + primaryCta: { + text: 'Finish', + action: 'continue', + }, + secondaryCta: { + text: 'Cancel', + action: 'cancel', + }, + }, + cssClass: 'pop-up-in-center', +}; + +export const modalControllerParams3 = { + component: CaptureReceiptComponent, + componentProps: { + isModal: true, + allowGalleryUploads: false, + allowBulkFyle: false, + }, + cssClass: 'hide-modal', +}; + +export const modalControllerParams4 = { + component: FyViewAttachmentComponent, + componentProps: { + attachments: advanceRequestFileUrlData2, + canEdit: true, + }, + mode: 'ios' as Mode, +}; + +export const modalControllerParams5 = { + component: ViewCommentComponent, + componentProps: { + objectType: 'advance_requests', + objectId: 'areqR1cyLgXdND', + }, + cssClass: 'fy-modal', + showBackdrop: true, + canDismiss: true, + backdropDismiss: true, + animated: true, + initialBreakpoint: 1, + breakpoints: [0, 1], + handle: false, +}; diff --git a/src/app/core/mock-data/unflattened-advance-request.data.ts b/src/app/core/mock-data/unflattened-advance-request.data.ts new file mode 100644 index 0000000000..0d122dcef0 --- /dev/null +++ b/src/app/core/mock-data/unflattened-advance-request.data.ts @@ -0,0 +1,74 @@ +import { UnflattenedAdvanceRequest } from '../models/unflattened-advance-request.model'; + +export const unflattenedAdvanceRequestData: UnflattenedAdvanceRequest = { + areq: { + id: 'areqLFKMxUSAlQ', + created_at: new Date('2023-10-03T09:20:22.112Z'), + approved_at: null, + purpose: 'hello', + notes: 'fdv', + state: 'SUBMITTED', + currency: 'USD', + amount: 2, + org_user_id: 'ouuJzJYWcnzP', + advance_id: null, + policy_amount: null, + policy_flag: null, + policy_state: 'SUCCESS', + project_id: null, + custom_field_values: [ + { + id: 159, + name: 'Advance Request Place', + value: 'd', + type: null, + }, + { + id: 160, + name: 'Category', + value: 'Fyle is best', + type: null, + }, + ], + updated_at: new Date('2023-10-03T14:50:22.552Z'), + source: 'MOBILE', + advance_request_number: 'AR/2023/10/R/1', + updated_by: null, + is_sent_back: null, + is_pulled_back: null, + }, + ou: { + id: 'ouuJzJYWcnzP', + org_id: 'orNbIQloYtfa', + org_name: 'Advance-test', + employee_id: null, + location: null, + level: null, + business_unit: null, + department: null, + title: null, + mobile: null, + sub_department: null, + department_id: null, + }, + us: { + full_name: 'Suyash', + email: 'suyash.p@fyle.in', + name: 'Suyash', + }, + project: { + code: null, + name: null, + }, + advance: { + id: null, + }, + policy: { + amount: null, + flag: null, + state: 'SUCCESS', + }, + new: { + state: 'APPROVAL_PENDING', + }, +}; diff --git a/src/app/core/models/advance-request-delete-params.model.ts b/src/app/core/models/advance-request-delete-params.model.ts new file mode 100644 index 0000000000..54b3f4c2e2 --- /dev/null +++ b/src/app/core/models/advance-request-delete-params.model.ts @@ -0,0 +1,14 @@ +import { FyDeleteDialogComponent } from 'src/app/shared/components/fy-delete-dialog/fy-delete-dialog.component'; +import { AdvanceRequests } from './advance-requests.model'; +import { Observable } from 'rxjs'; + +export interface AdvanceRequestDeleteParams { + component: typeof FyDeleteDialogComponent; + cssClass: string; + backdropDismiss: boolean; + componentProps: { + header: string; + body: string; + deleteMethod: () => Observable; + }; +} diff --git a/src/app/fyle/add-edit-advance-request/add-edit-advance-request-1.page.spec.ts b/src/app/fyle/add-edit-advance-request/add-edit-advance-request-1.page.spec.ts index 550f231692..06fc992ab7 100644 --- a/src/app/fyle/add-edit-advance-request/add-edit-advance-request-1.page.spec.ts +++ b/src/app/fyle/add-edit-advance-request/add-edit-advance-request-1.page.spec.ts @@ -24,7 +24,7 @@ import { } from 'src/app/core/mock-data/add-edit-advance-request-form-value.data'; import { ActivatedRoute, Router } from '@angular/router'; import { expenseFieldsMapResponse } from 'src/app/core/mock-data/expense-fields-map.data'; -import { Observable, of } from 'rxjs'; +import { Observable, Subscription, of, throwError } from 'rxjs'; import { checkPolicyData } from 'src/app/core/mock-data/policy-violation-check.data'; import { advanceRequests } from 'src/app/core/mock-data/advance-requests.data'; import { advRequestFile } from 'src/app/core/mock-data/advance-request-file.data'; @@ -32,7 +32,10 @@ import { fileData1 } from 'src/app/core/mock-data/file.data'; import { PolicyViolationDialogComponent } from './policy-violation-dialog/policy-violation-dialog.component'; import { txnStatusData } from 'src/app/core/mock-data/transaction-status.data'; import { properties } from 'src/app/core/mock-data/modal-properties.data'; -import { advanceRequestPolicyViolationParams } from 'src/app/core/mock-data/modal-controller.data'; +import { + advanceRequestPolicyViolationParams, + popoverControllerParams4, +} from 'src/app/core/mock-data/modal-controller.data'; export function TestCases1(getTestBed) { return describe('test cases 1', () => { @@ -92,10 +95,31 @@ export function TestCases1(getTestBed) { activatedRoute = TestBed.inject(ActivatedRoute) as jasmine.SpyObj; }); + const policyViolationActionDescription = + 'The expense will be flagged, employee will be alerted, expense will be made unreportable and expense amount will be capped to the amount limit.'; + it('should create', () => { expect(component).toBeTruthy(); }); + it('should scroll input into view on keydown', () => { + const inputElement = document.createElement('input'); + spyOn(inputElement, 'scrollIntoView'); + spyOn(component, 'getActiveElement').and.returnValue(inputElement); + + component.scrollInputIntoView(); + + expect(inputElement.scrollIntoView).toHaveBeenCalledWith({ + block: 'center', + }); + }); + + it('getActiveElement(): should return active element in DOM', () => { + const result = component.getActiveElement(); + + expect(result).toEqual(document.activeElement); + }); + it('getFormValues(): should return form value', () => { component.fg = new FormBuilder().group({ ...addEditAdvanceRequestFormValueData }); @@ -241,8 +265,6 @@ export function TestCases1(getTestBed) { component.from = 'TEAM_ADVANCE'; const policyRules = ['rule1', 'rule2']; - const policyViolationActionDescription = - 'The expense will be flagged, employee will be alerted, expense will be made unreportable and expense amount will be capped to the amount limit.'; component.showPolicyModal(policyRules, policyViolationActionDescription, 'draft', advanceRequests); tick(200); @@ -274,8 +296,6 @@ export function TestCases1(getTestBed) { component.from = 'ADVANCE'; const policyRules = ['rule1', 'rule2']; - const policyViolationActionDescription = - 'The expense will be flagged, employee will be alerted, expense will be made unreportable and expense amount will be capped to the amount limit.'; component.showPolicyModal(policyRules, policyViolationActionDescription, 'submit', advanceRequests); tick(200); @@ -306,8 +326,6 @@ export function TestCases1(getTestBed) { modalController.create.and.resolveTo(policyViolationModalSpy); const policyRules = ['rule1', 'rule2']; - const policyViolationActionDescription = - 'The expense will be flagged, employee will be alerted, expense will be made unreportable and expense amount will be capped to the amount limit.'; component.showPolicyModal(policyRules, policyViolationActionDescription, 'draft', advanceRequests); tick(200); @@ -333,8 +351,6 @@ export function TestCases1(getTestBed) { modalController.create.and.resolveTo(policyViolationModalSpy); const policyRules = ['rule1', 'rule2']; - const policyViolationActionDescription = - 'The expense will be flagged, employee will be alerted, expense will be made unreportable and expense amount will be capped to the amount limit.'; component.showPolicyModal(policyRules, policyViolationActionDescription, 'submit', advanceRequests); tick(200); @@ -354,5 +370,132 @@ export function TestCases1(getTestBed) { expect(router.navigate).not.toHaveBeenCalled(); })); }); + + it('showFormValidationErrors(): should show form validation errors', () => { + expenseFieldsService.getAllMap.and.returnValue(of(expenseFieldsMapResponse)); + fixture.detectChanges(); + Object.defineProperty(component.fg, 'valid', { + get: () => false, + }); + spyOn(component.fg, 'markAllAsTouched'); + + component.showFormValidationErrors(); + expect(component.fg.markAllAsTouched).toHaveBeenCalledTimes(1); + }); + + describe('showAdvanceSummaryPopover():', () => { + beforeEach(() => { + expenseFieldsService.getAllMap.and.returnValue(of(expenseFieldsMapResponse)); + fixture.detectChanges(); + spyOn(component, 'save'); + spyOn(component, 'showFormValidationErrors'); + }); + + it('should show advance summary popover and call save method if form is valid', fakeAsync(() => { + Object.defineProperty(component.fg, 'valid', { + get: () => true, + }); + const advanceSummaryPopoverSpy = jasmine.createSpyObj('advanceSummaryPopover', ['present', 'onWillDismiss']); + advanceSummaryPopoverSpy.onWillDismiss.and.resolveTo({ data: { action: 'continue' } }); + popoverController.create.and.resolveTo(advanceSummaryPopoverSpy); + + component.showAdvanceSummaryPopover(); + tick(100); + + expect(popoverController.create).toHaveBeenCalledOnceWith(popoverControllerParams4); + expect(advanceSummaryPopoverSpy.present).toHaveBeenCalledTimes(1); + expect(advanceSummaryPopoverSpy.onWillDismiss).toHaveBeenCalledTimes(1); + expect(component.save).toHaveBeenCalledOnceWith('Draft'); + })); + + it('should call showFormValidationErrors if form is invalid', fakeAsync(() => { + Object.defineProperty(component.fg, 'valid', { + get: () => false, + }); + const advanceSummaryPopoverSpy = jasmine.createSpyObj('advanceSummaryPopover', ['present', 'onWillDismiss']); + advanceSummaryPopoverSpy.onWillDismiss.and.resolveTo({ data: { action: 'continue' } }); + popoverController.create.and.resolveTo(advanceSummaryPopoverSpy); + + component.showAdvanceSummaryPopover(); + tick(100); + + expect(popoverController.create).not.toHaveBeenCalled(); + expect(advanceSummaryPopoverSpy.present).not.toHaveBeenCalled(); + expect(advanceSummaryPopoverSpy.onWillDismiss).not.toHaveBeenCalled(); + expect(component.save).not.toHaveBeenCalled(); + expect(component.showFormValidationErrors).toHaveBeenCalledTimes(1); + })); + }); + + describe('save():', () => { + beforeEach(() => { + spyOn(component, 'generateAdvanceRequestFromFg').and.returnValue(of(advanceRequests)); + spyOn(component, 'checkPolicyViolation').and.returnValue(of(checkPolicyData)); + advanceRequestPolicyService.getPolicyRules.and.returnValue(['rule1', 'rule2']); + spyOn(component, 'showPolicyModal').and.resolveTo(new Subscription()); + spyOn(component, 'saveAndSubmit').and.returnValue(of(advRequestFile)); + component.fg = new FormBuilder().group({}); + }); + + it('should call showPolicyModal if user has come from team advances page, policy rules are present and form is valid', () => { + Object.defineProperty(component.fg, 'valid', { + get: () => true, + }); + component.extendedAdvanceRequest$ = of(advanceRequests); + component.from = 'TEAM_ADVANCE'; + component.save('Draft'); + expect(component.generateAdvanceRequestFromFg).toHaveBeenCalledOnceWith(component.extendedAdvanceRequest$); + expect(component.checkPolicyViolation).toHaveBeenCalledOnceWith(advanceRequests); + expect(advanceRequestPolicyService.getPolicyRules).toHaveBeenCalledOnceWith(checkPolicyData); + expect(component.showPolicyModal).toHaveBeenCalledOnceWith(['rule1', 'rule2'], null, 'draft', advanceRequests); + expect(router.navigate).not.toHaveBeenCalled(); + }); + + it('should navigate to team_advance page if user has come from team advance page, policy rules are not present and form is valid', () => { + Object.defineProperty(component.fg, 'valid', { + get: () => true, + }); + advanceRequestPolicyService.getPolicyRules.and.returnValue([]); + component.extendedAdvanceRequest$ = of(advanceRequests); + component.from = 'TEAM_ADVANCE'; + component.save('Draft'); + expect(component.generateAdvanceRequestFromFg).toHaveBeenCalledOnceWith(component.extendedAdvanceRequest$); + expect(component.checkPolicyViolation).toHaveBeenCalledOnceWith(advanceRequests); + expect(advanceRequestPolicyService.getPolicyRules).toHaveBeenCalledOnceWith(checkPolicyData); + expect(component.showPolicyModal).not.toHaveBeenCalled(); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'team_advance']); + expect(component.saveDraftAdvanceLoading).toBeFalse(); + }); + + it('should navigate to my_advances page if user has come from my advances page, policy rules are not present and form is valid', () => { + Object.defineProperty(component.fg, 'valid', { + get: () => true, + }); + advanceRequestPolicyService.getPolicyRules.and.returnValue([]); + component.extendedAdvanceRequest$ = of(advanceRequests); + component.from = 'ADVANCE'; + component.save('Submit'); + expect(component.generateAdvanceRequestFromFg).toHaveBeenCalledOnceWith(component.extendedAdvanceRequest$); + expect(component.checkPolicyViolation).toHaveBeenCalledOnceWith(advanceRequests); + expect(advanceRequestPolicyService.getPolicyRules).toHaveBeenCalledOnceWith(checkPolicyData); + expect(component.showPolicyModal).not.toHaveBeenCalled(); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'my_advances']); + expect(component.saveAdvanceLoading).toBeFalse(); + }); + + it('should call showFormValidationErrors if form is invalid', () => { + Object.defineProperty(component.fg, 'valid', { + get: () => false, + }); + spyOn(component, 'showFormValidationErrors'); + component.save('Draft'); + expect(component.generateAdvanceRequestFromFg).not.toHaveBeenCalled(); + expect(component.checkPolicyViolation).not.toHaveBeenCalled(); + expect(advanceRequestPolicyService.getPolicyRules).not.toHaveBeenCalled(); + expect(component.showPolicyModal).not.toHaveBeenCalled(); + expect(router.navigate).not.toHaveBeenCalled(); + expect(component.showFormValidationErrors).toHaveBeenCalledTimes(1); + }); + }); }); } diff --git a/src/app/fyle/add-edit-advance-request/add-edit-advance-request-2.page.spec.ts b/src/app/fyle/add-edit-advance-request/add-edit-advance-request-2.page.spec.ts new file mode 100644 index 0000000000..c06c0f412c --- /dev/null +++ b/src/app/fyle/add-edit-advance-request/add-edit-advance-request-2.page.spec.ts @@ -0,0 +1,489 @@ +import { ModalController, PopoverController } from '@ionic/angular'; +import { AdvanceRequestPolicyService } from 'src/app/core/services/advance-request-policy.service'; +import { AdvanceRequestService } from 'src/app/core/services/advance-request.service'; +import { AdvanceRequestsCustomFieldsService } from 'src/app/core/services/advance-requests-custom-fields.service'; +import { AuthService } from 'src/app/core/services/auth.service'; +import { CurrencyService } from 'src/app/core/services/currency.service'; +import { ExpenseFieldsService } from 'src/app/core/services/expense-fields.service'; +import { FileService } from 'src/app/core/services/file.service'; +import { LoaderService } from 'src/app/core/services/loader.service'; +import { ModalPropertiesService } from 'src/app/core/services/modal-properties.service'; +import { NetworkService } from 'src/app/core/services/network.service'; +import { OrgSettingsService } from 'src/app/core/services/org-settings.service'; +import { OrgUserSettingsService } from 'src/app/core/services/org-user-settings.service'; +import { ProjectsService } from 'src/app/core/services/projects.service'; +import { StatusService } from 'src/app/core/services/status.service'; +import { TrackingService } from 'src/app/core/services/tracking.service'; +import { TransactionsOutboxService } from 'src/app/core/services/transactions-outbox.service'; +import { AddEditAdvanceRequestPage } from './add-edit-advance-request.page'; +import { ComponentFixture, discardPeriodicTasks, fakeAsync, tick } from '@angular/core/testing'; +import { FormBuilder, FormControl } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; +import { clone, cloneDeep } from 'lodash'; +import { advanceRequests, advanceRequests2, advanceRequests3 } from 'src/app/core/mock-data/advance-requests.data'; +import { + addEditAdvanceRequestFormValueData, + addEditAdvanceRequestFormValueData3, +} from 'src/app/core/mock-data/add-edit-advance-request-form-value.data'; +import { of } from 'rxjs'; +import { + advanceRequestCustomFieldValuesData, + advanceRequestCustomFieldValuesData2, +} from 'src/app/core/mock-data/advance-request-custom-field-values.data'; +import { + advanceRequestFileUrlData, + advanceRequestFileUrlData2, + expectedFileData2, + fileObject4, + fileObject9, +} from 'src/app/core/mock-data/file-object.data'; +import { fileData3 } from 'src/app/core/mock-data/file.data'; +import { CameraOptionsPopupComponent } from './camera-options-popup/camera-options-popup.component'; +import { CaptureReceiptComponent } from 'src/app/shared/components/capture-receipt/capture-receipt.component'; +import { + modalControllerParams3, + modalControllerParams4, + modalControllerParams5, +} from 'src/app/core/mock-data/modal-controller.data'; +import { properties } from 'src/app/core/mock-data/modal-properties.data'; +import { apiEouRes } from 'src/app/core/mock-data/extended-org-user.data'; +import { orgSettingsRes } from 'src/app/core/mock-data/org-settings.data'; +import { orgUserSettingsData } from 'src/app/core/mock-data/org-user-settings.data'; +import { expenseFieldsMapResponse } from 'src/app/core/mock-data/expense-fields-map.data'; +import { apiAdvanceRequestAction } from 'src/app/core/mock-data/advance-request-actions.data'; +import { unflattenedAdvanceRequestData } from 'src/app/core/mock-data/unflattened-advance-request.data'; +import { projects } from 'src/app/core/mock-data/extended-projects.data'; +import { projectsV1Data } from 'src/app/core/test-data/projects.spec.data'; +import { + advanceRequestCustomFieldData, + advanceRequestCustomFieldData2, +} from 'src/app/core/mock-data/advance-requests-custom-fields.data'; +import { EventEmitter } from '@angular/core'; +import { FyDeleteDialogComponent } from 'src/app/shared/components/fy-delete-dialog/fy-delete-dialog.component'; + +export function TestCases2(getTestBed) { + return describe('test cases 2', () => { + let component: AddEditAdvanceRequestPage; + let fixture: ComponentFixture; + let authService: jasmine.SpyObj; + let advanceRequestsCustomFieldsService: jasmine.SpyObj; + let advanceRequestService: jasmine.SpyObj; + let advanceRequestPolicyService: jasmine.SpyObj; + let modalController: jasmine.SpyObj; + let statusService: jasmine.SpyObj; + let loaderService: jasmine.SpyObj; + let projectsService: jasmine.SpyObj; + let popoverController: jasmine.SpyObj; + let transactionsOutboxService: jasmine.SpyObj; + let fileService: jasmine.SpyObj; + let orgSettingsService: jasmine.SpyObj; + let networkService: jasmine.SpyObj; + let modalProperties: jasmine.SpyObj; + let trackingService: jasmine.SpyObj; + let expenseFieldsService: jasmine.SpyObj; + let currencyService: jasmine.SpyObj; + let orgUserSettingsService: jasmine.SpyObj; + let router: jasmine.SpyObj; + let activatedRoute: jasmine.SpyObj; + + beforeEach(() => { + const TestBed = getTestBed(); + fixture = TestBed.createComponent(AddEditAdvanceRequestPage); + component = fixture.componentInstance; + + authService = TestBed.inject(AuthService) as jasmine.SpyObj; + advanceRequestsCustomFieldsService = TestBed.inject( + AdvanceRequestsCustomFieldsService + ) as jasmine.SpyObj; + advanceRequestService = TestBed.inject(AdvanceRequestService) as jasmine.SpyObj; + advanceRequestPolicyService = TestBed.inject( + AdvanceRequestPolicyService + ) as jasmine.SpyObj; + modalController = TestBed.inject(ModalController) as jasmine.SpyObj; + statusService = TestBed.inject(StatusService) as jasmine.SpyObj; + loaderService = TestBed.inject(LoaderService) as jasmine.SpyObj; + projectsService = TestBed.inject(ProjectsService) as jasmine.SpyObj; + popoverController = TestBed.inject(PopoverController) as jasmine.SpyObj; + transactionsOutboxService = TestBed.inject( + TransactionsOutboxService + ) as jasmine.SpyObj; + fileService = TestBed.inject(FileService) as jasmine.SpyObj; + orgSettingsService = TestBed.inject(OrgSettingsService) as jasmine.SpyObj; + networkService = TestBed.inject(NetworkService) as jasmine.SpyObj; + modalProperties = TestBed.inject(ModalPropertiesService) as jasmine.SpyObj; + trackingService = TestBed.inject(TrackingService) as jasmine.SpyObj; + expenseFieldsService = TestBed.inject(ExpenseFieldsService) as jasmine.SpyObj; + currencyService = TestBed.inject(CurrencyService) as jasmine.SpyObj; + orgUserSettingsService = TestBed.inject(OrgUserSettingsService) as jasmine.SpyObj; + router = TestBed.inject(Router) as jasmine.SpyObj; + activatedRoute = TestBed.inject(ActivatedRoute) as jasmine.SpyObj; + }); + + const policyViolationActionDescription = + 'The expense will be flagged, employee will be alerted, expense will be made unreportable and expense amount will be capped to the amount limit.'; + + it('generateAdvanceRequestFromFg(): should generate advance request from form', () => { + const mockAdvanceRequest = cloneDeep(advanceRequests); + component.fg = new FormBuilder().group(addEditAdvanceRequestFormValueData3); + component.generateAdvanceRequestFromFg(of(mockAdvanceRequest)).subscribe((res) => { + expect(res).toEqual(advanceRequests2); + }); + }); + + it('modifyAdvanceRequestCustomFields(): should sort the values and update the customFieldValues date to YYYY-M-D format if it contains date', () => { + const mockCustomField = cloneDeep(advanceRequestCustomFieldValuesData); + const result = component.modifyAdvanceRequestCustomFields(mockCustomField); + expect(result).toEqual(advanceRequestCustomFieldValuesData2); + expect(component.customFieldValues).toEqual(advanceRequestCustomFieldValuesData2); + }); + + it('fileAttachments(): should return file attachments if ids are absent in fileObject', (done) => { + transactionsOutboxService.fileUpload.and.resolveTo(cloneDeep(fileObject9[0])); + const mockFileObjects = cloneDeep(advanceRequestFileUrlData); + component.dataUrls = mockFileObjects; + component.fileAttachments().subscribe((res) => { + expect(transactionsOutboxService.fileUpload).toHaveBeenCalledOnceWith(undefined, 'image'); + expect(res).toEqual(fileData3); + done(); + }); + }); + + it('addAttachments(): should open camera option popup and add receipt details', fakeAsync(() => { + component.dataUrls = []; + fileService.getImageTypeFromDataUrl.and.returnValue('pdf'); + + const cameraOptionsPopupSpy = jasmine.createSpyObj('cameraOptionsPopup', ['present', 'onWillDismiss']); + cameraOptionsPopupSpy.onWillDismiss.and.resolveTo({ + data: { dataUrl: '2023-02-08/orNVthTo2Zyo/receipts/fi6PQ6z4w6ET.000.pdf', type: 'pdf', option: 'camera' }, + }); + popoverController.create.and.resolveTo(cameraOptionsPopupSpy); + + const captureReceiptModalSpy = jasmine.createSpyObj('captureReceiptModal', ['present', 'onWillDismiss']); + captureReceiptModalSpy.onWillDismiss.and.resolveTo({ + data: { dataUrl: '2023-02-08/orNVthTo2Zyo/receipts/fi6PQ6z4w6ET.000.pdf' }, + }); + modalController.create.and.resolveTo(captureReceiptModalSpy); + + const event = jasmine.createSpyObj('event', ['stopPropagation', 'preventDefault']); + component.addAttachments(event); + tick(100); + + expect(event.stopPropagation).toHaveBeenCalledTimes(1); + expect(event.preventDefault).toHaveBeenCalledTimes(1); + expect(popoverController.create).toHaveBeenCalledOnceWith({ + component: CameraOptionsPopupComponent, + cssClass: 'camera-options-popover', + }); + expect(cameraOptionsPopupSpy.present).toHaveBeenCalledTimes(1); + expect(cameraOptionsPopupSpy.onWillDismiss).toHaveBeenCalledTimes(1); + expect(modalController.create).toHaveBeenCalledOnceWith(modalControllerParams3); + expect(captureReceiptModalSpy.present).toHaveBeenCalledTimes(1); + expect(captureReceiptModalSpy.onWillDismiss).toHaveBeenCalledTimes(1); + expect(fileService.getImageTypeFromDataUrl).toHaveBeenCalledOnceWith( + '2023-02-08/orNVthTo2Zyo/receipts/fi6PQ6z4w6ET.000.pdf' + ); + expect(component.dataUrls).toEqual(expectedFileData2); + })); + + it('viewAttachments(): should show the attachments as preview', fakeAsync(() => { + component.dataUrls = cloneDeep(advanceRequestFileUrlData2); + const attachmentModalSpy = jasmine.createSpyObj('attachmentsModal', ['present', 'onWillDismiss']); + attachmentModalSpy.onWillDismiss.and.resolveTo({ data: { attachments: expectedFileData2 } }); + modalController.create.and.resolveTo(attachmentModalSpy); + + component.viewAttachments(); + tick(100); + expect(modalController.create).toHaveBeenCalledOnceWith(modalControllerParams4); + expect(attachmentModalSpy.present).toHaveBeenCalledTimes(1); + expect(attachmentModalSpy.onWillDismiss).toHaveBeenCalledTimes(1); + expect(component.dataUrls).toEqual(expectedFileData2); + })); + + it('getReceiptExtension(): should return the extension of the receipt', () => { + const mockFileObject = cloneDeep(advanceRequestFileUrlData2[0]); + const result = component.getReceiptExtension(mockFileObject.name); + expect(result).toEqual('pdf'); + }); + + describe('getReceiptDetails():', () => { + it('should return the receipt details with thumbnail as fy-receipt.svg if extension is pdf', () => { + spyOn(component, 'getReceiptExtension').and.returnValue('pdf'); + const mockFileObject = cloneDeep(advanceRequestFileUrlData2[0]); + const result = component.getReceiptDetails(mockFileObject); + expect(component.getReceiptExtension).toHaveBeenCalledOnceWith(mockFileObject.name); + expect(result).toEqual({ + type: 'pdf', + thumbnail: 'img/fy-pdf.svg', + }); + }); + + it('should return the receipt details with type as image and thumbnail as file url if extension is png', () => { + spyOn(component, 'getReceiptExtension').and.returnValue('png'); + const mockFileObject = cloneDeep(advanceRequestFileUrlData2[0]); + const result = component.getReceiptDetails(mockFileObject); + expect(component.getReceiptExtension).toHaveBeenCalledOnceWith(mockFileObject.name); + expect(result).toEqual({ + type: 'image', + thumbnail: + 'https://fyle-storage-mumbai-3.s3.amazonaws.com/2023-02-23/orrjqbDbeP9p/receipts/fiSSsy2Bf4Se.000.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Date=20230223T151537Z&X-Amz-SignedHeaders=host&X-Amz-Expires=604800&X-Amz-Credential=AKIA54Z3LIXTX6CFH4VG%2F20230223%2Fap-south-1%2Fs3%2Faws4_request&X-Amz-Signature=d79c2711892e7cb3f072e223b7b416408c252da38e7df0995e3d256cd8509fee', + }); + }); + }); + + it('getAttachedReceipts(): should return all the attached receipts corresponding to an advance request', () => { + const mockFileObject = cloneDeep(advanceRequestFileUrlData[0]); + spyOn(component, 'getReceiptDetails').and.returnValue({ + type: 'pdf', + thumbnail: 'img/fy-pdf.svg', + }); + fileService.downloadUrl.and.returnValue(of('mockdownloadurl.png')); + fileService.findByAdvanceRequestId.and.returnValue(of([mockFileObject])); + component.dataUrls = [mockFileObject]; + component.getAttachedReceipts('areqR1cyLgXdND').subscribe((res) => { + expect(component.getReceiptDetails).toHaveBeenCalledOnceWith(mockFileObject); + expect(fileService.downloadUrl).toHaveBeenCalledOnceWith('fiSSsy2Bf4Se'); + expect(fileService.findByAdvanceRequestId).toHaveBeenCalledOnceWith('areqR1cyLgXdND'); + expect(res).toEqual([ + { + ...mockFileObject, + type: 'pdf', + thumbnail: 'img/fy-pdf.svg', + url: 'mockdownloadurl.png', + }, + ]); + }); + }); + + describe('openCommentsModal():', () => { + let viewCommentModalSpy: jasmine.SpyObj; + beforeEach(() => { + viewCommentModalSpy = jasmine.createSpyObj('modal', ['present', 'onDidDismiss']); + viewCommentModalSpy.onDidDismiss.and.resolveTo({ data: { updated: true } }); + modalController.create.and.resolveTo(viewCommentModalSpy); + component.id = 'areqR1cyLgXdND'; + modalProperties.getModalDefaultProperties.and.returnValue(properties); + }); + + it('openCommentsModal(): should open the comments modal and call track addComment method if updated is true', fakeAsync(() => { + component.openCommentsModal(); + tick(100); + expect(modalController.create).toHaveBeenCalledOnceWith(modalControllerParams5); + expect(viewCommentModalSpy.present).toHaveBeenCalledTimes(1); + expect(viewCommentModalSpy.onDidDismiss).toHaveBeenCalledTimes(1); + expect(modalProperties.getModalDefaultProperties).toHaveBeenCalledTimes(1); + expect(trackingService.addComment).toHaveBeenCalledTimes(1); + })); + + it('openCommentsModal(): should open the comments modal and call track viewComment method if updated is false', fakeAsync(() => { + viewCommentModalSpy.onDidDismiss.and.resolveTo({ data: { updated: false } }); + modalController.create.and.resolveTo(viewCommentModalSpy); + + component.openCommentsModal(); + tick(100); + expect(modalController.create).toHaveBeenCalledOnceWith(modalControllerParams5); + expect(viewCommentModalSpy.present).toHaveBeenCalledTimes(1); + expect(viewCommentModalSpy.onDidDismiss).toHaveBeenCalledTimes(1); + expect(modalProperties.getModalDefaultProperties).toHaveBeenCalledTimes(1); + expect(trackingService.viewComment).toHaveBeenCalledTimes(1); + })); + }); + + it('getAdvanceRequestDeleteParams(): should return the advance request delete params and deleteMethod should call advanceRequestService.delete', () => { + const props = component.getAdvanceRequestDeleteParams(); + props.componentProps.deleteMethod(); + expect(advanceRequestService.delete).toHaveBeenCalledOnceWith('areqR1cyLgXdND'); + expect(props).toEqual({ + component: FyDeleteDialogComponent, + cssClass: 'delete-dialog', + backdropDismiss: false, + componentProps: { + header: 'Delete Advance Request', + body: 'Are you sure you want to delete this request?', + deleteMethod: jasmine.any(Function), + }, + }); + }); + + it('delete(): should show popover and remove delete advance request', fakeAsync(() => { + spyOn(component, 'getAdvanceRequestDeleteParams'); + const deletePopoverSpy = jasmine.createSpyObj('deletePopover', ['present', 'onDidDismiss']); + deletePopoverSpy.onDidDismiss.and.resolveTo({ data: { status: 'success' } }); + popoverController.create.and.resolveTo(deletePopoverSpy); + advanceRequestService.delete.and.resolveTo(); + component.id = 'areqR1cyLgXdND'; + component.delete(); + tick(100); + expect(popoverController.create).toHaveBeenCalledOnceWith(component.getAdvanceRequestDeleteParams()); + expect(deletePopoverSpy.present).toHaveBeenCalledTimes(1); + expect(deletePopoverSpy.onDidDismiss).toHaveBeenCalledTimes(1); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'my_advances']); + })); + + describe('ionViewWillEnter():', () => { + beforeEach(() => { + expenseFieldsService.getAllMap.and.returnValue(of(expenseFieldsMapResponse)); + authService.getEou.and.resolveTo(apiEouRes); + orgSettingsService.get.and.returnValue(of(orgSettingsRes)); + orgUserSettingsService.get.and.returnValue(of(orgUserSettingsData)); + currencyService.getHomeCurrency.and.returnValue(of('USD')); + advanceRequestService.getActions.and.returnValue(of(apiAdvanceRequestAction)); + loaderService.showLoader.and.resolveTo(undefined); + loaderService.hideLoader.and.resolveTo(undefined); + advanceRequestService.getEReq.and.returnValue(of(unflattenedAdvanceRequestData)); + projectsService.getbyId.and.returnValue(of(projects[0])); + spyOn(component, 'modifyAdvanceRequestCustomFields'); + spyOn(component, 'getAttachedReceipts').and.returnValue(of(fileObject4)); + projectsService.getAllActive.and.returnValue(of(projectsV1Data)); + const mockCustomField = cloneDeep(advanceRequestCustomFieldData); + advanceRequestsCustomFieldsService.getAll.and.returnValue(of(mockCustomField)); + spyOn(component, 'setupNetworkWatcher'); + }); + + it('should set mode, homeCurrency$ and actions$ correctly', fakeAsync(() => { + component.ionViewWillEnter(); + tick(100); + expect(component.mode).toEqual('edit'); + component.homeCurrency$.subscribe((res) => { + expect(currencyService.getHomeCurrency).toHaveBeenCalledTimes(1); + expect(res).toEqual('USD'); + }); + component.actions$.subscribe((res) => { + expect(advanceRequestService.getActions).toHaveBeenCalledOnceWith('areqR1cyLgXdND'); + expect(component.advanceActions).toEqual(apiAdvanceRequestAction); + expect(res).toEqual(apiAdvanceRequestAction); + }); + })); + + it('should set mode to add if id is not defined', fakeAsync(() => { + activatedRoute.snapshot.params = { + id: undefined, + }; + component.ionViewWillEnter(); + tick(100); + expect(component.mode).toEqual('add'); + component.homeCurrency$.subscribe((res) => { + expect(currencyService.getHomeCurrency).toHaveBeenCalledTimes(1); + expect(res).toEqual('USD'); + }); + expect(component.actions$).toBeUndefined(); + })); + + it('should get new advance request observable if mode is add', fakeAsync(() => { + activatedRoute.snapshot.params = { + id: undefined, + }; + component.ionViewWillEnter(); + tick(100); + + component.extendedAdvanceRequest$.subscribe((res) => { + expect(orgSettingsService.get).toHaveBeenCalledTimes(1); + expect(authService.getEou).toHaveBeenCalledTimes(1); + expect(res).toEqual({ ...advanceRequests3, created_at: new Date() }); + }); + })); + + it('should get new advance request observable if mode is add with currency equal to homeCurrency if no preferred_currency is selected', fakeAsync(() => { + const mockOrgUserData = cloneDeep(orgUserSettingsData); + mockOrgUserData.currency_settings.preferred_currency = null; + orgUserSettingsService.get.and.returnValue(of(mockOrgUserData)); + activatedRoute.snapshot.params = { + id: undefined, + }; + component.ionViewWillEnter(); + tick(100); + + component.extendedAdvanceRequest$.subscribe((res) => { + expect(orgSettingsService.get).toHaveBeenCalledTimes(1); + expect(authService.getEou).toHaveBeenCalledTimes(1); + expect(res).toEqual({ ...advanceRequests3, created_at: new Date(), currency: 'USD' }); + }); + })); + + it('should get edit advance request observable if mode is edit', fakeAsync(() => { + activatedRoute.snapshot.params = { + id: 'areqR1cyLgXdND', + }; + const mockAdvanceRequest = cloneDeep(unflattenedAdvanceRequestData); + mockAdvanceRequest.areq.project_id = '3019'; + advanceRequestService.getEReq.and.returnValue(of(mockAdvanceRequest)); + fixture.detectChanges(); + component.ionViewWillEnter(); + tick(100); + component.extendedAdvanceRequest$.subscribe((res) => { + expect(loaderService.showLoader).toHaveBeenCalledTimes(1); + expect(advanceRequestService.getEReq).toHaveBeenCalledOnceWith('areqR1cyLgXdND'); + expect(component.fg.value.currencyObj).toEqual({ + currency: 'USD', + amount: 2, + }); + expect(projectsService.getbyId).toHaveBeenCalledOnceWith('3019'); + expect(component.fg.value.project).toEqual(projects[0]); + expect(component.modifyAdvanceRequestCustomFields).toHaveBeenCalledOnceWith( + mockAdvanceRequest.areq.custom_field_values + ); + expect(component.getAttachedReceipts).toHaveBeenCalledOnceWith('areqR1cyLgXdND'); + expect(component.dataUrls).toEqual(fileObject4); + expect(res).toEqual(mockAdvanceRequest.areq); + }); + })); + + it('should set isProjectsEnabled$, projects$ and isProjectsVisible$ correctly', fakeAsync(() => { + component.ionViewWillEnter(); + tick(100); + component.isProjectsEnabled$.subscribe((res) => { + expect(res).toBeTrue(); + }); + component.projects$.subscribe((res) => { + expect(projectsService.getAllActive).toHaveBeenCalledTimes(1); + expect(res).toEqual(projectsV1Data); + }); + component.isProjectsVisible$.subscribe((res) => { + expect(orgSettingsService.get).toHaveBeenCalledTimes(1); + expect(res).toBeTrue(); + }); + })); + + it('should set isProjectsEnabled$ to false if project_ids are undefined in org user settings data', fakeAsync(() => { + const mockOrgSettingsData = cloneDeep(orgSettingsRes); + mockOrgSettingsData.advanced_projects.enable_individual_projects = true; + orgSettingsService.get.and.returnValue(of(mockOrgSettingsData)); + const mockOrgUserSettingsData = cloneDeep(orgUserSettingsData); + mockOrgUserSettingsData.project_ids = undefined; + orgUserSettingsService.get.and.returnValue(of(mockOrgUserSettingsData)); + component.ionViewWillEnter(); + tick(100); + component.isProjectsVisible$.subscribe((res) => { + expect(res).toBeFalse(); + }); + })); + + it('should set customFields$ correctly', fakeAsync(() => { + const mockCustomField = cloneDeep(advanceRequestCustomFieldData2); + advanceRequestsCustomFieldsService.getAll.and.returnValue(of(mockCustomField)); + const customFieldValuesData = cloneDeep(advanceRequestCustomFieldValuesData); + customFieldValuesData[0].id = 150; + fixture.detectChanges(); + + component.ionViewWillEnter(); + tick(100); + component.customFieldValues = customFieldValuesData; + + expect(component.setupNetworkWatcher).toHaveBeenCalledTimes(1); + component.customFields$.subscribe((res) => { + expect(advanceRequestsCustomFieldsService.getAll).toHaveBeenCalledTimes(1); + expect(res).toEqual(mockCustomField); + }); + })); + }); + + it('setupNetworkWatcher(): should setup network watcher', () => { + networkService.isOnline.and.returnValue(of(false)); + + component.setupNetworkWatcher(); + + expect(networkService.connectivityWatcher).toHaveBeenCalledTimes(1); + expect(networkService.isOnline).toHaveBeenCalledTimes(1); + expect(router.navigate).toHaveBeenCalledOnceWith(['/', 'enterprise', 'my_dashboard']); + }); + }); +} diff --git a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.setup.spec.ts b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.setup.spec.ts index fe229cc1e1..ac30d5a905 100644 --- a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.setup.spec.ts +++ b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.setup.spec.ts @@ -23,6 +23,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { TestCases1 } from './add-edit-advance-request-1.page.spec'; import { FormBuilder } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; +import { TestCases2 } from './add-edit-advance-request-2.page.spec'; describe('AddEditAdvanceRequestPage', () => { const getTestBed = () => { @@ -42,16 +43,21 @@ describe('AddEditAdvanceRequestPage', () => { const modalControllerSpyObj = jasmine.createSpyObj('ModalController', ['create']); const statusServiceSpyObj = jasmine.createSpyObj('StatusService', ['findLatestComment', 'post']); const loaderServiceSpyObj = jasmine.createSpyObj('LoaderService', ['showLoader', 'hideLoader']); - const projectsServiceSpyObj = jasmine.createSpyObj('ProjectsService', ['getById', 'getAllActive']); + const projectsServiceSpyObj = jasmine.createSpyObj('ProjectsService', ['getbyId', 'getAllActive']); const popoverControllerSpyObj = jasmine.createSpyObj('PopoverController', ['create']); - const transactionsOutboxServiceSpyObj = jasmine.createSpyObj('TransactionsOutboxService', ['addTransaction']); - const fileServiceSpyObj = jasmine.createSpyObj('FileService', ['fileUpload']); + const transactionsOutboxServiceSpyObj = jasmine.createSpyObj('TransactionsOutboxService', ['fileUpload']); + const fileServiceSpyObj = jasmine.createSpyObj('FileService', [ + 'fileUpload', + 'getImageTypeFromDataUrl', + 'downloadUrl', + 'findByAdvanceRequestId', + ]); const orgSettingsServiceSpyObj = jasmine.createSpyObj('OrgSettingsService', ['get']); const networkServiceSpyObj = jasmine.createSpyObj('NetworkService', ['connectivityWatcher', 'isOnline']); const modalPropertiesSpyObj = jasmine.createSpyObj('ModalPropertiesService', ['getModalDefaultProperties']); const trackingServiceSpyObj = jasmine.createSpyObj('TrackingService', ['addComment', 'viewComment']); const expenseFieldsServiceSpyObj = jasmine.createSpyObj('ExpenseFieldsService', ['getAllMap']); - const currencyServiceSpyObj = jasmine.createSpyObj('CurrencyService', ['getHomeCurrrency']); + const currencyServiceSpyObj = jasmine.createSpyObj('CurrencyService', ['getHomeCurrency']); const orgUserSettingsServiceSpyObj = jasmine.createSpyObj('OrgUserSettingsService', ['get']); const routerSpyObj = jasmine.createSpyObj('Router', ['navigate']); @@ -97,4 +103,5 @@ describe('AddEditAdvanceRequestPage', () => { }; TestCases1(getTestBed); + TestCases2(getTestBed); }); diff --git a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.ts b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.ts index 582d8a2232..a7aa482093 100644 --- a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.ts +++ b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.ts @@ -39,6 +39,7 @@ import { PolicyViolationCheck } from 'src/app/core/models/policy-violation-check import { AdvanceRequestsCustomFields } from 'src/app/core/models/advance-requests-custom-fields.model'; import { File } from 'src/app/core/models/file.model'; import { AdvanceRequestCustomFieldValues } from 'src/app/core/models/advance-request-custom-field-values.model'; +import { AdvanceRequestDeleteParams } from 'src/app/core/models/advance-request-delete-params.model'; @Component({ selector: 'app-add-edit-advance-request', templateUrl: './add-edit-advance-request.page.html', @@ -113,7 +114,7 @@ export class AddEditAdvanceRequestPage implements OnInit { @HostListener('keydown') scrollInputIntoView(): void { - const el = document.activeElement; + const el = this.getActiveElement(); if (el && el instanceof HTMLInputElement) { el.scrollIntoView({ block: 'center', @@ -121,6 +122,10 @@ export class AddEditAdvanceRequestPage implements OnInit { } } + getActiveElement(): Element { + return document.activeElement; + } + getFormValues(): AddEditAdvanceRequestFormValue { return this.fg.value as AddEditAdvanceRequestFormValue; } @@ -247,6 +252,19 @@ export class AddEditAdvanceRequestPage implements OnInit { }); } + showFormValidationErrors(): void { + this.fg.markAllAsTouched(); + const formContainer = this.formContainer.nativeElement as HTMLElement; + if (formContainer) { + const invalidElement = formContainer.querySelector('.ng-invalid'); + if (invalidElement) { + invalidElement.scrollIntoView({ + behavior: 'smooth', + }); + } + } + } + async showAdvanceSummaryPopover(): Promise { if (this.fg.valid) { const advanceSummaryPopover = await this.popoverController.create({ @@ -275,16 +293,7 @@ export class AddEditAdvanceRequestPage implements OnInit { this.save('Draft'); } } else { - this.fg.markAllAsTouched(); - const formContainer = this.formContainer.nativeElement as HTMLElement; - if (formContainer) { - const invalidElement = formContainer.querySelector('.ng-invalid'); - if (invalidElement) { - invalidElement.scrollIntoView({ - behavior: 'smooth', - }); - } - } + this.showFormValidationErrors(); } } @@ -340,16 +349,7 @@ export class AddEditAdvanceRequestPage implements OnInit { ) .subscribe(noop); } else { - this.fg.markAllAsTouched(); - const formContainer = this.formContainer.nativeElement as HTMLElement; - if (formContainer) { - const invalidElement = formContainer.querySelector('.ng-invalid'); - if (invalidElement) { - invalidElement.scrollIntoView({ - behavior: 'smooth', - }); - } - } + this.showFormValidationErrors(); } } @@ -549,17 +549,22 @@ export class AddEditAdvanceRequestPage implements OnInit { } } - async delete(): Promise { - const deletePopover = await this.popoverController.create({ + getAdvanceRequestDeleteParams(): AdvanceRequestDeleteParams { + return { component: FyDeleteDialogComponent, cssClass: 'delete-dialog', backdropDismiss: false, componentProps: { header: 'Delete Advance Request', body: 'Are you sure you want to delete this request?', - deleteMethod: () => this.advanceRequestService.delete(this.activatedRoute.snapshot.params.id as string), + deleteMethod: (): Observable => + this.advanceRequestService.delete(this.activatedRoute.snapshot.params.id as string), }, - }); + }; + } + + async delete(): Promise { + const deletePopover = await this.popoverController.create(this.getAdvanceRequestDeleteParams()); await deletePopover.present(); @@ -648,7 +653,7 @@ export class AddEditAdvanceRequestPage implements OnInit { ); this.projects$ = this.projectsService.getAllActive(); - this.isProjectsVisible$ = this.orgSettingsService.get().pipe( + this.isProjectsVisible$ = orgSettings$.pipe( switchMap((orgSettings) => iif( () => orgSettings.advanced_projects.enable_individual_projects, From 15f7e10ef1ee2befa840a51a3f8f1f2e4b7288f8 Mon Sep 17 00:00:00 2001 From: Suyash Patil <127177049+suyashpatil78@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:38:47 +0530 Subject: [PATCH 05/14] test: remaining method in add-edit-exp (#2485) --- ...corporate-card-expense-unflattened.data.ts | 12 +++++++++ .../add-edit-expense-6.spec.ts | 27 ++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/app/core/mock-data/corporate-card-expense-unflattened.data.ts b/src/app/core/mock-data/corporate-card-expense-unflattened.data.ts index 77eb1110be..0a6f537aa2 100644 --- a/src/app/core/mock-data/corporate-card-expense-unflattened.data.ts +++ b/src/app/core/mock-data/corporate-card-expense-unflattened.data.ts @@ -67,3 +67,15 @@ export const eCCCData2: CCCExpUnflattened = { vendor: null, }, }; + +export const eCCCData3: CCCExpUnflattened = { + ...expectedECccResponse[0], + balance: { + transfer_settlement_id: 'setxPixUhOPVL', + }, + flow: 'newCCCFlow', + ccce: { + ...expectedECccResponse[0].ccce, + corporate_credit_card_account_number: '123456789', + }, +}; diff --git a/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts b/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts index 134a7fe91b..c07378a827 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts @@ -7,7 +7,11 @@ import { ActivatedRoute, Router } from '@angular/router'; import { ActionSheetController, ModalController, NavController, Platform, PopoverController } from '@ionic/angular'; import { BehaviorSubject, Observable, Subject, Subscription, of } from 'rxjs'; import { AccountType } from 'src/app/core/enums/account-type.enum'; -import { eCCCData2, expectedECccResponse } from 'src/app/core/mock-data/corporate-card-expense-unflattened.data'; +import { + eCCCData2, + eCCCData3, + expectedECccResponse, +} from 'src/app/core/mock-data/corporate-card-expense-unflattened.data'; import { expectedCCdata, expectedCCdata2 } from 'src/app/core/mock-data/cost-centers.data'; import { defaultTxnFieldValuesData3 } from 'src/app/core/mock-data/default-txn-field-values.data'; import { @@ -158,11 +162,11 @@ export function TestCases6(getTestBed) { popupService = TestBed.inject(PopupService) as jasmine.SpyObj; navController = TestBed.inject(NavController) as jasmine.SpyObj; corporateCreditCardExpenseService = TestBed.inject( - CorporateCreditCardExpenseService, + CorporateCreditCardExpenseService ) as jasmine.SpyObj; trackingService = TestBed.inject(TrackingService) as jasmine.SpyObj; recentLocalStorageItemsService = TestBed.inject( - RecentLocalStorageItemsService, + RecentLocalStorageItemsService ) as jasmine.SpyObj; recentlyUsedItemsService = TestBed.inject(RecentlyUsedItemsService) as jasmine.SpyObj; tokenService = TestBed.inject(TokenService) as jasmine.SpyObj; @@ -239,7 +243,7 @@ export function TestCases6(getTestBed) { expect(platformHandlerService.registerBackButtonAction).toHaveBeenCalledOnceWith( BackButtonActionPriority.MEDIUM, - jasmine.any(Function), + jasmine.any(Function) ); expect(dependentFieldSpy.ngOnInit).toHaveBeenCalledTimes(2); }); @@ -254,7 +258,7 @@ export function TestCases6(getTestBed) { expect(platformHandlerService.registerBackButtonAction).toHaveBeenCalledOnceWith( BackButtonActionPriority.MEDIUM, - jasmine.any(Function), + jasmine.any(Function) ); }); }); @@ -347,7 +351,7 @@ export function TestCases6(getTestBed) { 'tax_group_id', 'org_category_id', ], - undefined, + undefined ); })); @@ -512,6 +516,17 @@ export function TestCases6(getTestBed) { expect(component.fg.controls.bus_travel_class.value).toBeNull(); })); + it('initCCCTxn(): should initialize CCC txn and initialize card number and ending digits', () => { + activatedRoute.snapshot.params = { + bankTxn: JSON.stringify(eCCCData3), + }; + component.initCCCTxn(); + expect(component.showSelectedTransaction).toBeTrue(); + expect(component.selectedCCCTransaction).toEqual(eCCCData3.ccce); + expect(component.isCreatedFromCCC).toBeTrue(); + expect(component.cardEndingDigits).toEqual('6789'); + }); + it('ngOnInit(): should populate report permissions', () => { activatedRoute.snapshot.params.remove_from_report = JSON.stringify(true); fixture.detectChanges(); From ab028c12bba67681391767ef52a26007d13f575f Mon Sep 17 00:00:00 2001 From: jayfyle <115472256+jayfyle@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:08:41 +0530 Subject: [PATCH 06/14] fix: Notifications Page Fixing Tests (#2487) * fixed tests * fixing tests -2 --------- Co-authored-by: Jay Budhadev --- .../mock-data/notification-events.data.ts | 390 ++++++++++++++++++ .../org-user-settings.service.spec.ts | 5 +- .../notifications/notifications.page.spec.ts | 8 +- 3 files changed, 397 insertions(+), 6 deletions(-) diff --git a/src/app/core/mock-data/notification-events.data.ts b/src/app/core/mock-data/notification-events.data.ts index 91b532b856..85d0b635ee 100644 --- a/src/app/core/mock-data/notification-events.data.ts +++ b/src/app/core/mock-data/notification-events.data.ts @@ -194,3 +194,393 @@ export const notificationEventsData: NotificationEvents = { }, ], }; + +export const notificationEventsData2: NotificationEvents = { + features: { + expensesAndReports: { + textLabel: 'Expenses and Reports', + selected: true, + }, + advances: { + textLabel: 'Advances', + selected: true, + }, + }, + events: [ + { + textLabel: 'When an expense is created via email', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'eous_forward_email_to_user', + }, + { + textLabel: 'On submission of expense report', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'erpts_submitted', + }, + { + textLabel: 'When a comment is left on an expense', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'estatuses_created_txn', + }, + { + textLabel: 'When a comment is left on a report', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'estatuses_created_rpt', + }, + { + textLabel: 'When an expense is removed', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'etxns_admin_removed', + }, + { + textLabel: 'When an expense is edited by someone else', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'etxns_admin_updated', + }, + { + textLabel: 'When a reported expense is sent back', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'erpts_inquiry', + }, + { + textLabel: 'When a report is approved', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'erpts_approved', + }, + { + textLabel: 'When a reimbursement is done', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'ereimbursements_completed', + }, + { + textLabel: 'When an advance request is submitted', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_created', + }, + { + textLabel: 'When an advance request is updated', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_updated', + }, + { + textLabel: 'When an advance request is sent back', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_inquiry', + }, + { + textLabel: 'When an advance request is approved', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_approved', + }, + { + textLabel: 'When an advance is assigned', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvances_created', + }, + { + textLabel: 'When an advance request is rejected', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_rejected', + }, + ], +}; + +export const notificationEventsData3: NotificationEvents = { + features: { + expensesAndReports: { + textLabel: 'Expenses and Reports', + selected: true, + }, + advances: { + textLabel: 'Advances', + selected: true, + }, + }, + events: [ + { + textLabel: 'When an expense is created via email', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'eous_forward_email_to_user', + }, + { + textLabel: 'On submission of expense report', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'erpts_submitted', + }, + { + textLabel: 'When a comment is left on an expense', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'estatuses_created_txn', + }, + { + textLabel: 'When a comment is left on a report', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'estatuses_created_rpt', + }, + { + textLabel: 'When an expense is removed', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'etxns_admin_removed', + }, + { + textLabel: 'When an expense is edited by someone else', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'etxns_admin_updated', + }, + { + textLabel: 'When a reported expense is sent back', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'erpts_inquiry', + }, + { + textLabel: 'When a report is approved', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'erpts_approved', + }, + { + textLabel: 'When a reimbursement is done', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'expensesAndReports', + eventType: 'ereimbursements_completed', + }, + { + textLabel: 'When an advance request is submitted', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_created', + }, + { + textLabel: 'When an advance request is updated', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_updated', + }, + { + textLabel: 'When an advance request is sent back', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_inquiry', + }, + { + textLabel: 'When an advance request is approved', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_approved', + }, + { + textLabel: 'When an advance is assigned', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvances_created', + }, + { + textLabel: 'When an advance request is rejected', + selected: true, + email: { + selected: true, + }, + push: { + selected: true, + }, + feature: 'advances', + eventType: 'eadvance_requests_rejected', + }, + ], +}; diff --git a/src/app/core/services/org-user-settings.service.spec.ts b/src/app/core/services/org-user-settings.service.spec.ts index aee416195c..a6dba151b8 100644 --- a/src/app/core/services/org-user-settings.service.spec.ts +++ b/src/app/core/services/org-user-settings.service.spec.ts @@ -11,8 +11,9 @@ import { } from '../mock-data/org-user-settings.data'; import { currentEouUnflatted } from '../test-data/org-user.service.spec.data'; import { emailEvents } from '../mock-data/email-events.data'; -import { notificationEventsData } from '../mock-data/notification-events.data'; +import { notificationEventsData, notificationEventsData3 } from '../mock-data/notification-events.data'; import { costCentersData2, costCentersData3 } from '../mock-data/cost-centers.data'; +import { cloneDeep } from 'lodash'; describe('OrgUserSettingsService', () => { let orgUserSettingsService: OrgUserSettingsService; @@ -95,7 +96,7 @@ describe('OrgUserSettingsService', () => { it('getNotificationEvents(): should get notification events', (done) => { orgUserSettingsService.getNotificationEvents().subscribe((res) => { - expect(res).toEqual(notificationEventsData); + expect(res).toEqual(cloneDeep(notificationEventsData3)); done(); }); }); diff --git a/src/app/fyle/notifications/notifications.page.spec.ts b/src/app/fyle/notifications/notifications.page.spec.ts index 82e8a21746..8a3f6810d9 100644 --- a/src/app/fyle/notifications/notifications.page.spec.ts +++ b/src/app/fyle/notifications/notifications.page.spec.ts @@ -8,7 +8,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { cloneDeep } from 'lodash'; import { of } from 'rxjs'; import { apiEouRes } from 'src/app/core/mock-data/extended-org-user.data'; -import { notificationEventsData } from 'src/app/core/mock-data/notification-events.data'; +import { notificationEventsData, notificationEventsData2 } from 'src/app/core/mock-data/notification-events.data'; import { orgSettingsWithUnsubscribeEvent } from 'src/app/core/mock-data/org-settings.data'; import { notificationDelegateeSettings1, @@ -182,12 +182,12 @@ describe('NotificationsPage', () => { it('removeAdminUnsbscribedEvents(): should remove admin unsubscribe events', fakeAsync(() => { component.orgSettings$ = of(orgSettingsWithUnsubscribeEvent); component.orgSettings = orgSettingsWithUnsubscribeEvent; - component.notificationEvents = cloneDeep(notificationEventsData); + component.notificationEvents = cloneDeep(notificationEventsData2); component.removeAdminUnsbscribedEvents(); tick(500); - expect(Object.keys(component.notificationEvents.features).includes('advances')).toBeFalse(); + expect(Object.keys(component.notificationEvents.features)).toEqual(['expensesAndReports', 'advances']); })); it('updateAdvanceRequestFeatures(): should update advance request features', () => { @@ -236,7 +236,7 @@ describe('NotificationsPage', () => { it('removeDisabledFeatures(): should remove disabled features', () => { spyOn(component, 'updateAdvanceRequestFeatures'); - component.notificationEvents = cloneDeep(notificationEventsData); + component.notificationEvents = cloneDeep(notificationEventsData2); component.removeDisabledFeatures(); From 21c502511fb4f302ef33441183d7117e7fba67ec Mon Sep 17 00:00:00 2001 From: Suyash Patil <127177049+suyashpatil78@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:51:08 +0530 Subject: [PATCH 07/14] feat: Updating readme (#2491) * Updating readme * minor --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 424746af45..edbcc3a92b 100644 --- a/README.md +++ b/README.md @@ -12,18 +12,19 @@ Please install node v14.17.2 or above via nvm. - ionic serve -c `env_name` # IMPORTANT -## before making any changes - - - go to .git/hooks - - run in the shell - chmod +x pre-commit - - Note: It is to prevent keys from accidentally leaking. - - ## For setting environment variables - Ping mobile app team for environment files - Add them inside the environments folder - - Note: Do not make any changes to the environment.ts file - this is a template folder for creating configurations. + - Note: Do not make any changes to the environment.ts file - this is a template folder for creating configurations. Also, make sure not to put staging envs in this file. + - If you are getting errors like this: + ``` + Property 'LIVE_UPDATE_APP_VERSION' does not exist on type + '{ production: boolean; NAME: string; CLUSTER_DOMAIN: string; ROOT_URL: string; ROUTER_API_ENDPOINT: string; + ANDROID_CLIENT_ID: string; IP_FIND_KEY: string; GOOGLE_MAPS_API_KEY: string; FRESHCHAT_TOKEN: string; + SENTRY_DSN: string; REFINER_NPS_FORM_ID: string; }' + ``` + make sure you have the latest `environment.staging.ts` file. ## For creating pull requests From 0fde8ed786870eeb7d5884b72446c04f49992833 Mon Sep 17 00:00:00 2001 From: Omkar Joshi <65808188+OmkarJ13@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:54:17 +0530 Subject: [PATCH 08/14] fix: Add card CTA usability issue (#2497) --- src/app/shared/components/add-card/add-card.component.html | 6 +++--- .../shared/components/add-card/add-card.component.spec.ts | 6 +++--- .../components/spent-cards/spent-cards.component.html | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/shared/components/add-card/add-card.component.html b/src/app/shared/components/add-card/add-card.component.html index 4b11e2342d..dbaec135d9 100644 --- a/src/app/shared/components/add-card/add-card.component.html +++ b/src/app/shared/components/add-card/add-card.component.html @@ -1,9 +1,9 @@ -
+
No card added yet! - +
diff --git a/src/app/shared/components/add-card/add-card.component.spec.ts b/src/app/shared/components/add-card/add-card.component.spec.ts index 3464e34951..c549961fb3 100644 --- a/src/app/shared/components/add-card/add-card.component.spec.ts +++ b/src/app/shared/components/add-card/add-card.component.spec.ts @@ -42,11 +42,11 @@ describe('AddCardComponent', () => { expect(zeroStateMessageElement).toBeNull(); }); - it('should raise an event addCardClick when the add card button is clicked', () => { + it('should raise an event addCardClick when the add card container is clicked', () => { spyOn(component.addCardClick, 'emit'); - const addCardButton = getElementRef(fixture, '[data-testid="add-card-button"]'); - addCardButton.nativeElement.click(); + const addCardContainer = getElementRef(fixture, '[data-testid="add-card-container"]'); + addCardContainer.nativeElement.click(); expect(component.addCardClick.emit).toHaveBeenCalled(); }); diff --git a/src/app/shared/components/spent-cards/spent-cards.component.html b/src/app/shared/components/spent-cards/spent-cards.component.html index 47a2ecc75c..3c3012ac14 100644 --- a/src/app/shared/components/spent-cards/spent-cards.component.html +++ b/src/app/shared/components/spent-cards/spent-cards.component.html @@ -6,6 +6,7 @@ [slidesPerView]="1.1" [spaceBetween]="16" [pagination]="pagination" + [centeredSlides]="cardDetails.length === 1 && !showAddCardSlide" > From 5357414c60758dd3838d5d874c669bc92891dd25 Mon Sep 17 00:00:00 2001 From: hlkavya0213 <79827230+hlkavya0213@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:02:20 +0530 Subject: [PATCH 09/14] feat: remove thumbnails across mobile app (#2499) --- src/app/core/mock-data/file-object.data.ts | 3 +- src/app/core/services/file.service.spec.ts | 41 +----- src/app/core/services/file.service.ts | 28 +---- .../split-expense/split-expense.page.spec.ts | 4 +- .../expense-card-lite.component.html | 14 +-- .../expense-card-lite.component.scss | 7 +- .../expense-card-lite.component.spec.ts | 69 ++++------ .../expense-card-lite.component.ts | 21 +--- .../expenses-card.component.html | 17 +-- .../expenses-card.component.scss | 7 +- .../expenses-card.component.spec.ts | 118 +----------------- .../expenses-card/expenses-card.component.ts | 61 ++------- src/assets/images/pdf-receipt-placeholder.png | Bin 0 -> 7933 bytes 13 files changed, 77 insertions(+), 313 deletions(-) create mode 100644 src/assets/images/pdf-receipt-placeholder.png diff --git a/src/app/core/mock-data/file-object.data.ts b/src/app/core/mock-data/file-object.data.ts index 8655f0fd8f..b6f37c79d9 100644 --- a/src/app/core/mock-data/file-object.data.ts +++ b/src/app/core/mock-data/file-object.data.ts @@ -78,10 +78,9 @@ export const fileObjectData5: FileObject = { purpose: '', }; -export const thumbnailUrlMockData: FileObject[] = [ +export const fileUrlMockData: FileObject[] = [ { id: 'fiwJ0nQTBpYH', - purpose: 'THUMBNAILx200x200', url: 'mock-url-1', }, ]; diff --git a/src/app/core/services/file.service.spec.ts b/src/app/core/services/file.service.spec.ts index 15cf211c74..11d50a46de 100644 --- a/src/app/core/services/file.service.spec.ts +++ b/src/app/core/services/file.service.spec.ts @@ -1,12 +1,6 @@ import { TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { - fileObjectAdv, - fileObjectAdv1, - fileObjectData, - fileObjectData4, - thumbnailUrlMockData, -} from '../mock-data/file-object.data'; +import { fileObjectAdv, fileObjectAdv1, fileObjectData, fileObjectData4 } from '../mock-data/file-object.data'; import { ApiService } from './api.service'; import { DateService } from './date.service'; @@ -42,39 +36,6 @@ describe('FileService', () => { expect(fileService).toBeTruthy(); }); - it('downloadThumbnailUrl(): should return the file obj with thumbnail url', (done) => { - apiService.post.and.returnValue(of(thumbnailUrlMockData)); - - const fileId = 'fiwJ0nQTBpYH'; - fileService.downloadThumbnailUrl(fileId).subscribe((res) => { - expect(res).toEqual(thumbnailUrlMockData); - expect(apiService.post).toHaveBeenCalledOnceWith('/files/download_urls', [ - { - id: fileId, - purpose: 'THUMBNAILx200x200', - }, - ]); - done(); - }); - }); - - it('getFilesWithThumbnail(): should return files with thumbnail for the given txn ID', (done) => { - apiService.get.and.returnValue(of([fileObjectData])); - - const txnId = 'txdzGV1TZEg3'; - fileService.getFilesWithThumbnail(txnId).subscribe((res) => { - expect(res).toEqual([fileObjectData]); - expect(apiService.get).toHaveBeenCalledOnceWith('/files', { - params: { - transaction_id: txnId, - skip_html: 'true', - purpose: 'THUMBNAILx200x200', - }, - }); - done(); - }); - }); - it('base64Download(): should return the base64 encoded file content', (done) => { apiService.get.and.returnValue(of({ content: 'base64encodedcontent' })); diff --git a/src/app/core/services/file.service.ts b/src/app/core/services/file.service.ts index 937437af53..225c8c7d80 100644 --- a/src/app/core/services/file.service.ts +++ b/src/app/core/services/file.service.ts @@ -12,34 +12,12 @@ import { DateService } from './date.service'; providedIn: 'root', }) export class FileService { - constructor( - private apiService: ApiService, - private dateService: DateService, - ) {} + constructor(private apiService: ApiService, private dateService: DateService) {} downloadUrl(fileId: string): Observable { return this.apiService.post('/files/' + fileId + '/download_url').pipe(map((res) => res.url)); } - downloadThumbnailUrl(fileId: string): Observable { - return this.apiService.post('/files/download_urls', [ - { - id: fileId, - purpose: 'THUMBNAILx200x200', - }, - ]); - } - - getFilesWithThumbnail(txnId: string): Observable { - return this.apiService.get('/files', { - params: { - transaction_id: txnId, - skip_html: 'true', - purpose: 'THUMBNAILx200x200', - }, - }); - } - base64Download(fileId: string): Observable<{ content: string }> { return this.apiService.get('/files/' + fileId + '/download_b64'); } @@ -51,7 +29,7 @@ export class FileService { advance_request_id: advanceRequestId, skip_html: 'true', }, - }), + }) ).pipe( map((files) => { files.map((file) => { @@ -59,7 +37,7 @@ export class FileService { this.setFileType(file as FileObject); }); return files as unknown as FileObject[]; - }), + }) ); } diff --git a/src/app/fyle/split-expense/split-expense.page.spec.ts b/src/app/fyle/split-expense/split-expense.page.spec.ts index 492730b5f3..e7ac7feaef 100644 --- a/src/app/fyle/split-expense/split-expense.page.spec.ts +++ b/src/app/fyle/split-expense/split-expense.page.spec.ts @@ -84,7 +84,7 @@ import { splitExpFile2, splitExpFile3, splitExpFileObj, - thumbnailUrlMockData, + fileUrlMockData, fileObjectData1, } from 'src/app/core/mock-data/file-object.data'; import { @@ -632,7 +632,7 @@ describe('SplitExpensePage', () => { it('should return the attached files when the transaction id is specified', (done) => { spyOn(component, 'getAttachedFiles').and.returnValue(of(fileObject8)); - const FileObject9: FileObject[] = thumbnailUrlMockData.map((fileObject) => ({ + const FileObject9: FileObject[] = fileUrlMockData.map((fileObject) => ({ ...fileObject, id: 'fizBwnXhyZTp', })); diff --git a/src/app/shared/components/expense-card-lite/expense-card-lite.component.html b/src/app/shared/components/expense-card-lite/expense-card-lite.component.html index ae9a29ff24..afce935eb9 100644 --- a/src/app/shared/components/expense-card-lite/expense-card-lite.component.html +++ b/src/app/shared/components/expense-card-lite/expense-card-lite.component.html @@ -1,6 +1,6 @@
- +
-
+
+ +
@@ -29,7 +25,7 @@
- {{ expense.txn_dt | date: 'MMM dd, YYYY' }} + {{ expense.txn_dt | date : 'MMM dd, YYYY' }}
diff --git a/src/app/shared/components/expense-card-lite/expense-card-lite.component.scss b/src/app/shared/components/expense-card-lite/expense-card-lite.component.scss index 6a59195d44..75507b99af 100644 --- a/src/app/shared/components/expense-card-lite/expense-card-lite.component.scss +++ b/src/app/shared/components/expense-card-lite/expense-card-lite.component.scss @@ -28,7 +28,7 @@ padding: 15px; } - &--receipt-thumbnail-container { + &--receipt-image-container { background-color: $light-grey; border-radius: 8px; height: 64px; @@ -38,6 +38,11 @@ align-items: center; } + &--receipt-image { + height: 60px; + width: 80px; + } + &--with-image { background-size: cover; background-repeat: no-repeat; diff --git a/src/app/shared/components/expense-card-lite/expense-card-lite.component.spec.ts b/src/app/shared/components/expense-card-lite/expense-card-lite.component.spec.ts index 009a8fbe0f..bcb7a45cd2 100644 --- a/src/app/shared/components/expense-card-lite/expense-card-lite.component.spec.ts +++ b/src/app/shared/components/expense-card-lite/expense-card-lite.component.spec.ts @@ -1,22 +1,13 @@ -import { ComponentFixture, TestBed, async, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FileService } from 'src/app/core/services/file.service'; import { ExpenseCardLiteComponent } from './expense-card-lite.component'; import { IonicModule } from '@ionic/angular'; import { MatIconModule } from '@angular/material/icon'; import { MatIconTestingModule } from '@angular/material/icon/testing'; import { CurrencySymbolPipe } from '../../pipes/currency-symbol.pipe'; -import { fileObjectData1 } from 'src/app/core/mock-data/file-object.data'; -import { of } from 'rxjs'; import { getElementBySelector, getTextContent } from 'src/app/core/dom-helpers'; -import { FileObject } from 'src/app/core/models/file-obj.model'; - -const thumbnailUrlMockData1: FileObject[] = [ - { - id: 'fiwJ0nQTBpYH', - purpose: 'THUMBNAILx200x200', - url: '/assets/images/add-to-list.png', - }, -]; +import { of } from 'rxjs'; +import { fileObjectData } from 'src/app/core/mock-data/file-object.data'; describe('ExpenseCardLiteComponent', () => { let expenseCardLiteComponent: ExpenseCardLiteComponent; @@ -24,9 +15,7 @@ describe('ExpenseCardLiteComponent', () => { let fileService: jasmine.SpyObj; beforeEach(waitForAsync(() => { - const fileServiceSpy = jasmine.createSpyObj('FileService', ['getFilesWithThumbnail', 'downloadThumbnailUrl']); - fileServiceSpy.getFilesWithThumbnail.and.returnValue(of(fileObjectData1)); - fileServiceSpy.downloadThumbnailUrl.and.returnValue(of(thumbnailUrlMockData1)); + const fileServiceSpy = jasmine.createSpyObj('FileService', ['findByTransactionId']); TestBed.configureTestingModule({ declarations: [ExpenseCardLiteComponent, CurrencySymbolPipe], @@ -42,58 +31,48 @@ describe('ExpenseCardLiteComponent', () => { fixture = TestBed.createComponent(ExpenseCardLiteComponent); expenseCardLiteComponent = fixture.componentInstance; - const expense = { id: 'txn1234' }; - expenseCardLiteComponent.expense = expense; - fixture.detectChanges(); })); it('should create', () => { expect(expenseCardLiteComponent).toBeTruthy(); }); - it('should call getReceipt on initialization', () => { - spyOn(expenseCardLiteComponent, 'getReceipt'); - expenseCardLiteComponent.ngOnInit(); - expect(expenseCardLiteComponent.getReceipt).toHaveBeenCalledTimes(1); - }); + const initialSetup = (fileData) => { + fileService.findByTransactionId.and.returnValue(of(fileData)); + expenseCardLiteComponent.expense = { id: 'txn1234' }; + fixture.detectChanges(); + }; describe('getReceipt():', () => { - it('should set receiptThumbnail if there is at least one thumbnail file', () => { - fixture.detectChanges(); - expect(fileService.getFilesWithThumbnail).toHaveBeenCalledOnceWith(expenseCardLiteComponent.expense.id); - expect(fileService.downloadThumbnailUrl).toHaveBeenCalledOnceWith(fileObjectData1[0].id); - expect(expenseCardLiteComponent.receiptThumbnail).toEqual(thumbnailUrlMockData1[0].url); + it('should set isReceiptPresent to true when files are present', () => { + initialSetup([fileObjectData]); + expect(fileService.findByTransactionId).toHaveBeenCalledWith('txn1234'); + expect(expenseCardLiteComponent.isReceiptPresent).toBeTruthy(); }); - it('should return an empty array if there are no thumbnail files', () => { - fileService.getFilesWithThumbnail.and.returnValue(of([])); - fixture.detectChanges(); - expenseCardLiteComponent.getReceipt(); - expect(fileService.getFilesWithThumbnail).toHaveBeenCalledWith(expenseCardLiteComponent.expense.id); - expect(expenseCardLiteComponent.receiptThumbnail).toEqual(thumbnailUrlMockData1[0].url); + it('should set isReceiptPresent to false when no files are present', () => { + initialSetup([]); + expect(fileService.findByTransactionId).toHaveBeenCalledWith('txn1234'); + expect(expenseCardLiteComponent.isReceiptPresent).toBeFalsy(); }); }); - it('should display the thumbnail when available', () => { - fixture.detectChanges(); + it('should display the receipt when available', () => { + initialSetup([fileObjectData]); const element = fixture.nativeElement; - const thumbnailContainer = element.querySelector('.expenses-card--receipt-thumbnail-container'); - const backgroundImage = thumbnailContainer.style.backgroundImage; - expect(thumbnailContainer).toBeTruthy(); - expect(backgroundImage).toContain(expenseCardLiteComponent.receiptThumbnail); + const receiptContainer = element.querySelector('.expenses-card--receipt-image-container'); + expect(receiptContainer).toBeTruthy(); }); - it('should display a default icon when no thumbnail available', () => { - expenseCardLiteComponent.receiptThumbnail = null; - fixture.detectChanges(); - + it('should display a default icon when no receipt available', () => { + initialSetup([]); const element = fixture.nativeElement; const icon = element.querySelector('.expenses-card--receipt-icon'); expect(icon).toBeTruthy(); }); it('should display "Unspecified" if purpose is not present', () => { - fixture.detectChanges(); + initialSetup([]); const purpose = getElementBySelector(fixture, '.expenses-card--category'); expect(getTextContent(purpose)).toEqual('Unspecified'); }); diff --git a/src/app/shared/components/expense-card-lite/expense-card-lite.component.ts b/src/app/shared/components/expense-card-lite/expense-card-lite.component.ts index d24e3763e8..22500e4ec2 100644 --- a/src/app/shared/components/expense-card-lite/expense-card-lite.component.ts +++ b/src/app/shared/components/expense-card-lite/expense-card-lite.component.ts @@ -1,6 +1,4 @@ import { Component, Input, OnInit } from '@angular/core'; -import { noop } from 'rxjs'; -import { map, switchMap } from 'rxjs/operators'; import { FileObject } from 'src/app/core/models/file-obj.model'; import { FileService } from 'src/app/core/services/file.service'; @@ -12,7 +10,7 @@ import { FileService } from 'src/app/core/services/file.service'; export class ExpenseCardLiteComponent implements OnInit { @Input() expense; - receiptThumbnail: string; + isReceiptPresent: boolean; constructor(private fileService: FileService) {} @@ -21,19 +19,8 @@ export class ExpenseCardLiteComponent implements OnInit { } getReceipt() { - this.fileService - .getFilesWithThumbnail(this.expense.id) - .pipe( - switchMap((ThumbFiles: FileObject[]) => { - if (ThumbFiles.length > 0) { - return this.fileService.downloadThumbnailUrl(ThumbFiles[0].id); - } else { - return []; - } - }) - ) - .subscribe((downloadUrl: FileObject[]) => { - this.receiptThumbnail = downloadUrl[0].url; - }); + this.fileService.findByTransactionId(this.expense.id).subscribe((files: FileObject[]) => { + this.isReceiptPresent = files.length > 0; + }); } } diff --git a/src/app/shared/components/expenses-card/expenses-card.component.html b/src/app/shared/components/expenses-card/expenses-card.component.html index 99c560f7f0..28bc75e0b3 100644 --- a/src/app/shared/components/expenses-card/expenses-card.component.html +++ b/src/app/shared/components/expenses-card/expenses-card.component.html @@ -26,7 +26,7 @@
- +
+
@@ -62,7 +63,9 @@ class="expenses-card--receipt-container expenses-card--with-image" *ngIf="attachmentUploadInProgress" [ngStyle]="{ - 'background-image': inlineReceiptDataUrl && imageTransperencyOverlay + 'url(' + inlineReceiptDataUrl + ')' + 'background-image': + inlineReceiptDataUrl && + imageTransperencyOverlay + 'url(' + '../../../../assets/images/pdf-receipt-placeholder.png' + ')' }" >