@cccsaurora/howler-ui 2.13.0-dev.142 → 2.13.0-dev.148

package/components/app/App.js

@@ -59,7 +59,6 @@ import { createBrowserRouter, Outlet, RouterProvider, useLocation, useNavigate }
 import { StorageKey } from '@cccsaurora/howler-ui/utils/constants';
 import useMySearch from '../hooks/useMySearch';
 import AppContainer from './AppContainer';
-import AnalyticProvider from './providers/AnalyticProvider';
 import ApiConfigProvider, { ApiConfigContext } from './providers/ApiConfigProvider';
 import AvatarProvider from './providers/AvatarProvider';
 import CustomPluginProvider from './providers/CustomPluginProvider';
@@ -138,7 +137,7 @@ const MyAppProvider = ({ children }) => {
     const mySitemap = useMySitemap();
     const myUser = useMyUser();
     const mySearch = useMySearch();
-    return (_jsx(ErrorBoundary, { children: _jsx(AppProvider, { preferences: myPreferences, theme: myTheme, sitemap: mySitemap, user: myUser, search: mySearch, children: _jsx(CustomPluginProvider, { children: _jsx(ErrorBoundary, { children: _jsx(ErrorBoundary, { children: _jsx(ViewProvider, { children: _jsx(AvatarProvider, { children: _jsx(ModalProvider, { children: _jsx(FieldProvider, { children: _jsx(LocalStorageProvider, { children: _jsx(SocketProvider, { children: _jsx(HitProvider, { children: _jsx(OverviewProvider, { children: _jsx(AnalyticProvider, { children: _jsx(FavouriteProvider, { children: _jsx(UserListProvider, { children: children }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }));
+    return (_jsx(ErrorBoundary, { children: _jsx(AppProvider, { preferences: myPreferences, theme: myTheme, sitemap: mySitemap, user: myUser, search: mySearch, children: _jsx(CustomPluginProvider, { children: _jsx(ErrorBoundary, { children: _jsx(ErrorBoundary, { children: _jsx(ViewProvider, { children: _jsx(AvatarProvider, { children: _jsx(ModalProvider, { children: _jsx(FieldProvider, { children: _jsx(LocalStorageProvider, { children: _jsx(SocketProvider, { children: _jsx(HitProvider, { children: _jsx(OverviewProvider, { children: _jsx(FavouriteProvider, { children: _jsx(UserListProvider, { children: children }) }) }) }) }) }) }) }) }) }) }) }) }) }) }));
 };
 const AppProviderWrapper = () => {
     return (_jsx(I18nextProvider, { i18n: i18n, defaultNS: "translation", children: _jsx(ApiConfigProvider, { children: _jsx(PluginProvider, { pluginStore: howlerPluginStore.pluginStore, children: _jsxs(MyAppProvider, { children: [_jsx(MyApp, {}), _jsx(Modal, {})] }) }) }) }));

package/components/app/hooks/useMatchers.d.ts

@@ -4,5 +4,6 @@ declare const useMatchers: () => {
     getMatchingDossiers: (hit: WithMetadata<Hit>) => Promise<import("../../../models/entities/generated/Dossier").Dossier[]>;
     getMatchingOverview: (hit: WithMetadata<Hit>) => Promise<import("../../../models/entities/generated/Overview").Overview>;
     getMatchingTemplate: (hit: WithMetadata<Hit>) => Promise<import("../../../models/entities/generated/Template").Template>;
+    getMatchingAnalytic: (hit: WithMetadata<Hit>) => Promise<import("../../../models/entities/generated/Analytic").Analytic>;
 };
 export default useMatchers;

package/components/app/hooks/useMatchers.js

@@ -37,10 +37,21 @@ const useMatchers = () => {
         // should also exist
         return (await getHit(hit.howler.id, true)).__dossiers;
     }, [getHit]);
+    const getMatchingAnalytic = useCallback(async (hit) => {
+        if (!hit) {
+            return null;
+        }
+        if (has(hit, '__analytic')) {
+            return hit.__analytic;
+        }
+        // This is a fallback in case metadata is not included.
+        return (await getHit(hit.howler.id, true)).__analytic;
+    }, [getHit]);
     return {
         getMatchingDossiers,
         getMatchingOverview,
-        getMatchingTemplate
+        getMatchingTemplate,
+        getMatchingAnalytic
     };
 };
 export default useMatchers;

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

@@ -3,10 +3,6 @@ import { type FC, type PropsWithChildren } from 'react';
 interface AnalyticContextType {
     ready: boolean;
     analytics: Analytic[];
-    addFavourite: (analytic: Analytic) => Promise<void>;
-    removeFavourite: (analytic: Analytic) => Promise<void>;
-    getIdFromName: (name: string) => Promise<string>;
-    getAnalyticFromName: (name: string) => Promise<Analytic>;
     getAnalyticFromId: (id: string) => Promise<Analytic>;
 }
 export declare const AnalyticContext: import("react").Context<AnalyticContextType>;

package/components/app/providers/AnalyticProvider.js

@@ -2,7 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import api from '@cccsaurora/howler-ui/api';
 import { useAppUser } from '@cccsaurora/howler-ui/commons/components/app/hooks';
 import { createContext, useCallback, useEffect, useState } from 'react';
-import { sanitizeLuceneQuery } from '@cccsaurora/howler-ui/utils/stringUtils';
 export const AnalyticContext = createContext(null);
 /**
  * A set of promises for each analytic search. This is to stop several identical
@@ -32,20 +31,6 @@ const AnalyticProvider = ({ children }) => {
             fetchAnalytics();
         }
     }, [ready, appUser, fetchAnalytics]);
-    const addFavourite = useCallback(async (analytic) => {
-        await api.analytic.favourite.post(analytic.analytic_id);
-        appUser.setUser({
-            ...appUser.user,
-            favourite_analytics: [...appUser.user.favourite_analytics, analytic.analytic_id]
-        });
-    }, [appUser]);
-    const removeFavourite = useCallback(async (analytic) => {
-        await api.analytic.favourite.del(analytic.analytic_id);
-        appUser.setUser({
-            ...appUser.user,
-            favourite_analytics: appUser.user.favourite_analytics.filter(v => v !== analytic.analytic_id)
-        });
-    }, [appUser]);
     const getAnalyticFromId = useCallback(async (id) => {
         const candidate = analytics?.find(_analytic => _analytic.analytic_id === id);
         if (candidate) {
@@ -71,34 +56,6 @@ const AnalyticProvider = ({ children }) => {
         }
         return null;
     }, [analytics]);
-    const getAnalyticFromName = useCallback(async (name) => {
-        const candidate = analytics.find(_analytic => _analytic.name === name);
-        if (candidate) {
-            return candidate;
-        }
-        // We check to see if there's already a request in progress
-        if (!PROMISES[name]) {
-            PROMISES[name] = api.search.analytic.post({
-                query: `name:(${sanitizeLuceneQuery(name)})`
-            });
-        }
-        try {
-            const result = await PROMISES[name];
-            const analytic = result.items?.[0];
-            if (analytic) {
-                setAnalytics([...analytics, analytic]);
-                return analytic;
-            }
-        }
-        catch (e) {
-            // eslint-disable-next-line no-console
-            console.error(e);
-        }
-        return null;
-    }, [analytics]);
-    const getIdFromName = useCallback(async (name) => {
-        return (await getAnalyticFromName(name))?.analytic_id;
-    }, [getAnalyticFromName]);
-    return (_jsx(AnalyticContext.Provider, { value: { analytics, ready, addFavourite, removeFavourite, getAnalyticFromName, getAnalyticFromId, getIdFromName }, children: children }));
+    return (_jsx(AnalyticContext.Provider, { value: { analytics, ready, getAnalyticFromId }, children: children }));
 };
 export default AnalyticProvider;

package/components/elements/display/ActionButton.d.ts

@@ -0,0 +1,8 @@
+import { type ButtonProps } from '@mui/material';
+import { type FC } from 'react';
+declare const ActionButton: FC<{
+    actionId: string;
+    hitId: string;
+    label: string;
+} & ButtonProps>;
+export default ActionButton;

package/components/elements/display/ActionButton.js

@@ -0,0 +1,18 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Button } from '@mui/material';
+import api from '@cccsaurora/howler-ui/api';
+import useMyApi from '@cccsaurora/howler-ui/components/hooks/useMyApi';
+import useMyActionFunctions from '@cccsaurora/howler-ui/components/routes/action/useMyActionFunctions';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+const ActionButton = ({ actionId, hitId, label, ...otherProps }) => {
+    const { t } = useTranslation();
+    const { dispatchApi } = useMyApi();
+    const { executeAction } = useMyActionFunctions();
+    const [action, setAction] = useState(null);
+    useEffect(() => {
+        dispatchApi(api.search.action.post({ query: `action_id:${actionId}`, rows: 1 })).then(result => setAction(result.items[0]));
+    }, [actionId, dispatchApi]);
+    return (_jsx(Button, { variant: otherProps.variant ?? 'outlined', disabled: !action, onClick: () => executeAction(actionId, `howler.id:${hitId}`), color: otherProps.color ?? 'primary', children: label ?? action?.name ?? t('loading') }));
+};
+export default ActionButton;

package/components/elements/display/handlebars/helpers.js

@@ -10,6 +10,7 @@ import { capitalize, get, groupBy, isObject } from 'lodash-es';
 import howlerPluginStore from '@cccsaurora/howler-ui/plugins/store';
 import { useMemo } from 'react';
 import { usePluginStore } from 'react-pluggable';
+import ActionButton from '../ActionButton';
 import JSONViewer from '../json/JSONViewer';
 const FETCH_RESULTS = {};
 export const useHelpers = () => {
@@ -147,6 +148,17 @@ export const useHelpers = () => {
                                 }) })] }) }));
             }
         },
+        {
+            keyword: 'action',
+            documentation: 'Execute a howler action given a specific action ID (from the URL when viewing the action, i.e. yaIKVqiKhWpyCsWdqsE4D)',
+            componentCallback: (actionId, hitId, context) => {
+                if (!actionId || !hitId) {
+                    console.warn('Missing parameters for the action button.');
+                    return null;
+                }
+                return _jsx(ActionButton, { actionId: actionId, hitId: hitId, ...(context.hash ?? {}) });
+            }
+        },
         ...howlerPluginStore.plugins.flatMap(plugin => pluginStore.executeFunction(`${plugin}.helpers`))
     ], [pluginStore]);
     return allHelpers;

package/components/elements/hit/HitActions.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { MoreHoriz } from '@mui/icons-material';
 import { Box, CircularProgress, Divider, FormControl, FormControlLabel, FormLabel, IconButton, Menu, Radio, RadioGroup, Stack, Switch, useMediaQuery } from '@mui/material';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
+import useMatchers from '@cccsaurora/howler-ui/components/app/hooks/useMatchers';
 import { ApiConfigContext } from '@cccsaurora/howler-ui/components/app/providers/ApiConfigProvider';
 import { HitContext } from '@cccsaurora/howler-ui/components/app/providers/HitProvider';
 import { HitSearchContext } from '@cccsaurora/howler-ui/components/app/providers/HitSearchProvider';
@@ -27,7 +27,7 @@ const HitActions = ({ hit, orientation = 'horizontal' }) => {
     const { config } = useContext(ApiConfigContext);
     const { values, set } = useMyLocalStorageProvider();
     const pluginStore = usePluginStore();
-    const { getAnalyticFromName } = useContext(AnalyticContext);
+    const { getMatchingAnalytic } = useMatchers();
     const getCurrentView = useContextSelector(ViewContext, ctx => ctx.getCurrentView);
     const selected = useContextSelector(ParameterContext, ctx => ctx?.selected);
     const setSelected = useContextSelector(ParameterContext, ctx => ctx?.setSelected);
@@ -112,11 +112,9 @@ const HitActions = ({ hit, orientation = 'horizontal' }) => {
         }
     }, [keyboardDownHandler]);
     useEffect(() => {
-        (async () => {
-            setAnalytic(await getAnalyticFromName(hit.howler.analytic));
-        })();
+        getMatchingAnalytic(hit).then(setAnalytic);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [hit.howler.analytic]);
+    }, [hit?.howler.analytic]);
     const handleOpenSetting = useCallback((e) => setOpenSetting(e.currentTarget), []);
     const handleCloseSetting = useCallback(() => setOpenSetting(null), []);
     const onShortcutChange = useCallback((__, s) => set(StorageKey.HIT_SHORTCUTS, s), [set]);

package/components/elements/hit/HitBanner.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Chip, Divider, Grid, Stack, Tooltip, Typography, avatarClasses, iconButtonClasses, useTheme } from '@mui/material';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
+import useMatchers from '@cccsaurora/howler-ui/components/app/hooks/useMatchers';
 import { ApiConfigContext } from '@cccsaurora/howler-ui/components/app/providers/ApiConfigProvider';
 import { uniq } from 'lodash-es';
 import howlerPluginStore from '@cccsaurora/howler-ui/plugins/store';
@@ -19,15 +19,19 @@ import { HitLayout } from './HitLayout';
 const HitBanner = ({ hit, layout = HitLayout.NORMAL, showAssigned = true }) => {
     const { t } = useTranslation();
     const { config } = useContext(ApiConfigContext);
-    const { getIdFromName } = useContext(AnalyticContext);
     const theme = useTheme();
     const pluginStore = usePluginStore();
+    const { getMatchingAnalytic } = useMatchers();
     const [analyticId, setAnalyticId] = useState();
     const compressed = useMemo(() => layout === HitLayout.DENSE, [layout]);
     const textVariant = useMemo(() => (layout === HitLayout.COMFY ? 'body1' : 'caption'), [layout]);
     useEffect(() => {
-        getIdFromName(hit?.howler.analytic).then(setAnalyticId);
-    }, [getIdFromName, hit]);
+        if (!hit?.howler.analytic) {
+            return;
+        }
+        getMatchingAnalytic(hit).then(analytic => setAnalyticId(analytic.analytic_id));
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [hit?.howler.analytic]);
     const providerColor = useMemo(() => PROVIDER_COLORS[hit.event?.provider ?? 'unknown'] ?? stringToColor(hit.event.provider), [hit.event?.provider]);
     const mitreId = useMemo(() => {
         if (hit.threat?.framework?.toLowerCase().startsWith('mitre')) {

package/components/elements/hit/HitComments.js

@@ -3,7 +3,7 @@ import { Clear, KeyboardArrowDown, Send } from '@mui/icons-material';
 import { Accordion, AccordionDetails, AccordionSummary, AvatarGroup, Chip, IconButton, Skeleton, Stack, TextField, Typography } from '@mui/material';
 import api from '@cccsaurora/howler-ui/api';
 import { useAppUser } from '@cccsaurora/howler-ui/commons/components/app/hooks';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
+import useMatchers from '@cccsaurora/howler-ui/components/app/hooks/useMatchers';
 import { SocketContext } from '@cccsaurora/howler-ui/components/app/providers/SocketProvider';
 import FlexOne from '@cccsaurora/howler-ui/components/elements/addons/layout/FlexOne';
 import useMyApi from '@cccsaurora/howler-ui/components/hooks/useMyApi';
@@ -20,8 +20,8 @@ const HitComments = ({ hit, users }) => {
     const { t } = useTranslation();
     const navigate = useNavigate();
     const { dispatchApi } = useMyApi();
-    const { getAnalyticFromName } = useContext(AnalyticContext);
     const { addListener, removeListener, emit } = useContext(SocketContext);
+    const { getMatchingAnalytic } = useMatchers();
     const [typers, setTypers] = useState([]);
     const [loading, setLoading] = useState(false);
     const [showClear, setShowClear] = useState(false);
@@ -51,12 +51,13 @@ const HitComments = ({ hit, users }) => {
     }, [handler]);
     useEffect(() => {
         if (hit?.howler?.analytic) {
-            getAnalyticFromName(hit?.howler?.analytic).then(analytic => {
+            getMatchingAnalytic(hit).then(analytic => {
                 setAnalyticId(analytic?.analytic_id);
                 setAnalyticComments(sortByTimestamp(analytic?.comment ?? []));
             });
         }
-    }, [getAnalyticFromName, hit?.howler?.analytic]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [getMatchingAnalytic, hit?.howler?.analytic]);
     const onSubmit = useCallback(async () => {
         if (!input.current?.value || !hit || input.current.value.length > MAX_LENGTH)
             return;

package/components/routes/analytics/AnalyticSearch.js

@@ -4,7 +4,6 @@ import { AvatarGroup, Card, CardContent, CardHeader, Chip, Divider, Grid, IconBu
 import api from '@cccsaurora/howler-ui/api';
 import { useAppUser } from '@cccsaurora/howler-ui/commons/components/app/hooks';
 import useLocalStorageItem from '@cccsaurora/howler-ui/commons/components/utils/hooks/useLocalStorageItem';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
 import FlexOne from '@cccsaurora/howler-ui/components/elements/addons/layout/FlexOne';
 import { TuiListProvider } from '@cccsaurora/howler-ui/components/elements/addons/lists';
 import { TuiListMethodContext } from '@cccsaurora/howler-ui/components/elements/addons/lists/TuiListProvider';
@@ -26,13 +25,26 @@ const AnalyticSearchBase = () => {
     const [searchParams, setSearchParams] = useSearchParams();
     const pageCount = useMyLocalStorageItem(StorageKey.PAGE_COUNT, 25)[0];
     const appUser = useAppUser();
-    const { addFavourite, removeFavourite } = useContext(AnalyticContext);
     const [onlyRules, setOnlyRules] = useLocalStorageItem(StorageKey.ONLY_RULES, 0);
     const [searching, setSearching] = useState(false);
     const [hasError, setHasError] = useState(false);
     const [phrase, setPhrase] = useState(searchParams.get('phrase') || '');
     const [offset, setOffset] = useState(parseInt(searchParams.get('offset')) || 0);
     const [response, setResponse] = useState(null);
+    const addFavourite = useCallback(async (analytic) => {
+        await dispatchApi(api.analytic.favourite.post(analytic.analytic_id));
+        appUser.setUser({
+            ...appUser.user,
+            favourite_analytics: [...appUser.user.favourite_analytics, analytic.analytic_id]
+        });
+    }, [appUser, dispatchApi]);
+    const removeFavourite = useCallback(async (analytic) => {
+        await dispatchApi(api.analytic.favourite.del(analytic.analytic_id));
+        appUser.setUser({
+            ...appUser.user,
+            favourite_analytics: appUser.user.favourite_analytics.filter(v => v !== analytic.analytic_id)
+        });
+    }, [appUser, dispatchApi]);
     // Search Handler.
     const onSearch = useCallback(async () => {
         setSearching(true);

package/components/routes/hits/search/HitContextMenu.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Assignment, Edit, HowToVote, KeyboardArrowRight, OpenInNew, QueryStats, SettingsSuggest, Terminal } from '@mui/icons-material';
 import { Box, Divider, Fade, ListItemIcon, ListItemText, Menu, MenuItem, MenuList, Paper } from '@mui/material';
 import api from '@cccsaurora/howler-ui/api';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
+import useMatchers from '@cccsaurora/howler-ui/components/app/hooks/useMatchers';
 import { ApiConfigContext } from '@cccsaurora/howler-ui/components/app/providers/ApiConfigProvider';
 import { HitContext } from '@cccsaurora/howler-ui/components/app/providers/HitProvider';
 import { TOP_ROW, VOTE_OPTIONS } from '@cccsaurora/howler-ui/components/elements/hit/actions/SharedComponents';
@@ -24,11 +24,11 @@ const ICON_MAP = {
 };
 const HitContextMenu = ({ children, getSelectedId, Component = Box }) => {
     const { t } = useTranslation();
-    const analyticContext = useContext(AnalyticContext);
     const { dispatchApi } = useMyApi();
     const { executeAction } = useMyActionFunctions();
     const { config } = useContext(ApiConfigContext);
     const pluginStore = usePluginStore();
+    const { getMatchingAnalytic } = useMatchers();
     const [id, setId] = useState(null);
     const hit = useContextSelector(HitContext, ctx => ctx.hits[id]);
     const selectedHits = useContextSelector(HitContext, ctx => ctx.selectedHits);
@@ -90,13 +90,12 @@ const HitContextMenu = ({ children, getSelectedId, Component = Box }) => {
         return Object.entries(groupBy(_actions, 'type')).sort(([a], [b]) => ORDER.indexOf(a) - ORDER.indexOf(b));
     }, [analytic, assess, availableTransitions, canAssess, canVote, config.lookups, vote, pluginActions]);
     useEffect(() => {
-        if (!hit) {
+        if (!hit?.howler.analytic) {
             return;
         }
-        (async () => {
-            setAnalytic(await analyticContext.getAnalyticFromName(hit.howler.analytic));
-        })();
-    }, [analyticContext, hit]);
+        getMatchingAnalytic(hit).then(setAnalytic);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [hit?.howler.analytic]);
     useEffect(() => {
         if (!anchorEl) {
             setClickLocation([-1, -1]);

package/components/routes/hits/search/InformationPane.js

@@ -4,7 +4,6 @@ import { Badge, Box, Divider, Skeleton, Stack, Tab, Tabs, Tooltip, useTheme } fr
 import TuiIconButton from '@cccsaurora/howler-ui/components/elements/addons/buttons/CustomIconButton';
 import { Icon } from '@iconify/react/dist/iconify.js';
 import useMatchers from '@cccsaurora/howler-ui/components/app/hooks/useMatchers';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
 import { HitContext } from '@cccsaurora/howler-ui/components/app/providers/HitProvider';
 import { ParameterContext } from '@cccsaurora/howler-ui/components/app/providers/ParameterProvider';
 import { SocketContext } from '@cccsaurora/howler-ui/components/app/providers/SocketProvider';
@@ -46,8 +45,7 @@ const InformationPane = ({ onClose }) => {
     const theme = useTheme();
     const location = useLocation();
     const { emit, isOpen } = useContext(SocketContext);
-    const { getAnalyticFromName } = useContext(AnalyticContext);
-    const { getMatchingOverview, getMatchingDossiers } = useMatchers();
+    const { getMatchingOverview, getMatchingDossiers, getMatchingAnalytic } = useMatchers();
     const selected = useContextSelector(ParameterContext, ctx => ctx.selected);
     const pluginStore = usePluginStore();
     const getHit = useContextSelector(HitContext, ctx => ctx.getHit);
@@ -75,10 +73,10 @@ const InformationPane = ({ onClose }) => {
             return;
         }
         setUserIds(getUserList(hit));
-        getAnalyticFromName(hit.howler.analytic).then(setAnalytic);
+        getMatchingAnalytic(hit).then(setAnalytic);
         getMatchingDossiers(hit).then(setDossiers);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [getAnalyticFromName, getHit, selected]);
+    }, [getHit, selected]);
     useEffect(() => {
         if (tab === 'hit_aggregate' && !hit?.howler.is_bundle) {
             setTab('overview');

package/components/routes/hits/search/grid/HitGrid.js

@@ -3,7 +3,7 @@ import { DndContext, KeyboardSensor, PointerSensor, pointerWithin, useSensor, us
 import { arrayMove, SortableContext, sortableKeyboardCoordinates } from '@dnd-kit/sortable';
 import { Add, FormatIndentDecrease, FormatIndentIncrease, Info, List, Search, TableChart } from '@mui/icons-material';
 import { IconButton, LinearProgress, Paper, Stack, Table, TableBody, TableCell, TableHead, TableRow, ToggleButton, ToggleButtonGroup, Typography, useTheme } from '@mui/material';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
+import useMatchers from '@cccsaurora/howler-ui/components/app/hooks/useMatchers';
 import { HitContext } from '@cccsaurora/howler-ui/components/app/providers/HitProvider';
 import { HitSearchContext } from '@cccsaurora/howler-ui/components/app/providers/HitSearchProvider';
 import { ParameterContext } from '@cccsaurora/howler-ui/components/app/providers/ParameterProvider';
@@ -14,7 +14,7 @@ import DevelopmentBanner from '@cccsaurora/howler-ui/components/elements/display
 import DevelopmentIcon from '@cccsaurora/howler-ui/components/elements/display/features/DevelopmentIcon';
 import useHitSelection from '@cccsaurora/howler-ui/components/hooks/useHitSelection';
 import { useMyLocalStorageItem } from '@cccsaurora/howler-ui/components/hooks/useMyLocalStorage';
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useContextSelector } from 'use-context-selector';
 import { StorageKey } from '@cccsaurora/howler-ui/utils/constants';
@@ -27,10 +27,10 @@ import ColumnHeader from './ColumnHeader';
 import HitRow from './HitRow';
 const HitGrid = () => {
     const { t } = useTranslation();
-    const { getIdFromName } = useContext(AnalyticContext);
     const theme = useTheme();
     const sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates }));
     const { onClick } = useHitSelection();
+    const { getMatchingAnalytic } = useMatchers();
     const search = useContextSelector(HitSearchContext, ctx => ctx.search);
     const displayType = useContextSelector(HitSearchContext, ctx => ctx.displayType);
     const setDisplayType = useContextSelector(HitSearchContext, ctx => ctx.setDisplayType);
@@ -65,10 +65,11 @@ const HitGrid = () => {
     useEffect(() => {
         response?.items.forEach(hit => {
             if (!analyticIds[hit.howler.analytic]) {
-                getIdFromName(hit.howler.analytic).then(_analyticId => setAnalyticIds(_analyticIds => ({ ..._analyticIds, [hit.howler.analytic]: _analyticId })));
+                getMatchingAnalytic(hit).then(_analytic => setAnalyticIds(_analyticIds => ({ ..._analyticIds, [hit.howler.analytic]: _analytic.analytic_id })));
             }
         });
-    }, [analyticIds, getIdFromName, response]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [analyticIds, response]);
     const onMouseMove = useCallback((event) => {
         event.stopPropagation();
         event.preventDefault();

package/components/routes/hits/view/HitViewer.js

@@ -4,7 +4,6 @@ import { Code, Comment, DataObject, History, LinkSharp, QueryStats, ViewAgenda }
 import { Badge, Box, CardContent, Collapse, IconButton, Skeleton, Stack, Tab, Tabs, Tooltip, useMediaQuery, useTheme } from '@mui/material';
 import PageCenter from '@cccsaurora/howler-ui/commons/components/pages/PageCenter';
 import useMatchers from '@cccsaurora/howler-ui/components/app/hooks/useMatchers';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
 import { HitContext } from '@cccsaurora/howler-ui/components/app/providers/HitProvider';
 import FlexOne from '@cccsaurora/howler-ui/components/elements/addons/layout/FlexOne';
 import HowlerCard from '@cccsaurora/howler-ui/components/elements/display/HowlerCard';
@@ -27,7 +26,7 @@ import RelatedLink from '@cccsaurora/howler-ui/components/elements/hit/related/R
 import { useMyLocalStorageItem } from '@cccsaurora/howler-ui/components/hooks/useMyLocalStorage';
 import useMyUserList from '@cccsaurora/howler-ui/components/hooks/useMyUserList';
 import uniqBy from 'lodash-es/uniqBy';
-import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useContextSelector } from 'use-context-selector';
@@ -47,8 +46,7 @@ const HitViewer = () => {
     const theme = useTheme();
     const isUnderLg = useMediaQuery(theme.breakpoints.down('lg'));
     const [orientation, setOrientation] = useMyLocalStorageItem(StorageKey.VIEWER_ORIENTATION, Orientation.VERTICAL);
-    const { getAnalyticFromName } = useContext(AnalyticContext);
-    const { getMatchingOverview, getMatchingDossiers } = useMatchers();
+    const { getMatchingOverview, getMatchingDossiers, getMatchingAnalytic } = useMatchers();
     const getHit = useContextSelector(HitContext, ctx => ctx.getHit);
     const hit = useContextSelector(HitContext, ctx => ctx.hits[params.id]);
     const [userIds, setUserIds] = useState(new Set());
@@ -64,14 +62,14 @@ const HitViewer = () => {
                 return;
             }
             setUserIds(getUserList(hit));
-            setAnalytic(await getAnalyticFromName(hit.howler.analytic));
+            setAnalytic(await getMatchingAnalytic(hit));
         }
         catch (err) {
             if (err.cause?.api_status_code === 404) {
                 navigate('/404');
             }
         }
-    }, [hit, getAnalyticFromName, getHit, params.id, navigate]);
+    }, [hit, getMatchingAnalytic, getHit, params.id, navigate]);
     useEffect(() => {
         if (isUnderLg) {
             setOrientation(Orientation.HORIZONTAL);

package/components/routes/overviews/OverviewViewer.js

@@ -8,7 +8,6 @@ import { Check, DarkMode, Delete, SsidChart, WbSunny } from '@mui/icons-material
 import { useApp } from '@cccsaurora/howler-ui/commons/components/app/hooks';
 import AppInfoPanel from '@cccsaurora/howler-ui/commons/components/display/AppInfoPanel';
 import useThemeBuilder from '@cccsaurora/howler-ui/commons/components/utils/hooks/useThemeBuilder';
-import { AnalyticContext } from '@cccsaurora/howler-ui/components/app/providers/AnalyticProvider';
 import { OverviewContext } from '@cccsaurora/howler-ui/components/app/providers/OverviewProvider';
 import HitOverview from '@cccsaurora/howler-ui/components/elements/hit/HitOverview';
 import useMyApi from '@cccsaurora/howler-ui/components/hooks/useMyApi';
@@ -38,7 +37,6 @@ const OverviewViewer = () => {
     const [overviewLoading, setOverviewLoading] = useState(false);
     const [exampleHit, setExampleHit] = useState(null);
     const [x, setX] = useState(0);
-    const analyticContext = useContext(AnalyticContext);
     const wrapper = useRef();
     const startingTemplate = useStartingTemplate();
     useEffect(() => {
@@ -64,19 +62,14 @@ const OverviewViewer = () => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [analytic, dispatchApi]);
     useEffect(() => {
-        if (analytic) {
-            setLoading(true);
-            analyticContext
-                .getAnalyticFromName(analytic)
-                .then(foundAnalytic => {
-                setDetections(foundAnalytic.detections);
-            })
-                .catch(() => {
+        if (analytic && analytics) {
+            const _detections = analytics.find(_analytic => _analytic.name.toLowerCase() === analytic.toLowerCase())?.detections ?? [];
+            setDetections(_detections);
+            if (detection && !_detections.map(_detection => _detection.toLowerCase()).includes(detection.toLowerCase())) {
                 setDetection('ANY');
-            })
-                .finally(() => setLoading(false));
+            }
         }
-    }, [analytic, analyticContext, detection, dispatchApi, params, setParams]);
+    }, [analytic, analytics, detection]);
     useEffect(() => {
         (async () => {
             const result = await dispatchApi(api.search.hit.post({

package/models/WithMetadata.d.ts

@@ -1,8 +1,10 @@
+import type { Analytic } from './entities/generated/Analytic';
 import type { Dossier } from './entities/generated/Dossier';
 import type { Overview } from './entities/generated/Overview';
 import type { Template } from './entities/generated/Template';
 export type WithMetadata<T> = T & {
-    __template?: Template;
+    __analytic?: Analytic;
     __overview?: Overview;
+    __template?: Template;
     __dossiers?: Dossier[];
 };

package/package.json

@@ -96,7 +96,7 @@
     "internal-slot": "1.0.7"
   },
   "type": "module",
-  "version": "2.13.0-dev.142",
+  "version": "2.13.0-dev.148",
   "exports": {
     "./i18n": "./i18n.js",
     "./index.css": "./index.css",