@cccsaurora/howler-ui 2.19.0-cases.863 → 2.19.0-dev.1000

package/components/routes/templates/TemplateCard.test.js

@@ -0,0 +1,115 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/// <reference types="vitest" />
+import { render, screen } from '@testing-library/react';
+import userEvent, {} from '@testing-library/user-event';
+import { ModalContext } from '@cccsaurora/howler-ui/components/app/providers/ModalProvider';
+import i18n from '@cccsaurora/howler-ui/i18n';
+import { I18nextProvider } from 'react-i18next';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import TemplateCard from './TemplateCard';
+const mockShowModal = vi.fn();
+const Wrapper = ({ children }) => (_jsx(I18nextProvider, { i18n: i18n, children: _jsx(ModalContext.Provider, { value: { showModal: mockShowModal }, children: children }) }));
+describe('TemplateCard', () => {
+    let user;
+    beforeEach(() => {
+        user = userEvent.setup();
+        vi.clearAllMocks();
+    });
+    it('should render template analytic and detection', () => {
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: 'Test Detection',
+            type: 'personal',
+            keys: ['howler.detection', 'event.id']
+        };
+        render(_jsx(TemplateCard, { template: template }), { wrapper: Wrapper });
+        expect(screen.getByText(/Test Analytic/)).toBeInTheDocument();
+        expect(screen.getByText(/Test Detection/)).toBeInTheDocument();
+    });
+    it('should render template keys', () => {
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: 'Test Detection',
+            type: 'personal',
+            keys: ['howler.detection', 'event.id']
+        };
+        render(_jsx(TemplateCard, { template: template }), { wrapper: Wrapper });
+        expect(screen.getByText('howler.detection')).toBeInTheDocument();
+        expect(screen.getByText('event.id')).toBeInTheDocument();
+    });
+    it('should render personal type icon with tooltip', () => {
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: null,
+            type: 'personal',
+            keys: ['howler.detection']
+        };
+        render(_jsx(TemplateCard, { template: template }), { wrapper: Wrapper });
+        // The personal icon (Person) should be rendered
+        expect(document.querySelector('[data-testid="PersonIcon"]')).toBeInTheDocument();
+    });
+    it('should render global type icon', () => {
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: null,
+            type: 'global',
+            keys: ['howler.detection']
+        };
+        render(_jsx(TemplateCard, { template: template }), { wrapper: Wrapper });
+        expect(document.querySelector('[data-testid="LanguageIcon"]')).toBeInTheDocument();
+    });
+    it('should render readonly type icon', () => {
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: null,
+            type: 'readonly',
+            keys: ['howler.detection']
+        };
+        render(_jsx(TemplateCard, { template: template }), { wrapper: Wrapper });
+        expect(document.querySelector('[data-testid="LockIcon"]')).toBeInTheDocument();
+    });
+    it('should not show error button when error is false', () => {
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: null,
+            type: 'personal',
+            keys: ['howler.detection']
+        };
+        render(_jsx(TemplateCard, { template: template, error: false }), { wrapper: Wrapper });
+        expect(document.querySelector('[data-testid="ReportProblemIcon"]')).not.toBeInTheDocument();
+    });
+    it('should show error button and trigger modal when error is true', async () => {
+        const mockOnRemove = vi.fn();
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: null,
+            type: 'personal',
+            keys: ['howler.detection']
+        };
+        render(_jsx(TemplateCard, { template: template, error: true, onRemove: mockOnRemove }), { wrapper: Wrapper });
+        expect(document.querySelector('[data-testid="ReportProblemIcon"]')).toBeInTheDocument();
+        const errorButton = screen.getByText('Invalid Detection');
+        await user.click(errorButton);
+        expect(mockShowModal).toHaveBeenCalled();
+    });
+    it('should apply custom className', () => {
+        const template = {
+            template_id: 'tmpl-1',
+            analytic: 'Test Analytic',
+            detection: null,
+            type: 'personal',
+            keys: ['howler.detection']
+        };
+        const { container } = render(_jsx(TemplateCard, { template: template, className: "custom-class" }), {
+            wrapper: Wrapper
+        });
+        expect(container.querySelector('.custom-class')).toBeInTheDocument();
+    });
+});

package/components/routes/templates/TemplateViewer.js

