Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display rule details flyout based on URL #6886

Merged
merged 4 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Improvement of the filter management system by implementing new standard modules [#6534](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6534) [#6772](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6772) [#6873](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6873)
- Changed permalink field in the Events tab table in Virustotal to show an external link [#6839](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6839)
- Changed the logging system to use the provided by the platform [#6161](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6161)
- Changed the display of rule details flyout to be based on URL [#6886](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6886)

### Fixed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Find more information about this on the LICENSE file.
*/

import React, { useEffect, useState, useCallback } from 'react';
import React, { useState, useCallback } from 'react';
import { getToasts } from '../../../../../../kibana-services';
import {
resourceDictionary,
Expand Down Expand Up @@ -38,7 +38,9 @@ import {
} from '../../common/actions-buttons';

import apiSuggestsItems from './ruleset-suggestions';
import { useRouterSearch } from '../../../../../../components/common/hooks';
import { Route, Switch } from '../../../../../../components/router-search';
import { withRouterSearch } from '../../../../../../components/common/hocs';
import NavigationService from '../../../../../../react-services/navigation-service';

const searchBarWQLOptions = {
searchTermFields: [
Expand Down Expand Up @@ -107,76 +109,71 @@ const FilesTable = ({
/>
);

const RulesFlyoutTable = ({
actionButtons,
columns,
searchBarSuggestions,
filters,
updateFilters,
getRowProps,
isFlyoutVisible,
currentItem,
closeFlyout,
cleanFilters,
...props
}) => (
<>
<TableWzAPI
actionButtons={actionButtons}
title='Rules'
description='From here you can manage your rules.'
tableColumns={columns}
tableInitialSortingField='id'
searchTable={true}
searchBarWQL={{
options: searchBarWQLOptions,
suggestions: searchBarSuggestions,
}}
endpoint='/rules'
isExpandable={true}
rowProps={getRowProps}
downloadCsv={true}
showReload={true}
filters={filters}
tablePageSizeOptions={[10, 25, 50, 100]}
/>
{isFlyoutVisible && (
<FlyoutDetail
item={currentItem}
closeFlyout={closeFlyout}
showViewInEvents={true}
outsideClickCloses={true}
const RulesFlyoutTable = withRouterSearch(
({
actionButtons,
columns,
searchBarSuggestions,
filters,
updateFilters,
getRowProps,
cleanFilters,
...props
}) => (
<>
<TableWzAPI
actionButtons={actionButtons}
title='Rules'
description='From here you can manage your rules.'
tableColumns={columns}
tableInitialSortingField='id'
searchTable={true}
searchBarWQL={{
options: searchBarWQLOptions,
suggestions: searchBarSuggestions,
}}
endpoint='/rules'
isExpandable={true}
rowProps={getRowProps}
downloadCsv={true}
showReload={true}
filters={filters}
onFiltersChange={updateFilters}
cleanFilters={cleanFilters}
{...props}
tablePageSizeOptions={[10, 25, 50, 100]}
/>
)}
</>
<Switch>
<Route
path='?redirectRule=:redirectRule'
render={({ search: { redirectRule } }) => (
<FlyoutDetail
item={redirectRule}
closeFlyout={() => {
NavigationService.getInstance().updateAndNavigateSearchParams({
redirectRule: null,
});
}}
showViewInEvents={true}
outsideClickCloses={true}
filters={filters}
onFiltersChange={updateFilters}
cleanFilters={cleanFilters}
{...props}
/>
)}
></Route>
</Switch>
</>
),
);

/***************************************
* Main component
*/
function RulesetTable({ setShowingFiles, showingFiles, ...props }) {
const [filters, setFilters] = useState([]);
const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
const [currentItem, setCurrentItem] = useState(null);
const search = useRouterSearch();

const [tableFootprint, setTableFootprint] = useState(0);

const resourcesHandler = new ResourcesHandler(ResourcesConstants.RULES);

useEffect(() => {
if (search.redirectRule) {
// TODO: the view to display the specific group should be managed through the routing based on
// the URL instead of a component state. This lets refreshing the page and display the same view
setCurrentItem(parseInt(search.redirectRule));
setIsFlyoutVisible(true);
}
}, []);

const updateFilters = filters => {
setFilters(filters);
};
Expand All @@ -190,10 +187,6 @@ function RulesetTable({ setShowingFiles, showingFiles, ...props }) {
setShowingFiles(!showingFiles);
};

const closeFlyout = () => {
setIsFlyoutVisible(false);
};

/**
* Remove files method
*/
Expand Down Expand Up @@ -266,8 +259,9 @@ function RulesetTable({ setShowingFiles, showingFiles, ...props }) {
props.userPermissions,
)
? item => {
setCurrentItem(id);
setIsFlyoutVisible(true);
NavigationService.getInstance().updateAndNavigateSearchParams({
redirectRule: id,
});
}
: undefined,
};
Expand Down Expand Up @@ -326,9 +320,6 @@ function RulesetTable({ setShowingFiles, showingFiles, ...props }) {
filters={filters}
updateFilters={updateFilters}
getRowProps={getRowProps}
isFlyoutVisible={isFlyoutVisible}
currentItem={currentItem}
closeFlyout={closeFlyout}
cleanFilters={cleanFilters}
updateFileContent={updateFileContent}
/>
Expand Down
Loading