@cccsaurora/howler-ui 2.17.0-dev.617 → 2.17.1

package/api/index.d.ts

@@ -10,7 +10,6 @@ import * as overview from '@cccsaurora/howler-ui/api/overview';
 import * as search from '@cccsaurora/howler-ui/api/search';
 import * as template from '@cccsaurora/howler-ui/api/template';
 import * as user from '@cccsaurora/howler-ui/api/user';
-import * as v2 from '@cccsaurora/howler-ui/api/v2';
 import * as view from '@cccsaurora/howler-ui/api/view';
 /**
  * Defining the default export exposing all children routes of '/api/v1/'.
@@ -29,7 +28,6 @@ declare const api: {
     user: typeof user;
     view: typeof view;
     notebook: typeof notebook;
-    v2: typeof v2;
 };
 /**
  * The specification interface of an Howler HTTP response.

package/api/index.js

@@ -10,7 +10,6 @@ import * as overview from '@cccsaurora/howler-ui/api/overview';
 import * as search from '@cccsaurora/howler-ui/api/search';
 import * as template from '@cccsaurora/howler-ui/api/template';
 import * as user from '@cccsaurora/howler-ui/api/user';
-import * as v2 from '@cccsaurora/howler-ui/api/v2';
 import * as view from '@cccsaurora/howler-ui/api/view';
 import AxiosClient from '@cccsaurora/howler-ui/rest/AxiosClient';
 import urlJoin from 'url-join';
@@ -39,8 +38,7 @@ const api = {
     template,
     user,
     view,
-    notebook,
-    v2
+    notebook
 };
 /**
  * The base section of the Howler API uri.
@@ -59,7 +57,7 @@ export const uri = () => {
  * @returns `string` - properly formatted howler uri.
  */
 const format = (_uri) => {
-    return _uri.startsWith('/api') ? _uri : `${uri()}/${_uri.replace(/\/$/, '')}`;
+    return _uri.startsWith(uri()) ? _uri : `${uri()}/${_uri.replace(/\/$/, '')}`;
 };
 /**
  * Append series of search parameters to the specified uri.

package/api/search/index.d.ts

@@ -1,6 +1,5 @@
 import * as action from '@cccsaurora/howler-ui/api/search/action';
 import * as analytic from '@cccsaurora/howler-ui/api/search/analytic';
-import * as case_ from '@cccsaurora/howler-ui/api/search/case';
 import * as count from '@cccsaurora/howler-ui/api/search/count';
 import * as dossier from '@cccsaurora/howler-ui/api/search/dossier';
 import * as facet from '@cccsaurora/howler-ui/api/search/facet';
@@ -61,4 +60,4 @@ export type HowlerExplainSearchResponse = {
         explanation: string;
     }[];
 };
-export { action, analytic, case_ as case, count, dossier, facet, fields, grouped, histogram, hit, overview, template, user, view };
+export { action, analytic, count, dossier, facet, fields, grouped, histogram, hit, overview, template, user, view };

package/api/search/index.js

@@ -1,7 +1,6 @@
 import { joinUri, uri as parentUri } from '@cccsaurora/howler-ui/api';
 import * as action from '@cccsaurora/howler-ui/api/search/action';
 import * as analytic from '@cccsaurora/howler-ui/api/search/analytic';
-import * as case_ from '@cccsaurora/howler-ui/api/search/case';
 import * as count from '@cccsaurora/howler-ui/api/search/count';
 import * as dossier from '@cccsaurora/howler-ui/api/search/dossier';
 import * as facet from '@cccsaurora/howler-ui/api/search/facet';
@@ -16,4 +15,4 @@ import * as view from '@cccsaurora/howler-ui/api/search/view';
 export const uri = () => {
     return joinUri(parentUri(), 'search');
 };
-export { action, analytic, case_ as case, count, dossier, facet, fields, grouped, histogram, hit, overview, template, user, view };
+export { action, analytic, count, dossier, facet, fields, grouped, histogram, hit, overview, template, user, view };

package/commons/components/leftnav/LeftNavDrawer.js

@@ -75,7 +75,7 @@ const LeftNavDrawer = () => {
                     }
                 }, children: _jsx(AppName, {}) }), !isTopLayout && _jsx(Divider, {})] }));
     const hide = (_jsx(List, { disablePadding: true, children: _jsxs(ListItemButton, { onClick: leftnav.toggle, children: [_jsx(ListItemIcon, { children: leftnav.open ? _jsx(ChevronLeftIcon, {}) : _jsx(ChevronRightIcon, {}) }), _jsx(ListItemText, { primary: t('drawer.collapse') })] }, "chevron") }));
-    return (_jsx(ClickAwayListener, { mouseEvent: "onMouseDown", touchEvent: "onTouchStart", onClickAway: onCloseDrawerIfOpen, children: _jsxs(StyledDrawer, { variant: "permanent", style: { height: '100%' }, width: preferences.leftnav.width, open: leftnav.open, children: [leftnav.open ? (header) : (_jsx(Tooltip, { title: preferences.appName, "aria-label": preferences.appName, placement: "right", children: header })), _jsx(List, { disablePadding: true, children: leftnav.elements.map((e, i) => {
+    return (_jsx(ClickAwayListener, { mouseEvent: "onMouseDown", touchEvent: "onTouchStart", onClickAway: onCloseDrawerIfOpen, children: _jsxs(StyledDrawer, { PaperProps: { elevation: 1 }, variant: "permanent", style: { height: '100%' }, width: preferences.leftnav.width, open: leftnav.open, children: [leftnav.open ? (header) : (_jsx(Tooltip, { title: preferences.appName, "aria-label": preferences.appName, placement: "right", children: header })), _jsx(List, { disablePadding: true, children: leftnav.elements.map((e, i) => {
                         if (e.type === 'item') {
                             const item = e.element;
                             return _jsx(LeftNavItem, { item: item, onClick: isSmDown && onCloseDrawerIfOpen }, item.id);

package/components/app/App.js

@@ -25,8 +25,6 @@ import UserSearchProvider from '@cccsaurora/howler-ui/components/routes/admin/us
 import QueryBuilder from '@cccsaurora/howler-ui/components/routes/advanced/QueryBuilder';
 import AnalyticDetails from '@cccsaurora/howler-ui/components/routes/analytics/AnalyticDetails';
 import AnalyticSearch from '@cccsaurora/howler-ui/components/routes/analytics/AnalyticSearch';
-import CaseViewer from '@cccsaurora/howler-ui/components/routes/cases/CaseViewer';
-import Cases from '@cccsaurora/howler-ui/components/routes/cases/Cases';
 import DossierEditor from '@cccsaurora/howler-ui/components/routes/dossiers/DossierEditor';
 import Dossiers from '@cccsaurora/howler-ui/components/routes/dossiers/Dossiers';
 import ActionDocumentation from '@cccsaurora/howler-ui/components/routes/help/ActionDocumentation';
@@ -187,18 +185,6 @@ const router = createBrowserRouter([
                 path: 'bundles/:id',
                 element: _jsx(HitBrowser, {})
             },
-            {
-                path: 'cases',
-                element: _jsx(Cases, {})
-            },
-            {
-                path: 'cases/:id',
-                element: _jsx(CaseViewer, {})
-            },
-            {
-                path: 'cases/:id/*',
-                element: _jsx(CaseViewer, {})
-            },
             {
                 path: 'templates',
                 element: _jsx(Templates, {})

package/components/app/providers/FavouritesProvider.js

@@ -120,11 +120,11 @@ const FavouriteProvider = ({ children }) => {
         (async () => {
             const analyticElement = processAnalyticElement();
             if (analyticElement) {
-                newElements.splice(2, 0, analyticElement);
+                newElements.splice(1, 0, analyticElement);
             }
             const viewElement = await processViewElement();
             if (viewElement) {
-                newElements.splice(2, 0, viewElement);
+                newElements.splice(1, 0, viewElement);
             }
             leftNav.setElements(newElements);
         })();

package/components/app/providers/HitSearchProvider.d.ts

@@ -11,6 +11,7 @@ export interface HitSearchContextType {
     searching: boolean;
     error: string | null;
     response: HowlerSearchResponse<WithMetadata<Hit>> | null;
+    bundleId: string | null;
     fzfSearch: boolean;
     setDisplayType: (type: 'list' | 'grid') => void;
     setFzfSearch: Dispatch<SetStateAction<boolean>>;

package/components/app/providers/HitSearchProvider.js

@@ -33,7 +33,6 @@ const HitSearchProvider = ({ children }) => {
     const trackTotalHits = useContextSelector(ParameterContext, ctx => ctx.trackTotalHits);
     const sort = useContextSelector(ParameterContext, ctx => ctx.sort);
     const span = useContextSelector(ParameterContext, ctx => ctx.span);
-    const indexes = useContextSelector(ParameterContext, ctx => ctx.indexes);
     const allFilters = useContextSelector(ParameterContext, ctx => ctx.filters);
     const startDate = useContextSelector(ParameterContext, ctx => ctx.startDate);
     const endDate = useContextSelector(ParameterContext, ctx => ctx.endDate);
@@ -48,6 +47,7 @@ const HitSearchProvider = ({ children }) => {
         'howler.id: *': new Date().toISOString()
     });
     const [fzfSearch, setFzfSearch] = useState(false);
+    const bundleId = useMemo(() => (location.pathname.startsWith('/bundles') ? routeParams.id : null), [location.pathname, routeParams.id]);
     const filters = useMemo(() => allFilters.filter(filter => !filter.endsWith('*')), [allFilters]);
     // On load check to filter out any queries older than one month
     useEffect(() => {
@@ -70,6 +70,11 @@ const HitSearchProvider = ({ children }) => {
         else if (startDate && endDate) {
             _filters.push(`event.created:${convertCustomDateRangeToLucene(startDate, endDate)}`);
         }
+        // Add bundle filter
+        const bundle = location.pathname.startsWith('/bundles') && routeParams.id;
+        if (bundle) {
+            _filters.push(`howler.bundles:${bundle}`);
+        }
         // Fetch all view queries
         if (views.length > 0) {
             const viewObjects = await getCurrentViews({ views });
@@ -80,7 +85,7 @@ const HitSearchProvider = ({ children }) => {
                 .forEach(viewQuery => _filters.push(viewQuery));
         }
         return _filters;
-    }, [endDate, filters, getCurrentViews, span, startDate, views]);
+    }, [endDate, filters, getCurrentViews, location.pathname, routeParams.id, span, startDate, views]);
     const search = useCallback(async (_query, appendResults) => {
         THROTTLER.debounce(async () => {
             if (_query === 'woof!') {
@@ -100,7 +105,7 @@ const HitSearchProvider = ({ children }) => {
             setSearching(true);
             setError(null);
             try {
-                const _response = await dispatchApi(api.v2.search.post(indexes, {
+                const _response = await dispatchApi(api.search.hit.post({
                     offset: appendResults && response ? response.rows : offset,
                     rows: pageCount,
                     query: _query || DEFAULT_QUERY,
@@ -142,7 +147,6 @@ const HitSearchProvider = ({ children }) => {
         startDate,
         endDate,
         filters,
-        indexes,
         setQuery,
         location.pathname,
         routeParams.id,
@@ -161,14 +165,14 @@ const HitSearchProvider = ({ children }) => {
         if (span?.endsWith('custom') && (!startDate || !endDate)) {
             return;
         }
-        if (views.length > 0 || (query && query !== DEFAULT_QUERY) || offset > 0 || filters.length > 0) {
+        if (views.length > 0 || bundleId || (query && query !== DEFAULT_QUERY) || offset > 0 || filters.length > 0) {
             search(query);
         }
         else {
             setResponse(null);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [offset, pageCount, sort, span, indexes, location.pathname, startDate, endDate, filters, query, views]);
+    }, [offset, pageCount, sort, span, bundleId, location.pathname, startDate, endDate, filters, query, views]);
     return (_jsx(HitSearchContext.Provider, { value: {
             displayType,
             setDisplayType,
@@ -177,6 +181,7 @@ const HitSearchProvider = ({ children }) => {
             getFilters,
             error,
             response,
+            bundleId,
             setQueryHistory,
             queryHistory,
             fzfSearch,

package/components/app/providers/HitSearchProvider.test.js

@@ -30,7 +30,6 @@ let mockParameterContext = {
         mockParameterContext.offset = parseInt(offset);
     },
     views: [],
-    indexes: ['hit'],
     addView: vi.fn()
 };
 const originalMockParameterContext = cloneDeep(mockParameterContext);
@@ -65,14 +64,22 @@ describe('HitSearchContext', () => {
             searching: ctx.searching,
             error: ctx.error,
             response: ctx.response,
+            bundleId: ctx.bundleId,
             fzfSearch: ctx.fzfSearch
         })), { wrapper: Wrapper });
         expect(hook.result.current.displayType).toBe('list');
         expect(hook.result.current.searching).toBe(false);
         expect(hook.result.current.error).toBeNull();
         expect(hook.result.current.response).toBeNull();
+        expect(hook.result.current.bundleId).toBeNull();
         expect(hook.result.current.fzfSearch).toBe(false);
     });
+    it('should set bundleId when on bundles route', () => {
+        mockLocation.pathname = '/bundles/test_bundle_id';
+        mockParams.mockReturnValue({ id: 'test_bundle_id' });
+        const hook = renderHook(() => useContextSelector(HitSearchContext, ctx => ctx.bundleId), { wrapper: Wrapper });
+        expect(hook.result.current).toBe('test_bundle_id');
+    });
     it('should initialize queryHistory from localStorage', () => {
         const mockHistory = { 'test:query': new Date().toISOString() };
         mockLocalStorage.setItem(`${MY_LOCAL_STORAGE_PREFIX}.${StorageKey.QUERY_HISTORY}`, JSON.stringify(mockHistory));
@@ -130,7 +137,7 @@ describe('HitSearchContext', () => {
                 hook.result.current.search('test query');
             });
             await waitFor(() => {
-                expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                     query: expect.stringContaining('test query')
                 }));
             });
@@ -214,13 +221,27 @@ describe('HitSearchContext', () => {
                 expect(hook.result.current.response?.items.length).toBe(2);
             });
         });
+        it('should include bundle filter when on bundles route', async () => {
+            mockLocation.pathname = '/bundles/test_bundle_id';
+            mockParams.mockReturnValue({ id: 'test_bundle_id' });
+            const hook = renderHook(() => useContextSelector(HitSearchContext, ctx => ctx.search), { wrapper: Wrapper });
+            act(() => {
+                hook.result.current('test query');
+            });
+            await waitFor(() => {
+                expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
+                    query: 'test query',
+                    filters: ['event.created:[now-1w TO now]', 'howler.bundles:test_bundle_id']
+                }));
+            });
+        });
         it('should apply date range filter from span', async () => {
             const hook = renderHook(() => useContextSelector(HitSearchContext, ctx => ctx.search), { wrapper: Wrapper });
             act(() => {
                 hook.result.current('test query');
             });
             await waitFor(() => {
-                expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                     filters: expect.arrayContaining([expect.stringContaining('event.created:')])
                 }));
             });
@@ -234,7 +255,7 @@ describe('HitSearchContext', () => {
                 hook.result.current('test query');
             });
             await waitFor(() => {
-                expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                     filters: expect.arrayContaining([expect.stringContaining('event.created:')])
                 }));
             });
@@ -246,7 +267,7 @@ describe('HitSearchContext', () => {
                 hook.result.current('test query');
             });
             await waitFor(() => {
-                expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                     filters: expect.not.arrayContaining([expect.stringContaining('howler.escalation:*')])
                 }));
             });
@@ -299,7 +320,7 @@ describe('HitSearchContext', () => {
                 expect(hpost).toHaveBeenCalled();
             }, { timeout: 2000 });
         });
-        it('should not trigger search when query is DEFAULT_QUERY', async () => {
+        it('should not trigger search when query is DEFAULT_QUERY and no bundleId', async () => {
             mockParameterContext.query = DEFAULT_QUERY;
             renderHook(() => useContextSelector(HitSearchContext, ctx => ctx.response), { wrapper: Wrapper });
             await waitFor(() => {
@@ -337,7 +358,7 @@ describe('HitSearchContext', () => {
                 expect(hpost).toHaveBeenCalledTimes(1);
             }, { timeout: 2000 });
         });
-        it('should clear response when query becomes DEFAULT_QUERY without viewId', async () => {
+        it('should clear response when query becomes DEFAULT_QUERY without viewId or bundleId', async () => {
             const hook = renderHook(() => useContextSelector(HitSearchContext, ctx => ctx.response), { wrapper: Wrapper });
             await waitFor(() => {
                 expect(hook.result.current).toBeDefined();
@@ -363,7 +384,7 @@ describe('HitSearchContext', () => {
                     hook.result.current('test query');
                 });
                 await waitFor(() => {
-                    expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                    expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                         query: 'test query',
                         filters: expect.arrayContaining(['howler.status:open', 'howler.priority:high'])
                     }));
@@ -381,7 +402,7 @@ describe('HitSearchContext', () => {
                     hook.result.current('test query');
                 });
                 await waitFor(() => {
-                    expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                    expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                         query: 'test query',
                         filters: [
                             'event.created:[now-1w TO now]',
@@ -438,7 +459,7 @@ describe('HitSearchContext', () => {
                     hook.result.current('test query');
                 });
                 await waitFor(() => {
-                    expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                    expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                         query: expect.stringContaining('test query'),
                         filters: ['event.created:[now-1w TO now]']
                     }));
@@ -455,7 +476,7 @@ describe('HitSearchContext', () => {
                     hook.result.current('test query');
                 });
                 await waitFor(() => {
-                    expect(hpost).toHaveBeenCalledWith('/api/v2/search/hit', expect.objectContaining({
+                    expect(hpost).toHaveBeenCalledWith('/api/v1/search/hit', expect.objectContaining({
                         query: 'test query',
                         filters: ['event.created:[now-1w TO now]', 'howler.status:open', 'howler.priority:high']
                     }));

package/components/app/providers/LocalStorageProvider.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import useLocalStorage from '@cccsaurora/howler-ui/commons/components/utils/hooks/useLocalStorage';
+import useLocalStorage from '@cccsaurora/howler-ui/components/hooks/useLocalStorage';
 import { createContext, useCallback, useEffect, useState } from 'react';
 import { MY_LOCAL_STORAGE_PREFIX, StorageKey } from '@cccsaurora/howler-ui/utils/constants';
 export const LocalStorageContext = createContext(null);

package/components/app/providers/ParameterProvider.d.ts

@@ -1,5 +1,4 @@
 import type { FC, PropsWithChildren } from 'react';
-export type SearchIndex = 'hit' | 'observable' | 'case';
 export interface ParameterContextType {
     selected?: string;
     query?: string;
@@ -7,7 +6,6 @@ export interface ParameterContextType {
     trackTotalHits: boolean;
     sort?: string;
     span?: string;
-    indexes?: SearchIndex[];
     filters?: string[];
     startDate?: string;
     endDate?: string;
@@ -21,16 +19,11 @@ export interface ParameterContextType {
     addFilter: (filter: string) => void;
     removeFilter: (filter: string) => void;
     setFilter: (index: number, filter: string) => void;
-    resetFilters: () => void;
-    addIndex: (index: SearchIndex) => void;
-    removeIndex: (index: SearchIndex) => void;
-    setIndex: (position: number, index: SearchIndex) => void;
-    setIndexes: (indexes: SearchIndex[]) => void;
-    resetIndexes: () => void;
+    clearFilters: () => void;
     addView: (view: string) => void;
     removeView: (view: string) => void;
     setView: (index: number, view: string) => void;
-    resetViews: () => void;
+    clearViews: () => void;
 }
 export declare const ParameterContext: import("use-context-selector").Context<ParameterContextType>;
 /**