@@ -3,10 +3,11 @@ import { Autocomplete, Button, CircularProgress, Divider, FormControl, LinearPro
 import api from '@cccsaurora/howler-ui/api';
 import PageCenter from '@cccsaurora/howler-ui/commons/components/pages/PageCenter';
 import TemplateEditor from '@cccsaurora/howler-ui/components/routes/templates/TemplateEditor';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Check, Delete, SsidChart } from '@mui/icons-material';
 import AppInfoPanel from '@cccsaurora/howler-ui/commons/components/display/AppInfoPanel';
+import { ModalContext } from '@cccsaurora/howler-ui/components/app/providers/ModalProvider';
 import { DEFAULT_FIELDS } from '@cccsaurora/howler-ui/components/elements/hit/HitOutline';
 import useMyApi from '@cccsaurora/howler-ui/components/hooks/useMyApi';
 import isEqual from 'lodash-es/isEqual';
@@ -17,8 +18,10 @@ const TemplateViewer = () => {
     const { t } = useTranslation();
     const [params, setParams] = useSearchParams();
     const { dispatchApi } = useMyApi();
+    const { withConfirmDeleteModal } = useContext(ModalContext);
     const [templateList, setTemplateList] = useState([]);
     const [selectedTemplate, setSelectedTemplate] = useState(null);
+    const [sessionTemplateList, setSessionTemplateList] = useState([]);
     const [displayFields, setDisplayFields] = useState([]);
     const [analytics, setAnalytics] = useState([]);
     const [detections, setDetections] = useState([]);
@@ -72,19 +75,22 @@ const TemplateViewer = () => {
     }, [analytic, detection, dispatchApi, params, setParams, type]);
     useEffect(() => {
         if (analytic && detection) {
-            const template = (templateList ?? []).find(_template => _template.analytic === analytic &&
+            const findTemplate = (_templateList) => (_templateList ?? []).find(_template => _template.analytic === analytic &&
                 ((detection === 'ANY' && !_template.detection) || _template.detection === detection) &&
                 _template.type === type);
+            const template = findTemplate(templateList);
+            // check if a template has been modified in the session but not saved to the datastore
+            const sessionTemplate = findTemplate(sessionTemplateList);
             if (template) {
                 setSelectedTemplate(template);
-                setDisplayFields(template.keys);
+                setDisplayFields(sessionTemplate ? sessionTemplate.keys : template.keys);
             }
             else {
                 setSelectedTemplate(null);
-                setDisplayFields(DEFAULT_FIELDS);
+                setDisplayFields(sessionTemplate ? sessionTemplate.keys : DEFAULT_FIELDS);
             }
         }
-    }, [analytic, detection, templateList, type]);
+    }, [analytic, detection, sessionTemplateList, templateList, type]);
     useEffect(() => {
         if (analytic) {
             params.set('analytic', analytic);
@@ -111,15 +117,28 @@ const TemplateViewer = () => {
         }
         return { ..._hit };
     }, [analytic]);
-    const onDelete = useCallback(async () => {
-        await dispatchApi(api.template.del(selectedTemplate.template_id), {
-            logError: false,
-            showError: true,
-            throwError: false
+    const onDelete = useCallback(() => {
+        withConfirmDeleteModal(async () => {
+            await dispatchApi(api.template.del(selectedTemplate.template_id), {
+                logError: false,
+                showError: true,
+                throwError: false
+            });
+            setSessionTemplateList(l => l.filter(v => v.analytic != selectedTemplate.analytic ||
+                v.detection != selectedTemplate.detection ||
+                v.type != selectedTemplate.type));
+            setTemplateList(l => l.filter(v => v.analytic != selectedTemplate.analytic ||
+                v.detection != selectedTemplate.detection ||
+                v.type != selectedTemplate.type));
         });
-        setSelectedTemplate(null);
-        setDisplayFields(DEFAULT_FIELDS);
-    }, [dispatchApi, selectedTemplate?.template_id]);
+    }, [
+        dispatchApi,
+        selectedTemplate?.analytic,
+        selectedTemplate?.detection,
+        selectedTemplate?.template_id,
+        selectedTemplate?.type,
+        withConfirmDeleteModal
+    ]);
     const onSave = useCallback(async () => {
         if (analytic && detection) {
             try {
@@ -139,17 +158,39 @@ const TemplateViewer = () => {
                 setSelectedTemplate(result);
                 const newList = [result, ...templateList];
                 setTemplateList(newList.filter((v1, i) => newList.findIndex(v2 => v1.template_id === v2.template_id) === i));
+                const updatedSessionList = sessionTemplateList.filter(v => v.analytic !== result.analytic || v.detection !== result.detection || v.type !== result.type);
+                setSessionTemplateList(updatedSessionList);
             }
             finally {
                 setTemplateLoading(false);
             }
         }
-    }, [analytic, detection, dispatchApi, displayFields, selectedTemplate, templateList, type]);
+    }, [analytic, detection, dispatchApi, displayFields, selectedTemplate, sessionTemplateList, templateList, type]);
     const analyticOrDetectionMissing = useMemo(() => !analytic || !detection, [analytic, detection]);
     const noFieldChange = useMemo(() => displayFields.length < 1 || isEqual(selectedTemplate?.keys ?? DEFAULT_FIELDS, displayFields), [displayFields, selectedTemplate?.keys]);
-    return (_jsxs(PageCenter, { maxWidth: "1500px", textAlign: "left", height: "100%", children: [_jsx(LinearProgress, { sx: { mb: 1, opacity: +loading } }), _jsxs(Stack, { direction: "column", spacing: 2, divider: _jsx(Divider, { orientation: "horizontal", flexItem: true }), height: "100%", children: [_jsxs(Stack, { direction: "row", spacing: 2, mb: 2, alignItems: "stretch", children: [_jsx(FormControl, { sx: { flex: 1, maxWidth: '450px' }, children: _jsx(Autocomplete, { id: "analytic", options: analytics.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase())), getOptionLabel: option => option.name, value: analytics.find(a => a.name === analytic) || null, onChange: (__, newValue) => setAnalytic(newValue ? newValue.name : ''), renderInput: autocompleteAnalyticParams => (_jsx(TextField, { ...autocompleteAnalyticParams, label: t('route.templates.analytic'), size: "small" })) }) }), !(detections?.length < 2 && detections[0]?.toLowerCase() === 'rule') ? (_jsx(FormControl, { sx: { flex: 1, maxWidth: '300px' }, disabled: !analytic, children: _jsx(Autocomplete, { id: "detection", options: ['ANY', ...detections.sort()], getOptionLabel: option => option, value: detection ?? '', onChange: (__, newValue) => setDetection(newValue), renderInput: autocompleteDetectionParams => (_jsx(TextField, { ...autocompleteDetectionParams, label: t('route.templates.detection'), size: "small" })) }) })) : (_jsx(Tooltip, { title: t('route.templates.rule.explanation'), children: _jsx(SsidChart, { color: "info", sx: { alignSelf: 'center' } }) })), _jsxs(ToggleButtonGroup, { sx: { display: 'grid', gridTemplateColumns: '1fr 1fr' }, size: "small", exclusive: true, value: type, disabled: analyticOrDetectionMissing, onChange: (__, _type) => {
+    const onTypeToggle = useCallback((_type) => {
+        setType(_type);
+        if (noFieldChange) {
+            return;
+        }
+        const sessionTemplate = {
+            analytic: analytic,
+            detection: detection !== 'ANY' ? detection : null,
+            type: type,
+            keys: displayFields
+        };
+        const newList = [sessionTemplate, ...sessionTemplateList];
+        setSessionTemplateList(newList.filter((v1, i) => newList.findIndex(v2 => v1.analytic === v2.analytic && v1.detection === v2.detection && v1.type === v2.type) === i));
+    }, [analytic, detection, displayFields, noFieldChange, sessionTemplateList, type]);
+    return (_jsxs(PageCenter, { maxWidth: "1500px", textAlign: "left", height: "100%", children: [_jsx(LinearProgress, { sx: { mb: 1, opacity: +loading } }), _jsxs(Stack, { direction: "column", spacing: 2, divider: _jsx(Divider, { orientation: "horizontal", flexItem: true }), height: "100%", children: [_jsxs(Stack, { direction: "row", spacing: 2, mb: 2, alignItems: "stretch", children: [_jsx(FormControl, { sx: { flex: 1, maxWidth: '450px' }, children: _jsx(Autocomplete, { id: "analytic", options: analytics.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase())), getOptionLabel: option => option.name, value: analytics.find(a => a.name === analytic) || null, onChange: (__, newValue) => {
+                                        setAnalytic(newValue ? newValue.name : '');
+                                        setSessionTemplateList([]); // do not keep session memory if analytic or detection is changed
+                                    }, renderInput: autocompleteAnalyticParams => (_jsx(TextField, { ...autocompleteAnalyticParams, label: t('route.templates.analytic'), size: "small" })) }) }), !(detections?.length < 2 && detections[0]?.toLowerCase() === 'rule') ? (_jsx(FormControl, { sx: { flex: 1, maxWidth: '300px' }, disabled: !analytic, children: _jsx(Autocomplete, { id: "detection", options: ['ANY', ...detections.sort()], getOptionLabel: option => option, value: detection ?? '', onChange: (__, newValue) => {
+                                        setDetection(newValue);
+                                        setSessionTemplateList([]); // do not keep session memory if analytic or detection is changed
+                                    }, renderInput: autocompleteDetectionParams => (_jsx(TextField, { ...autocompleteDetectionParams, label: t('route.templates.detection'), size: "small" })) }) })) : (_jsx(Tooltip, { title: t('route.templates.rule.explanation'), children: _jsx(SsidChart, { color: "info", sx: { alignSelf: 'center' } }) })), _jsxs(ToggleButtonGroup, { sx: { display: 'grid', gridTemplateColumns: '1fr 1fr' }, size: "small", exclusive: true, value: type, disabled: analyticOrDetectionMissing, onChange: (__, _type) => {
                                     if (_type) {
-                                        setType(_type);
+                                        onTypeToggle(_type);
                                     }
                                 }, children: [_jsx(ToggleButton, { sx: { flex: 1 }, value: "personal", "aria-label": "personal", children: t('route.templates.personal') }), _jsx(ToggleButton, { sx: { flex: 1 }, value: "global", "aria-label": "global", children: t('route.templates.global') })] }), selectedTemplate && (_jsx(Button, { variant: "outlined", startIcon: _jsx(Delete, {}), onClick: onDelete, children: t('button.delete') })), _jsx(Button, { variant: "outlined", disabled: analyticOrDetectionMissing || noFieldChange, startIcon: templateLoading ? _jsx(CircularProgress, { size: 16 }) : _jsx(Check, {}), onClick: onSave, children: t(!analyticOrDetectionMissing && !noFieldChange ? 'button.save' : 'button.saved') })] }), analyticOrDetectionMissing ? (_jsx(AppInfoPanel, { i18nKey: "route.templates.select", sx: { width: '100%', alignSelf: 'start' } })) : (_jsx(TemplateEditor, { hit: exampleHit, fields: displayFields, setFields: setDisplayFields, onAdd: field => setDisplayFields([...displayFields, field]), onRemove: field => setDisplayFields(displayFields.filter(f => f !== field)) }))] })] }));
 };

package/components/routes/templates/Templates.js

@@ -3,6 +3,7 @@ import { Article } from '@mui/icons-material';
 import { Stack, ToggleButton, ToggleButtonGroup, 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 { TuiListProvider } from '@cccsaurora/howler-ui/components/elements/addons/lists';
 import { TuiListMethodContext } from '@cccsaurora/howler-ui/components/elements/addons/lists/TuiListProvider';
 import ItemManager from '@cccsaurora/howler-ui/components/elements/display/ItemManager';
@@ -19,8 +20,9 @@ const TemplatesBase = () => {
     const navigate = useNavigate();
     const { dispatchApi } = useMyApi();
     const [searchParams, setSearchParams] = useSearchParams();
-    const { load } = useContext(TuiListMethodContext);
+    const { load, remove } = useContext(TuiListMethodContext);
     const pageCount = useMyLocalStorageItem(StorageKey.PAGE_COUNT, 25)[0];
+    const { analytics } = useContext(AnalyticContext);
     const [phrase, setPhrase] = useState('');
     const [offset, setOffset] = useState(parseInt(searchParams.get('offset')) || 0);
     const [response, setResponse] = useState(null);
@@ -57,17 +59,22 @@ const TemplatesBase = () => {
     }, [phrase, setSearchParams, searchParams, user.username, types, dispatchApi, pageCount, offset]);
     // Load the items into list when response changes.
     // This hook should only trigger when the 'response' changes.
+    // or if the analytic list changes to refresh the disabled state
     useEffect(() => {
         if (response) {
             load(response.items.map((item) => ({
                 id: item.template_id,
                 item,
                 selected: false,
-                cursor: false
+                cursor: false,
+                disabled: item.detection &&
+                    !analytics
+                        .find(v => v.name === item.analytic)
+                        ?.detections?.map((s) => s.toLowerCase())
+                        ?.includes(item.detection?.toLowerCase())
             })));
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [response, load]);
+    }, [response, load, analytics]);
     const onPageChange = useCallback((_offset) => {
         if (_offset !== offset) {
             searchParams.set('offset', _offset.toString());
@@ -96,12 +103,22 @@ const TemplatesBase = () => {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [offset]);
-    const renderer = useCallback((item, className) => _jsx(TemplateCard, { template: item, className: className }), []);
+    const removeTemplate = useCallback(async (templateId) => {
+        await dispatchApi(api.template.del(templateId), {
+            logError: false,
+            showError: true,
+            throwError: false
+        });
+        remove(templateId);
+    }, [dispatchApi, remove]);
+    const renderer = useCallback((item, error, className) => (_jsx(TemplateCard, { template: item, error: error, onRemove: removeTemplate, className: className })), [removeTemplate]);
     return (_jsx(ItemManager, { onSearch: onSearch, onPageChange: onPageChange, phrase: phrase, setPhrase: setPhrase, hasError: hasError, searching: searching, searchFilters: _jsx(Stack, { direction: "row", spacing: 1, alignItems: "center", children: _jsxs(ToggleButtonGroup, { sx: { display: 'grid', gridTemplateColumns: '1fr 1fr', alignSelf: 'start' }, size: "small", value: types, onChange: (__, _types) => {
                     if (_types) {
                         setTypes(_types.length < 2 ? _types : []);
                     }
-                }, children: [_jsx(ToggleButton, { value: "personal", "aria-label": "personal", children: t('route.templates.manager.personal') }), _jsx(ToggleButton, { value: "global", "aria-label": "global", children: t('route.templates.manager.global') })] }) }), aboveSearch: _jsx(Typography, { sx: theme => ({ fontStyle: 'italic', color: theme.palette.text.disabled, mb: 0.5 }), variant: "body2", children: t('route.templates.search.prompt') }), renderer: ({ item }, classRenderer) => renderer(item.item, classRenderer()), response: response, onSelect: (item) => navigate(`/templates/view?type=${item.item.type}&analytic=${item.item.analytic}${item.item.detection ? '&detection=' + item.item.detection : ''}`), onCreate: () => navigate('/templates/view'), createPrompt: "route.templates.create", searchPrompt: "route.templates.manager.search", createIcon: _jsx(Article, { sx: { mr: 1 } }) }));
+                }, children: [_jsx(ToggleButton, { value: "personal", "aria-label": "personal", children: t('route.templates.manager.personal') }), _jsx(ToggleButton, { value: "global", "aria-label": "global", children: t('route.templates.manager.global') })] }) }), aboveSearch: _jsx(Typography, { sx: theme => ({ fontStyle: 'italic', color: theme.palette.text.disabled, mb: 0.5 }), variant: "body2", children: t('route.templates.search.prompt') }), renderer: ({ item }, classRenderer) => renderer(item.item, !!item.disabled, classRenderer()), response: response, onSelect: (item) => {
+            navigate(`/templates/view?type=${item.item.type}&analytic=${item.item.analytic}${item.item.detection ? '&detection=' + item.item.detection : ''}`);
+        }, onCreate: () => navigate('/templates/view'), createPrompt: "route.templates.create", searchPrompt: "route.templates.manager.search", createIcon: _jsx(Article, { sx: { mr: 1 } }) }));
 };
 const Templates = () => {
     return (_jsx(TuiListProvider, { children: _jsx(TemplatesBase, {}) }));

package/components/routes/views/ViewComposer.js

@@ -4,11 +4,10 @@ import { useTranslation } from 'react-i18next';
 import { HelpOutline, Save } from '@mui/icons-material';
 import { Alert, Checkbox, CircularProgress, LinearProgress, Stack, TextField, ToggleButton, ToggleButtonGroup, Tooltip, Typography } from '@mui/material';
 import api from '@cccsaurora/howler-ui/api';
-import {} from '@cccsaurora/howler-ui/api/search';
 import AppListEmpty from '@cccsaurora/howler-ui/commons/components/display/AppListEmpty';
 import PageCenter from '@cccsaurora/howler-ui/commons/components/pages/PageCenter';
+import { HitContext } from '@cccsaurora/howler-ui/components/app/providers/HitProvider';
 import { ParameterContext } from '@cccsaurora/howler-ui/components/app/providers/ParameterProvider';
-import { RecordContext } from '@cccsaurora/howler-ui/components/app/providers/RecordProvider';
 import { ViewContext } from '@cccsaurora/howler-ui/components/app/providers/ViewProvider';
 import CustomButton from '@cccsaurora/howler-ui/components/elements/addons/buttons/CustomButton';
 import FlexPort from '@cccsaurora/howler-ui/components/elements/addons/layout/FlexPort';
@@ -18,7 +17,6 @@ import VSBoxHeader from '@cccsaurora/howler-ui/components/elements/addons/layout
 import SearchTotal from '@cccsaurora/howler-ui/components/elements/addons/search/SearchTotal';
 import HitCard from '@cccsaurora/howler-ui/components/elements/hit/HitCard';
 import { HitLayout } from '@cccsaurora/howler-ui/components/elements/hit/HitLayout';
-import ObservableCard from '@cccsaurora/howler-ui/components/elements/observable/ObservableCard';
 import useMyApi from '@cccsaurora/howler-ui/components/hooks/useMyApi';
 import { useMyLocalStorageItem } from '@cccsaurora/howler-ui/components/hooks/useMyLocalStorage';
 import useMySnackbar from '@cccsaurora/howler-ui/components/hooks/useMySnackbar';
@@ -28,9 +26,8 @@ import { DEFAULT_QUERY, StorageKey } from '@cccsaurora/howler-ui/utils/constants
 import { convertDateToLucene } from '@cccsaurora/howler-ui/utils/utils';
 import { buildViewUrl } from '@cccsaurora/howler-ui/utils/viewUtils';
 import ErrorBoundary from '../ErrorBoundary';
-import RecordQuery from '../hits/search/RecordQuery';
+import HitQuery from '../hits/search/HitQuery';
 import HitSort from '../hits/search/shared/HitSort';
-import IndexPicker from '../hits/search/shared/IndexPicker';
 import SearchSpan from '../hits/search/shared/SearchSpan';
 const ViewComposer = () => {
     const { t } = useTranslation();
@@ -41,10 +38,8 @@ const ViewComposer = () => {
     const addView = useContextSelector(ViewContext, ctx => ctx.addView);
     const editView = useContextSelector(ViewContext, ctx => ctx.editView);
     const getCurrentViews = useContextSelector(ViewContext, ctx => ctx.getCurrentViews);
-    const indexes = useContextSelector(ParameterContext, ctx => ctx.indexes);
-    const setIndexes = useContextSelector(ParameterContext, ctx => ctx.setIndexes);
     const pageCount = useMyLocalStorageItem(StorageKey.PAGE_COUNT, 25)[0];
-    const loadRecords = useContextSelector(RecordContext, ctx => ctx.loadRecords);
+    const loadHits = useContextSelector(HitContext, ctx => ctx.loadHits);
     // view state
     const [title, setTitle] = useState('');
     const [type, setType] = useState('global');
@@ -61,17 +56,14 @@ const ViewComposer = () => {
     const [searching, setSearching] = useState(false);
     const [error, setError] = useState(null);
     const [response, setResponse] = useState();
-    const [isLoadingView, setIsLoadingView] = useState(!!routeParams.id);
     const onSave = useCallback(async () => {
         setLoading(true);
         try {
-            const normalizedIndexes = indexes?.length > 0 ? indexes : ['hit'];
             if (!routeParams.id) {
                 const newView = await addView({
                     title,
                     type,
                     query,
-                    indexes: normalizedIndexes,
                     sort: sort || null,
                     span: span || null,
                     settings: {
@@ -85,7 +77,6 @@ const ViewComposer = () => {
                     title,
                     type,
                     query,
-                    indexes: normalizedIndexes,
                     sort,
                     span,
                     settings: { advance_on_triage: advanceOnTriage }
@@ -110,24 +101,23 @@ const ViewComposer = () => {
         sort,
         span,
         advanceOnTriage,
-        indexes,
         navigate,
         editView,
         showErrorMessage
     ]);
-    const performSearch = useCallback(async (searchQuery, searchIndexes, searchSort, searchSpan) => {
+    const search = useCallback(async (_query) => {
+        setQuery(_query);
         setSearching(true);
         setError(null);
         try {
-            const normalizedIndexes = searchIndexes?.length > 0 ? searchIndexes : ['hit'];
-            const _response = await dispatchApi(api.v2.search.post(normalizedIndexes, {
+            const _response = await dispatchApi(api.search.hit.post({
                 rows: pageCount,
-                query: searchQuery,
-                sort: searchSort,
-                filters: searchSpan ? [`event.created:${convertDateToLucene(searchSpan)}`] : [],
+                query: _query,
+                sort,
+                filters: span ? [`event.created:${convertDateToLucene(span)}`] : [],
                 metadata: ['template', 'analytic']
             }), { showError: false, throwError: true });
-            loadRecords(_response.items);
+            loadHits(_response.items);
             setResponse(_response);
         }
         catch (e) {
@@ -136,25 +126,18 @@ const ViewComposer = () => {
         finally {
             setSearching(false);
         }
-    }, [dispatchApi, loadRecords, pageCount]);
-    const search = useCallback(async (_query) => {
-        setQuery(_query);
-        await performSearch(_query, indexes, sort, span);
-    }, [performSearch, indexes, sort, span, setQuery]);
+    }, [dispatchApi, loadHits, pageCount, setQuery, sort, span]);
     useEffect(() => {
-        // Only run initial search if we're NOT editing an existing view
-        if (!routeParams.id) {
-            search(query || DEFAULT_QUERY);
-        }
+        search(query || DEFAULT_QUERY);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [routeParams.id]);
+    }, []);
     // We only run this when ancillary properties (i.e. filters, sorting) change
     useEffect(() => {
-        if (query && !isLoadingView) {
+        if (query) {
             search(query);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [sort, span, indexes, isLoadingView]);
+    }, [sort, span]);
     useEffect(() => {
         if (!routeParams.id) {
             return;
@@ -170,23 +153,13 @@ const ViewComposer = () => {
             }
             setTitle(viewToEdit.title);
             setAdvanceOnTriage(viewToEdit.settings?.advance_on_triage ?? false);
-            const loadedQuery = viewToEdit.query || DEFAULT_QUERY;
-            const loadedIndexes = viewToEdit.indexes || indexes;
-            const loadedSort = viewToEdit.sort || sort;
-            const loadedSpan = viewToEdit.span || span;
-            setQuery(loadedQuery);
-            if (viewToEdit.indexes) {
-                setIndexes(loadedIndexes);
-            }
+            setQuery(viewToEdit.query);
             if (viewToEdit.sort) {
-                setSort(loadedSort);
+                setSort(viewToEdit.sort);
             }
             if (viewToEdit.span) {
-                setSpan(loadedSpan);
+                setSpan(viewToEdit.span);
             }
-            // Perform search with the loaded values to avoid using stale state
-            await performSearch(loadedQuery, loadedIndexes, loadedSort, loadedSpan);
-            setIsLoadingView(false);
         })();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [routeParams.id]);
@@ -199,6 +172,6 @@ const ViewComposer = () => {
                                             fontSize: '0.9em',
                                             fontStyle: 'italic',
                                             mb: 0.5
-                                        }), variant: "body2", children: t('hit.search.prompt') }), _jsx(RecordQuery, { triggerSearch: search, searching: searching, onChange: (_query, isDirty) => setIsSearchDirty(isDirty) }), _jsxs(Stack, { direction: "row", spacing: 1, children: [_jsx(IndexPicker, {}), _jsx(HitSort, {}), _jsx(SearchSpan, { omitCustom: true }), _jsx("div", { style: { flex: 1 } }), _jsxs(Stack, { spacing: 1, direction: "row", alignItems: "center", sx: { flex: '0 !important', minWidth: '300px' }, children: [_jsx(Typography, { component: "span", children: t('view.settings.advance_on_triage') }), _jsx(Tooltip, { title: t('view.settings.advance_on_triage.description'), children: _jsx(HelpOutline, { sx: { fontSize: '16px' } }) }), _jsx(Checkbox, { size: "small", checked: advanceOnTriage, onChange: (_event, checked) => setAdvanceOnTriage(checked) })] })] }), response?.total ? (_jsx(SearchTotal, { total: response.total, pageLength: response.items.length, offset: response.offset, sx: theme => ({ color: theme.palette.text.secondary, fontSize: '0.9em', fontStyle: 'italic' }) })) : null, _jsx(LinearProgress, { sx: [!searching && { opacity: 0 }] })] }) }), _jsx(VSBoxContent, { children: _jsxs(Stack, { spacing: 1, children: [!response?.total && _jsx(AppListEmpty, {}), response?.items.map(record => record.__index === 'hit' ? (_jsx(HitCard, { id: record.howler.id, layout: HitLayout.DENSE }, record.howler.id)) : (_jsx(ObservableCard, { observable: record }, record.howler.id)))] }) })] }) }) }) }));
+                                        }), variant: "body2", children: t('hit.search.prompt') }), _jsx(HitQuery, { triggerSearch: search, searching: searching, onChange: (_query, isDirty) => setIsSearchDirty(isDirty) }), _jsxs(Stack, { direction: "row", spacing: 1, children: [_jsx(HitSort, {}), _jsx(SearchSpan, { omitCustom: true }), _jsx("div", { style: { flex: 1 } }), _jsxs(Stack, { spacing: 1, direction: "row", alignItems: "center", sx: { flex: '0 !important', minWidth: '300px' }, children: [_jsx(Typography, { component: "span", children: t('view.settings.advance_on_triage') }), _jsx(Tooltip, { title: t('view.settings.advance_on_triage.description'), children: _jsx(HelpOutline, { sx: { fontSize: '16px' } }) }), _jsx(Checkbox, { size: "small", checked: advanceOnTriage, onChange: (_event, checked) => setAdvanceOnTriage(checked) })] })] }), response?.total ? (_jsx(SearchTotal, { total: response.total, pageLength: response.items.length, offset: response.offset, sx: theme => ({ color: theme.palette.text.secondary, fontSize: '0.9em', fontStyle: 'italic' }) })) : null, _jsx(LinearProgress, { sx: [!searching && { opacity: 0 }] })] }) }), _jsx(VSBoxContent, { children: _jsxs(Stack, { spacing: 1, children: [!response?.total && _jsx(AppListEmpty, {}), response?.items.map(hit => (_jsx(HitCard, { id: hit.howler.id, layout: HitLayout.DENSE }, hit.howler.id)))] }) })] }) }) }) }));
 };
 export default ViewComposer;

