@cccsaurora/howler-ui 3.1.0-dev.1649 → 3.1.0-dev.1656

package/components/elements/record/RecordContextMenu.js

@@ -14,7 +14,7 @@ import useMyApi from '@cccsaurora/howler-ui/components/hooks/useMyApi';
 import useMyActionFunctions from '@cccsaurora/howler-ui/components/routes/action/useMyActionFunctions';
 import AddRecordToCaseModal from '@cccsaurora/howler-ui/components/routes/cases/modals/AddRecordToCaseModal';
 import CreateCaseModal from '@cccsaurora/howler-ui/components/routes/cases/modals/CreateCaseModal';
-import { capitalize, get, groupBy, isEmpty, toString } from 'lodash-es';
+import { capitalize, get, groupBy, isEmpty, toString, uniq } from 'lodash-es';
 import howlerPluginStore from '@cccsaurora/howler-ui/plugins/store';
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -188,14 +188,18 @@ const RecordContextMenu = ({ children, getSelectedId, Component }) => {
                     onClick: () => executeAction(action.action_id, `howler.id:(${records.map(r => r.howler.id).join(' OR ')})`)
                 }))
             });
-            if (!isEmpty(template?.keys ?? []) && setQuery) {
+            const filterKeys = uniq([
+                ...(template?.keys ?? []),
+                ...Object.keys(record.howler.outline ?? {}).map(key => `howler.outline.${key}`)
+            ]);
+            if (!isEmpty(filterKeys) && setQuery) {
                 result.push({ kind: 'divider', id: 'filter-divider' });
                 result.push({
                     kind: 'submenu',
                     id: 'excludes',
                     icon: _jsx(RemoveCircleOutline, {}),
                     label: t('hit.panel.exclude'),
-                    items: (template?.keys ?? []).flatMap(key => {
+                    items: filterKeys.flatMap(key => {
                         let newQuery = '';
                         if (query !== DEFAULT_QUERY) {
                             newQuery = `(${query}) AND `;
@@ -225,7 +229,7 @@ const RecordContextMenu = ({ children, getSelectedId, Component }) => {
                     id: 'includes',
                     icon: _jsx(AddCircleOutline, {}),
                     label: t('hit.panel.include'),
-                    items: (template?.keys ?? []).flatMap(key => {
+                    items: filterKeys.flatMap(key => {
                         let newQuery = `(${query}) AND `;
                         const value = get(record, key);
                         if (!value) {

package/components/elements/record/RecordContextMenu.test.js

@@ -648,7 +648,7 @@ describe('HitContextMenu', () => {
                 expect(mockParameterContext.setQuery).toHaveBeenCalledWith('(howler.status:open) AND -howler.detection:"Test Detection"');
             });
         });
-        it('should not render exclusion menu when template has no keys', async () => {
+        it('should render outline fields in the exclusion menu when template has no keys', async () => {
             mockGetMatchingTemplate.mockResolvedValue(createMockTemplate({
                 keys: []
             }));
@@ -660,7 +660,13 @@ describe('HitContextMenu', () => {
             await waitFor(() => {
                 expect(screen.getByRole('menu')).toBeInTheDocument();
             });
-            expect(screen.queryByText('Exclude By')).toBeNull();
+            expect(screen.getByText('Exclude By')).toBeInTheDocument();
+            act(() => {
+                fireEvent.mouseEnter(screen.getByText('Exclude By'));
+            });
+            await waitFor(() => {
+                expect(screen.getByTestId('excludes-submenu').textContent).toContain('howler.outline.indicators');
+            });
         });
         it('should skip null field values in exclusion menu', async () => {
             act(() => {
@@ -777,7 +783,7 @@ describe('HitContextMenu', () => {
                 expect(mockParameterContext.setQuery).toHaveBeenCalledWith('(howler.status:open) AND howler.detection:"Test Detection"');
             });
         });
-        it('should not render inclusion menu when template has no keys', async () => {
+        it('should render outline fields in the inclusion menu when template has no keys', async () => {
             mockGetMatchingTemplate.mockResolvedValue(createMockTemplate({
                 keys: []
             }));
@@ -789,7 +795,16 @@ describe('HitContextMenu', () => {
             await waitFor(() => {
                 expect(screen.getByRole('menu')).toBeInTheDocument();
             });
-            expect(screen.queryByText('Include By')).toBeNull();
+            act(() => {
+                fireEvent.mouseEnter(screen.getByText('Include By'));
+            });
+            await waitFor(() => {
+                expect(screen.getByTestId('includes-submenu').textContent).toContain('howler.outline.indicators');
+            });
+            await act(async () => {
+                await user.click(screen.getByText('howler.outline.indicators'));
+            });
+            expect(mockParameterContext.setQuery).toHaveBeenCalledWith(expect.stringContaining('howler.outline.indicators:("a" OR "b" OR "c")'));
         });
         it('should skip null field values in inclusion menu', async () => {
             act(() => {
@@ -895,7 +910,7 @@ describe('HitContextMenu', () => {
             });
             expect(screen.queryByRole('menu')).toBeInTheDocument();
         });
-        it('should not render exclusion menu when template is null', async () => {
+        it('should render exclusion menu for outline fields when template is null', async () => {
             mockGetMatchingTemplate.mockResolvedValue(null);
             rerender(_jsx(Wrapper, { children: _jsx(RecordContextMenu, { getSelectedId: mockGetSelectedId, children: _jsx("div", { children: "Test Content" }) }) }));
             act(() => {
@@ -905,11 +920,9 @@ describe('HitContextMenu', () => {
             await waitFor(() => {
                 expect(screen.getByRole('menu')).toBeInTheDocument();
             });
-            await waitFor(() => {
-                expect(screen.queryByText('Exclude By')).toBeNull();
-            });
+            expect(screen.getByText('Exclude By')).toBeInTheDocument();
         });
-        it('should not render inclusion menu when template is null', async () => {
+        it('should render inclusion menu for outline fields when template is null', async () => {
             mockGetMatchingTemplate.mockResolvedValue(null);
             rerender(_jsx(Wrapper, { children: _jsx(RecordContextMenu, { getSelectedId: mockGetSelectedId, children: _jsx("div", { children: "Test Content" }) }) }));
             act(() => {
@@ -919,9 +932,7 @@ describe('HitContextMenu', () => {
             await waitFor(() => {
                 expect(screen.getByRole('menu')).toBeInTheDocument();
             });
-            await waitFor(() => {
-                expect(screen.queryByText('Include By')).toBeNull();
-            });
+            expect(screen.getByText('Include By')).toBeInTheDocument();
         });
         it('should handle API failure gracefully', async () => {
             mockDispatchApi.mockResolvedValue(null);

package/package.json

@@ -97,7 +97,7 @@
     "url": "https://github.com/CybercentreCanada/howler"
   },
   "type": "module",
-  "version": "3.1.0-dev.1649",
+  "version": "3.1.0-dev.1656",
   "exports": {
     "./i18n": "./i18n.js",
     "./index.css": "./index.css",