From f6bc17761c8a89bcb8f1ab41ee79ab6000001e8b Mon Sep 17 00:00:00 2001 From: Aastha Bist <aastha.b@fyle.in> Date: Tue, 1 Oct 2024 06:35:02 +0530 Subject: [PATCH] fix: fix reference for system_category field to make sub categories visible in Mileage Form (#3215) --- src/app/core/mock-data/org-category.data.ts | 2 +- src/app/fyle/add-edit-mileage/add-edit-mileage-2.spec.ts | 4 ++-- src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts | 2 +- src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/core/mock-data/org-category.data.ts b/src/app/core/mock-data/org-category.data.ts index 169f834606..10eb9af9fb 100644 --- a/src/app/core/mock-data/org-category.data.ts +++ b/src/app/core/mock-data/org-category.data.ts @@ -1103,7 +1103,7 @@ export const mileageCategories2: OrgCategory[] = deepFreeze([ created_at: new Date('2021-05-18T11:40:38.576Z'), displayName: 'mileage', enabled: true, - fyle_category: 'Food', + fyle_category: 'Mileage', id: 141295, name: 'mileage', org_id: 'orrjqbDbeP9p', diff --git a/src/app/fyle/add-edit-mileage/add-edit-mileage-2.spec.ts b/src/app/fyle/add-edit-mileage/add-edit-mileage-2.spec.ts index 33374f4210..4dcaddfc7e 100644 --- a/src/app/fyle/add-edit-mileage/add-edit-mileage-2.spec.ts +++ b/src/app/fyle/add-edit-mileage/add-edit-mileage-2.spec.ts @@ -250,7 +250,7 @@ export function TestCases2(getTestBed) { component.getMileageCategories().subscribe((res) => { expect(res).toEqual({ defaultMileageCategory: mileageCategories2[0], - mileageCategories: [mileageCategories2[1]], + mileageCategories: [mileageCategories2[0], mileageCategories2[1]], }); expect(categoriesService.getAll).toHaveBeenCalledTimes(1); done(); @@ -262,7 +262,7 @@ export function TestCases2(getTestBed) { categoriesService.getAll.and.returnValue(of(mileageCategories2)); component.getSubCategories().subscribe((res) => { - expect(res).toEqual([mileageCategories2[0]]); + expect(res).toEqual([mileageCategories2[0], mileageCategories2[1]]); expect(categoriesService.getAll).toHaveBeenCalledTimes(1); done(); }); diff --git a/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts b/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts index 7fe924739e..e3d796d55d 100644 --- a/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts +++ b/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts @@ -671,7 +671,7 @@ export class AddEditMileagePage implements OnInit { const parentCategoryName = 'mileage'; return categories.filter( (orgCategory) => - parentCategoryName.toLowerCase() === orgCategory.name?.toLowerCase() && + parentCategoryName.toLowerCase() === orgCategory.fyle_category?.toLowerCase() && parentCategoryName.toLowerCase() !== orgCategory.sub_category?.toLowerCase() ); }), diff --git a/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts b/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts index 0ae8df0c0b..c2116142e0 100644 --- a/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts +++ b/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts @@ -634,7 +634,7 @@ export class AddEditPerDiemPage implements OnInit { const parentCategoryName = 'per diem'; return categories.filter( (orgCategory) => - parentCategoryName.toLowerCase() === orgCategory.name?.toLowerCase() && + parentCategoryName.toLowerCase() === orgCategory.fyle_category?.toLowerCase() && parentCategoryName.toLowerCase() !== orgCategory.sub_category?.toLowerCase() ); }),