techmatters · stephenhand · Apr 15, 2025 · Apr 24, 2025 · Apr 25, 2025 · Apr 25, 2025
diff --git a/e2e-tests/caseList.ts b/e2e-tests/caseList.ts
@@ -19,9 +19,8 @@ import { Page, expect } from '@playwright/test';
 import { caseHome } from './case';
 
 export type Filter =
-  | 'Status'
-  | 'Counselor'
-  | 'Categories'
+  | 'status'
+  | 'counselor'
   | 'createdAtFilter'
   | 'updatedAtFilter'
   | 'followUpDateFilter';
@@ -43,8 +42,6 @@ export const caseList = (page: Page) => {
       caseListPage.locator(`//button[@data-testid='FilterBy-${filter}-Button']`),
     filterOptionCheckbox: (filter: Filter, option: string) =>
       caseListPage.locator(`//li[@data-testid='${filter}-${option}']`),
-    filterCategories: (filter: Filter, option: string) =>
-      caseListPage.locator(`//div[@data-testid='${filter}-${option}']`),
     filterApplyButton: caseListPage.locator(`//button[@data-testid='Filter-Apply-Button']`),
 
     openFirstCaseButton: caseListPage
@@ -84,25 +81,12 @@ export const caseList = (page: Page) => {
 
   /** Filter cases (excluding Date filters)
    *
-   * @param filter: Filter (status, counselor or categories)
-   * @param option: string (required for all 3 filter)
-   * @param option2: string (required only for Categories filter)
    */
-  async function filterCases(filter: Filter, option: string, option2?: string): Promise<void> {
+  async function filterCases(filter: Filter, option: string): Promise<void> {
     await openFilter(filter);
 
-    if (filter === 'Categories' && option2) {
-      //for Categories filter, 2 valid options are required
-      const selectOption = selectors.filterCategories(filter, option);
-      await selectOption.click();
-
-      const selectSubCategoryOption = selectors.filterOptionCheckbox(filter, option2);
-      console.log({ selectSubCategoryOption });
-      await selectSubCategoryOption.click();
-    } else {
-      const selectOption = selectors.filterOptionCheckbox(filter, option).first();
-      await selectOption.click();
-    }
+    const selectOption = selectors.filterOptionCheckbox(filter, option).first();
+    await selectOption.click();
 
     const applyFilterButton = selectors.filterApplyButton;
     await applyFilterButton.waitFor({ state: 'visible' });

diff --git a/e2e-tests/tests/caselist.spec.ts b/e2e-tests/tests/caselist.spec.ts
@@ -50,12 +50,8 @@ test.describe.serial('Open and Edit a Case in Case List page', () => {
     console.log('Open Case List page');
     let page = caseList(pluginPage);
 
-    await page.filterCases('Status', 'Open');
+    await page.filterCases('status', 'Open');
     // await page.filterCases('Counselor', 'Aselo Alerts');
-
-    //for Categories filter, 2 valid options are required
-    await page.filterCases('Categories', 'Accessibility', 'Education');
-
     const caseHomePage = await page.openFirstCaseButton();
 
     // Open notifications cover up the print icon :facepalm

diff --git a/e2e-tests/ui-tests/aselo-service-mocks/hrm/cases.ts b/e2e-tests/ui-tests/aselo-service-mocks/hrm/cases.ts
@@ -102,6 +102,19 @@ const hrmCases = () => {
           });
         },
       );
+      await page.route(
+        new URL(path.join(PATH_PREFIX, '*', 'timeline**'), context.HRM_BASE_URL).toString(),
+        async (route) => {
+          await route.fulfill({
+            status: 200,
+            contentType: 'application/json',
+            body: JSON.stringify({
+              activities: [],
+              count: 0,
+            }),
+          });
+        },
+      );
     },
   };
 };

diff --git a/e2e-tests/ui-tests/tests/case-list.spec.ts b/e2e-tests/ui-tests/tests/case-list.spec.ts
@@ -79,9 +79,8 @@ test.describe.serial('Case List', () => {
       await caseListPage.openFilter(filter);
     };
 
-    await scanFilterDialogue('Status');
-    await scanFilterDialogue('Categories');
-    await scanFilterDialogue('Counselor');
+    await scanFilterDialogue('status');
+    await scanFilterDialogue('counselor');
     await scanFilterDialogue('createdAtFilter');
     await scanFilterDialogue('updatedAtFilter');
     await caseListPage.openFirstCaseButton();

diff --git a/hrm-form-definitions/form-definitions/as/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/as/v1/CaseFilters.json
@@ -1,7 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
   "operatingArea": { "searchable": true, "type": "multi-select", "position": "left" },
 
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },

diff --git a/hrm-form-definitions/form-definitions/br/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/br/v1/CaseFilters.json
@@ -1,7 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
 
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },

diff --git a/hrm-form-definitions/form-definitions/ca/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/ca/v1/CaseFilters.json
@@ -1,7 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
 
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },

diff --git a/hrm-form-definitions/form-definitions/cl/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/cl/v1/CaseFilters.json
@@ -1,7 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
 
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },

diff --git a/hrm-form-definitions/form-definitions/co/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/co/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/e2e/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/e2e/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/et/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/et/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/hu/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/hu/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/in/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/in/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/jm/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/jm/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/mt/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/mt/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/mw/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/mw/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/nz/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/nz/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/ph/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/ph/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/sg/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/sg/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/th/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/th/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/tz/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/tz/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/ukmh/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/ukmh/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/usch/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/usch/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/uscr/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/uscr/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
-  "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-  "operatingArea": { "searchable": true, "type": "multi-select", "position": "left" },
+  "counselor": { "component": "generate-counselor-filter", "position": "left" },  "operatingArea": { "searchable": true, "type": "multi-select", "position": "left" },
 
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },

diff --git a/hrm-form-definitions/form-definitions/za/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/za/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/zm/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/zm/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/hrm-form-definitions/form-definitions/zw/v1/CaseFilters.json b/hrm-form-definitions/form-definitions/zw/v1/CaseFilters.json
@@ -1,8 +1,6 @@
 {
   "status": { "component": "generate-status-filter", "position": "left" },
   "counselor": { "component": "generate-counselor-filter", "position": "left" },
-  "category": { "component": "generate-category-filter", "position": "left" },
-
   "createdDate": { "component": "generate-created-date-filter", "position": "right" },
   "updatedDate": { "component": "generate-updated-date-filter", "position": "right" },
   "followUpDate": { "type": "date-input", "allowFutureDates": true, "position": "right" }

diff --git a/plugin-hrm-form/src/___tests__/components/case/Case.test.tsx b/plugin-hrm-form/src/___tests__/components/case/Case.test.tsx
@@ -52,6 +52,8 @@ jest.mock('../../../states/case/timeline', () => ({
   newGetTimelineAsyncAction: jest.fn(),
   selectTimelineCount: jest.fn(() => 0),
   selectTimeline: jest.fn(() => []),
+  selectTimelineContactCategories: jest.fn().mockReturnValue({}),
+  selectCaseLabel: jest.fn().mockReturnValue('first last'),
 }));
 
 const { mockFetchImplementation, mockReset, buildBaseURL } = mockLocalFetchDefinitions();
@@ -82,10 +84,17 @@ beforeEach(() => {
 describe('useState mocked', () => {
   const verifyTimelineActions = () => {
     ['household', 'incident', 'perpetrator'].forEach(sectionType => {
-      expect(mockNewGetTimelineAction).toHaveBeenCalledWith(case1.connectedCase.id, sectionType, [sectionType], false, {
-        limit: 100,
-        offset: 0,
-      });
+      expect(mockNewGetTimelineAction).toHaveBeenCalledWith(
+        case1.connectedCase.id,
+        sectionType,
+        [sectionType],
+        false,
+        {
+          limit: 100,
+          offset: 0,
+        },
+        `case-${case1.connectedCase.id}`,
+      );
     });
 
     expect(mockNewGetTimelineAction).toHaveBeenCalledWith(
@@ -94,6 +103,7 @@ describe('useState mocked', () => {
       expect.arrayContaining(['referral', 'note']),
       true,
       { limit: 5, offset: 0 },
+      `case-${case1.connectedCase.id}`,
     );
   };
 
@@ -134,12 +144,8 @@ describe('useState mocked', () => {
       twilioWorkerId: WORKER_SID,
       status: 'open',
       info: { definitionVersion: DefinitionVersionId.v1 },
-      categories: {},
       accountSid: 'AC-accountSid',
       helpline: 'helpline',
-      firstContact: {
-        id: 'contact1',
-      } as Contact,
     },
     availableStatusTransitions: [],
     references: new Set(['x']),