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.

Sign up for GitHub

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

[Backport 5196 to 4.4-7.10] Fix the search in the agent inventory data tables #5346

Merged
merged 2 commits into from
Mar 31, 2023
Merged

[Backport 5196 to 4.4-7.10] Fix the search in the agent inventory data tables #5346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5bfd9d
Fix the search in the agent inventory data tables (#5196)
Desvelao Mar 31, 2023
a9cf3ee
Merge branch '4.4-7.10' into backport-5196-to-4.4-7.10
Desvelao Mar 31, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ All notable changes to the Wazuh app project will be documented in this file.

### Fixed

- Fixed the search in the agent inventory data tables [#5196](https://github.com/wazuh/wazuh-kibana-app/pull/5196)
- Fixed the `Anomaly and malware detection` link. [#5329](https://github.com/wazuh/wazuh-kibana-app/pull/5329)
- Fixed the problem that did not allow closing the time picker when the button was clicked again in `Agents` and `Management/Statistics`. [#5341](https://github.com/wazuh/wazuh-kibana-app/pull/5341)

Expand Down
20 changes: 15 additions & 5 deletions public/components/agents/syscollector/components/syscollector-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import { AppState } from '../../../../react-services/app-state';


export function SyscollectorTable({ tableParams }) {
const [params, setParams] = useState({ limit: 10, offset: 0, });
const [params, setParams] = useState<{ limit: number, offset: number, select:string, q?: string}>({
limit: 10,
offset: 0,
select: tableParams.columns.map(({id}) => id).join(",")
});
const [pageIndex, setPageIndex] = useState(0);
const [searchBarValue, setSearchBarValue] = useState("");
const [pageSize, setPageSize] = useState(10);
Expand Down Expand Up @@ -67,7 +71,13 @@ export function SyscollectorTable({ tableParams }) {
setSearchBarValue(value);
timerDelaySearch && clearTimeout(timerDelaySearch);
const timeoutId = setTimeout(() => {
const newParams = { ...params, search: value };
const { q, ...rest} = params;
const newParams = {
...rest,
...(value ? {
q: tableParams.columns.map(({id}) => `${id}~${value}`).join(",")
}: {})
};
setParams(newParams);
setPageIndex(0);
}, 400)
Expand All @@ -85,7 +95,7 @@ export function SyscollectorTable({ tableParams }) {
await AppState.downloadCsv(
tableParams.path,
tableParams.exportFormatted,
!!params.search ? [{ name: 'search', value: params.search }] : []
!!params.q ? [{ name: 'q', value: params.q }] : []
)
}

Expand All @@ -101,11 +111,11 @@ export function SyscollectorTable({ tableParams }) {
<EuiFlexGroup>
<EuiFlexItem>
<EuiFieldSearch
placeholder={`Filter ${tableParams.title.toLowerCase()}...`}
placeholder='Search'
value={searchBarValue}
fullWidth={true}
onChange={onChange}
aria-label={`Filter ${tableParams.title.toLowerCase()}...`}
aria-label='Search'
/>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down