package/components/routes/views/Views.js

@@ -4,6 +4,7 @@ import { Clear, Edit, SavedSearch, Star, StarBorder } from '@mui/icons-material'
 import { Autocomplete, Card, Checkbox, IconButton, Skeleton, Stack, TextField, ToggleButton, ToggleButtonGroup, Tooltip, Typography } from '@mui/material';
 import api from '@cccsaurora/howler-ui/api';
 import { useAppUser } from '@cccsaurora/howler-ui/commons/components/app/hooks';
+import { ModalContext } from '@cccsaurora/howler-ui/components/app/providers/ModalProvider';
 import { ViewContext } from '@cccsaurora/howler-ui/components/app/providers/ViewProvider';
 import FlexOne from '@cccsaurora/howler-ui/components/elements/addons/layout/FlexOne';
 import { TuiListProvider } from '@cccsaurora/howler-ui/components/elements/addons/lists';
@@ -27,6 +28,7 @@ const ViewsBase = () => {
     const { user } = useAppUser();
     const navigate = useNavigate();
     const { dispatchApi } = useMyApi();
+    const { withConfirmDeleteModal } = useContext(ModalContext);
     const fetchViews = useContextSelector(ViewContext, ctx => ctx.fetchViews);
     const addFavourite = useContextSelector(ViewContext, ctx => ctx.addFavourite);
     const removeFavourite = useContextSelector(ViewContext, ctx => ctx.removeFavourite);
@@ -105,12 +107,14 @@ const ViewsBase = () => {
             setOffset(_offset);
         }
     }, [offset, searchParams, setSearchParams]);
-    const onDelete = useCallback(async (event, id) => {
+    const onDelete = useCallback((event, id) => {
         event.preventDefault();
         event.stopPropagation();
-        await removeView(id);
-        onSearch();
-    }, [onSearch, removeView]);
+        withConfirmDeleteModal(async () => {
+            await removeView(id);
+            onSearch();
+        });
+    }, [onSearch, removeView, withConfirmDeleteModal]);
     const onFavourite = useCallback(async (event, id) => {
         event.preventDefault();
         if (user.favourite_views?.includes(id)) {